Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4078 in orxonox.OLD for orxonox/branches


Ignore:
Timestamp:
May 6, 2005, 11:46:20 AM (20 years ago)
Author:
patrick
Message:

orxonox/branches/md2_loader: fixed some compile errors, altered some variable names, automake now works and did update Makefile.in :)

Location:
orxonox/branches/md2_loader
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/md2_loader/Makefile.in

    r4063 r4078  
    3838        $(srcdir)/Makefile.in $(srcdir)/config.h.in \
    3939        $(srcdir)/doc/documentation.am $(top_srcdir)/configure AUTHORS \
    40         COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
    41         install-sh missing mkinstalldirs
     40        COPYING ChangeLog INSTALL NEWS TODO config.guess config.sub \
     41        depcomp install-sh missing mkinstalldirs
    4242subdir = .
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

  • orxonox/branches/md2_loader/src/Makefile.in

    r4063 r4078  
    8383        data_tank.$(OBJEXT) graphics_engine.$(OBJEXT) light.$(OBJEXT) \
    8484        text_engine.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
    85         primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
    86         texture.$(OBJEXT) particle_engine.$(OBJEXT) \
     85        md2Model.$(OBJEXT) primitive_model.$(OBJEXT) model.$(OBJEXT) \
     86        material.$(OBJEXT) texture.$(OBJEXT) particle_engine.$(OBJEXT) \
    8787        particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
    8888        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
    … …  
    122122@AMDEP_TRUE@    ./$(DEPDIR)/libORXgui_a-gui_video.Po \
    123123@AMDEP_TRUE@    ./$(DEPDIR)/light.Po ./$(DEPDIR)/list.Po \
    124 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    125 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    126 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
     124@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
     125@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
     126@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/orxonox.Po \
     127@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
    127128@AMDEP_TRUE@    ./$(DEPDIR)/particle_emitter.Po \
    128129@AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
    … …  
    311312                 lib/graphics/importer/array.cc \
    312313                 lib/graphics/importer/objModel.cc \
     314                 lib/graphics/importer/md2Model.cc \
    313315                 lib/graphics/importer/primitive_model.cc \
    314316                 lib/graphics/importer/model.cc \
    … …  
    378380                 lib/graphics/light.h \
    379381                 lib/graphics/text_engine.h \
     382                 lib/graphics/importer/array.h \
     383                 lib/graphics/importer/abstract_model.h \
     384                 lib/graphics/importer/objModel.h \
     385                 lib/graphics/importer/md2Model.h \
     386                 lib/graphics/importer/primitive_model.h \
     387                 lib/graphics/importer/model.h \
     388                 lib/graphics/importer/material.h \
     389                 lib/graphics/importer/texture.h \
    380390                 lib/graphics/particles/particle_engine.h \
    381391                 lib/graphics/particles/particle_system.h \
    … …  
    536546@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
    537547@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     548@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    538549@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    539550@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@
    … …  
    12071218@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    12081219@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o objModel.obj `if test -f 'lib/graphics/importer/objModel.cc'; then $(CYGPATH_W) 'lib/graphics/importer/objModel.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/objModel.cc'; fi`
     1220
     1221md2Model.o: lib/graphics/importer/md2Model.cc
     1222@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.o -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.o `test -f 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc; \
     1223@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
     1224@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.o' libtool=no @AMDEPBACKSLASH@
     1225@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
     1226@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1227@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.o `test -f 'lib/graphics/importer/md2Model.cc' || echo '$(srcdir)/'`lib/graphics/importer/md2Model.cc
     1228
     1229md2Model.obj: lib/graphics/importer/md2Model.cc
     1230@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md2Model.obj -MD -MP -MF "$(DEPDIR)/md2Model.Tpo" -c -o md2Model.obj `if test -f 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`; \
     1231@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/md2Model.Tpo" "$(DEPDIR)/md2Model.Po"; else rm -f "$(DEPDIR)/md2Model.Tpo"; exit 1; fi
     1232@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/importer/md2Model.cc' object='md2Model.obj' libtool=no @AMDEPBACKSLASH@
     1233@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/md2Model.Po' tmpdepfile='$(DEPDIR)/md2Model.TPo' @AMDEPBACKSLASH@
     1234@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1235@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md2Model.obj `if test -f 'lib/graphics/importer/md2Model.cc'; then $(CYGPATH_W) 'lib/graphics/importer/md2Model.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/importer/md2Model.cc'; fi`
    12091236
    12101237primitive_model.o: lib/graphics/importer/primitive_model.cc
    … …  
    16341661
    16351662distdir: $(DISTFILES)
    1636         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
     1663        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/importer $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
    16371664        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    16381665        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/branches/md2_loader/src/lib/graphics/importer/Makefile.in

    r4063 r4078  
    4242subdir = src/lib/graphics/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    44         $(srcdir)/Makefile.in
     44        $(srcdir)/Makefile.in TODO
    4545ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4646am__aclocal_m4_deps = $(top_srcdir)/configure.ac
    … …  
    5454PROGRAMS = $(bin_PROGRAMS)
    5555am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
    56         model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
    57         array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
    58         graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
    59         vector.$(OBJEXT) resource_manager.$(OBJEXT) \
    60         text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT)
     56        model.$(OBJEXT) objModel.$(OBJEXT) md2Model.$(OBJEXT) \
     57        primitive_model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
     58        texture.$(OBJEXT) graphics_engine.$(OBJEXT) \
     59        base_object.$(OBJEXT) vector.$(OBJEXT) \
     60        resource_manager.$(OBJEXT) text_engine.$(OBJEXT) \
     61        p_node.$(OBJEXT) null_parent.$(OBJEXT)
    6162importer_OBJECTS = $(am_importer_OBJECTS)
    6263importer_LDADD = $(LDADD)
    … …  
    6869@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
    6970@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
    70 @AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    71 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    72 @AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
     71@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
     72@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
     73@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/p_node.Po \
    7374@AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
    7475@AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
    … …  
    200201                  model.cc \
    201202                  objModel.cc \
     203                  md2Model.cc \
    202204                  primitive_model.cc \
    203205                  array.cc \
    … …  
    214216noinst_HEADERS = framework.h \
    215217                windowHandler.h \
     218                abstract_model.h \
    216219                model.h \
    217220                objModel.h \
     221                md2Model.h \
    218222                primitive_model.h \
    219223                array.h \
    … …  
    292296@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
    293297@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
     298@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
    294299@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    295300@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@

  • orxonox/branches/md2_loader/src/lib/graphics/importer/abstract_model.h

    r4074 r4078  
    2323
    2424#include "stdincl.h"
     25#include "base_object.h"
     26
    2527
    2628
    … …  
    98100
    99101//! This class defines the basic components of a model
    100 class AbstractModel {
     102class AbstractModel : public BaseObject {
    101103
    102104 public:

  • orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.cc

    r4077 r4078  
    1616
    1717#include "md2Model.h"
     18
    1819
    1920using namespace std;
    … …  
    5051/**
    5152   \brief standard deconstructor
    52 
    5353        creates a new model loader
    5454*/
    … …  
    5656{
    5757   this->setClassName ("MD2Loader");
    58    // Here we initialize our structures to 0
    59    memset(&m_Header, 0, sizeof(tMd2Header));
    60    // Set the pointers to null
    61    m_pSkins=NULL;
    62    m_pTexCoords=NULL;
    63    m_pTriangles=NULL;
    64    m_pFrames=NULL;
     58   /* initialize all data to initial state */
     59   memset(&this->header, 0, sizeof(tMd2Header));
     60   this->pSkins = NULL;
     61   this->pTexCoords = NULL;
     62   this->pTriangles = NULL;
     63   this->pFrames = NULL;
    6564}
    6665
    6766/**
    6867   \brief standard deconstructor
    69 
    7068*/
    7169MD2Loader::~MD2Loader()

  • orxonox/branches/md2_loader/src/lib/graphics/importer/md2Model.h

    r4075 r4078  
    1818
    1919#include "abstract_model.h"
     20#include "base_object.h"
     21#include "stdincl.h"
    2022
    2123
    … …  
    127129
    128130//! A class that handles all of the loading code
    129 class MD2Loader {
     131class MD2Loader : public BaseObject {
    130132
    131133public:
    … …  
    142144  void cleanUp();
    143145 
    144   FILE *m_FilePointer; 
    145   tMd2Header m_Header;                                      //!< The header data
    146   tMd2Skin *m_pSkins;                                           //!< The skin data
    147   tMd2TexCoord *m_pTexCoords;                           //!< The texture coordinates
    148   tMd2Face *m_pTriangles;                                       //!< Face index information
    149   tMd2Frame *m_pFrames;                                     //!< The frames of animation (vertices)
     146  FILE *pFile; 
     147  tMd2Header header;                                        //!< The header data
     148  tMd2Skin *pSkins;                                             //!< The skin data
     149  tMd2TexCoord *pTexCoords;                             //!< The texture coordinates
     150  tMd2Face *pTriangles;                                 //!< Face index information
     151  tMd2Frame *pFrames;                                       //!< The frames of animation (vertices)
    150152};
    151153
Note: See TracChangeset for help on using the changeset viewer.