Changeset 3911 in orxonox.OLD

Timestamp:

Apr 21, 2005, 1:11:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor changes at model

Location:

orxonox/trunk/src

Files:

• lib/graphics/importer/model.cc (modified) (4 diffs)
• lib/graphics/importer/model.h (modified) (2 diffs)
• lib/graphics/importer/objModel.cc (modified) (2 diffs)
• lib/graphics/importer/primitive_model.cc (modified) (1 diff)
• lib/graphics/text_engine.cc (modified) (1 diff)
• util/resource_manager.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -23 +23 @@
 #include "array.h"
 #include "vector.h"
+#include "list.h"
 
 using namespace std;
@@ -50 +51 @@
   this->normals = new Array();
 
+  this->materialList = new tList<Material>;
 }
 
@@ -68 +70 @@
       PRINT(4)("\n");
 
-  PRINTF(4)("Deleting display Lists.\n");
+  PRINTF(5)("Deleting display Lists.\n");
   Group* walker = this->firstGroup;
   while (walker != NULL)
@@ -78 +80 @@
     }
 
-  PRINTF(4)("Deleting Materials.\n");
+  PRINTF(5)("Deleting Materials.\n");
   if (this->material)
     delete this->material;
+
+  // deleting the MaterialList
+  delete materialList;
 }
 

orxonox/trunk/src/lib/graphics/importer/model.h

@@ -84 +84 @@
   bool initFace (Face* face);
 
+  bool buildVertexNormals(void);
+
+  bool importToGL(void);
+  bool addGLElement(FaceElement* elem);
+
+  bool cleanup(void);
   bool cleanupGroup(Group* group);
   bool cleanupFace(Face* face);
   bool cleanupFaceElement(FaceElement* faceElem);
 
-  bool addGLElement(FaceElement* elem);
 
-  bool buildVertexNormals(void);
+  tList<Material>* materialList;
 
  protected:
@@ -96 +101 @@
   Material* material;   //!< Initial pointer to the Material. This can hold many materials, because Material can be added with Material::addMaterial(..)
 
-  bool importToGL(void);
   void cubeModel(void);
-
-  bool cleanup(void);
 
  public:

orxonox/trunk/src/lib/graphics/importer/objModel.cc

@@ -38 +38 @@
   this->importFile (fileName);
 
-  this->importToGL ();
-
-  this->cleanup();
+  this->finalize();
 }
 
@@ -211 +209 @@
   char buffer[PARSELINELENGTH];
   Material* tmpMat = material;
+
   while(fgets(buffer, PARSELINELENGTH, stream))
     {

orxonox/trunk/src/lib/graphics/importer/primitive_model.cc

@@ -52 +52 @@
       break;
     }
-  this->importToGL ();
-
-  this->cleanup();
+  this->finalize();
 }
 

orxonox/trunk/src/lib/graphics/text_engine.cc

@@ -36 +36 @@
 #include "vector.h"
 #include "debug.h"
-
+#include "list.h"
 
 ////////////

orxonox/trunk/src/util/resource_manager.h

@@ -14 +14 @@
 #include "base_object.h"
 
-// FORWARD DEFINITION \\
-//template<class T> class tList;
-#include "list.h"                //! \todo do this by forward definition (ask Patrick)
+// FORWARD DEFINITION 
+template<class T> class tList;
 
 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support