Changeset 4078 in orxonox.OLD for orxonox/branches/md2_loader/src/lib/graphics

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/src/lib/graphics/importer

Files:

• Makefile.in (modified) (6 diffs)
• abstract_model.h (modified) (2 diffs)
• md2Model.cc (modified) (3 diffs)
• md2Model.h (modified) (3 diffs)

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

@@ -42 +42 @@
 subdir = src/lib/graphics/importer
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-        $(srcdir)/Makefile.in
+        $(srcdir)/Makefile.in TODO
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
-        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
-        array.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
-        graphics_engine.$(OBJEXT) base_object.$(OBJEXT) \
-        vector.$(OBJEXT) resource_manager.$(OBJEXT) \
-        text_engine.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT)
+        model.$(OBJEXT) objModel.$(OBJEXT) md2Model.$(OBJEXT) \
+        primitive_model.$(OBJEXT) array.$(OBJEXT) material.$(OBJEXT) \
+        texture.$(OBJEXT) graphics_engine.$(OBJEXT) \
+        base_object.$(OBJEXT) vector.$(OBJEXT) \
+        resource_manager.$(OBJEXT) text_engine.$(OBJEXT) \
+        p_node.$(OBJEXT) null_parent.$(OBJEXT)
 importer_OBJECTS = $(am_importer_OBJECTS)
 importer_LDADD = $(LDADD)
@@ -68 +69 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
-@AMDEP_TRUE@    ./$(DEPDIR)/p_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/md2Model.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/model.Po ./$(DEPDIR)/null_parent.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/objModel.Po ./$(DEPDIR)/p_node.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/primitive_model.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/resource_manager.Po \
@@ -200 +201 @@
                   model.cc \
                   objModel.cc \
+                  md2Model.cc \
                   primitive_model.cc \
                   array.cc \
@@ -214 +216 @@
 noinst_HEADERS = framework.h \
                 windowHandler.h \
+                abstract_model.h \
                 model.h \
                 objModel.h \
+                md2Model.h \
                 primitive_model.h \
                 array.h \
@@ -292 +296 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md2Model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/null_parent.Po@am__quote@

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

@@ -23 +23 @@
 
 #include "stdincl.h"
+#include "base_object.h"
+
 
 
@@ -98 +100 @@
 
 //! This class defines the basic components of a model
-class AbstractModel {
+class AbstractModel : public BaseObject {
 
  public:

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

@@ -16 +16 @@
 
 #include "md2Model.h"
+
 
 using namespace std;
@@ -50 +51 @@
 /**
    \brief standard deconstructor
-
         creates a new model loader
 */
@@ -56 +56 @@
 {
    this->setClassName ("MD2Loader");
-   // Here we initialize our structures to 0
-   memset(&m_Header, 0, sizeof(tMd2Header));
-   // Set the pointers to null
-   m_pSkins=NULL;
-   m_pTexCoords=NULL;
-   m_pTriangles=NULL;
-   m_pFrames=NULL;
+   /* initialize all data to initial state */
+   memset(&this->header, 0, sizeof(tMd2Header));
+   this->pSkins = NULL;
+   this->pTexCoords = NULL;
+   this->pTriangles = NULL;
+   this->pFrames = NULL;
 }
 
 /**
    \brief standard deconstructor
-
 */
 MD2Loader::~MD2Loader()

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

@@ -18 +18 @@
 
 #include "abstract_model.h"
+#include "base_object.h"
+#include "stdincl.h"
 
 
@@ -127 +129 @@
 
 //! A class that handles all of the loading code
-class MD2Loader {
+class MD2Loader : public BaseObject {
 
 public:
@@ -142 +144 @@
   void cleanUp();
   
-  FILE *m_FilePointer;  
-  tMd2Header m_Header;                                      //!< The header data
-  tMd2Skin *m_pSkins;                                           //!< The skin data
-  tMd2TexCoord *m_pTexCoords;                           //!< The texture coordinates
-  tMd2Face *m_pTriangles;                                       //!< Face index information
-  tMd2Frame *m_pFrames;                                     //!< The frames of animation (vertices)
+  FILE *pFile;  
+  tMd2Header header;                                        //!< The header data
+  tMd2Skin *pSkins;                                             //!< The skin data
+  tMd2TexCoord *pTexCoords;                             //!< The texture coordinates
+  tMd2Face *pTriangles;                                 //!< Face index information
+  tMd2Frame *pFrames;                                       //!< The frames of animation (vertices)
 };