Changeset 5774 in orxonox.OLD for trunk

Timestamp:

Nov 25, 2005, 1:36:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: stl in Model

Location:

trunk/src

Files:

• lib/graphics/importer/model.cc (modified) (7 diffs)
• lib/graphics/importer/model.h (modified) (2 diffs)
• story_entities/campaign.h (modified) (1 diff)

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

@@ -24 +24 @@
 
 #include "vector.h"
-#include "list.h"
 
 using namespace std;
@@ -166 +165 @@
   this->normals = new tArray<GLfloat>();
 
-  this->materialList = new tList<ModelMaterial>;
-
   if (this->type == MODEL_VERTEX_ARRAY)
     glEnableClientState(GL_VERTEX_ARRAY | GL_NORMAL_ARRAY | GL_TEXTURE_COORD_ARRAY);
@@ -196 +193 @@
   PRINTF(5)("Deleting Materials.\n");
 
-  tIterator<ModelMaterial>* tmpIt = this->materialList->getIterator();
-  ModelMaterial* modMat = tmpIt->firstElement();
   //! @todo do we really have to delete this material??
-  while(modMat != NULL)
+  list<ModelMaterial*>::iterator modMat;
+  for(modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
   {
-    if (!modMat->external)
-      delete modMat->material;
-    delete modMat;
-    modMat = tmpIt->nextElement();
+    if (!(*modMat)->external)
+      delete (*modMat)->material;
+    delete (*modMat);
   }
-  delete tmpIt;
-  delete materialList;
   delete this->pModelInfo;
 }
@@ -396 +389 @@
   modMat->external = true;
   modMat->material = material;
-  this->materialList->add(modMat);
+  this->materialList.push_back(modMat);
   return modMat->material;
 }
@@ -412 +405 @@
 
   // adding material to the List of materials
-  this->materialList->add(modMat);
+  this->materialList.push_back(modMat);
   return modMat->material;
 }
@@ -423 +416 @@
 Material* Model::findMaterialByName(const char* materialName)
 {
-  tIterator<ModelMaterial>* tmpIt = this->materialList->getIterator();
-  ModelMaterial* modMat = tmpIt->firstElement();
-  while(modMat != NULL)
-    {
-      if (!strcmp(modMat->material->getName(), materialName))
-        {
-          delete tmpIt;
-          return modMat->material;
-        }
-      modMat = tmpIt->nextElement();
-    }
-  delete tmpIt;
+  list<ModelMaterial*>::iterator modMat;
+  for  (modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
+    if (!strcmp((*modMat)->material->getName(), materialName))
+      return (*modMat)->material;
   return NULL;
 }
@@ -929 +914 @@
   PRINTF(3)("got %i triangles, %i vertices\n", this->triangleCount, this->vertexCount);
 
-  
+
   /* write MODELINFO structure */
 

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

@@ -12 +12 @@
 #include "glincl.h"
 #include "array.h"
-
+#include <list>
 
 // FORWARD DECLARATION //
 template<class T> class tArray;
-template<class T> class tList;
 
 
@@ -176 +175 @@
 
  private:
-  MODEL_TYPE             type;            //!< A type for the Model
-  bool                   finalized;       //!< Sets the Object to be finalized.
+  MODEL_TYPE                 type;            //!< A type for the Model
+  bool                       finalized;       //!< Sets the Object to be finalized.
 
-  unsigned int           vertexCount;     //!< A modelwide Counter for vertices.
-  unsigned int           normalCount;     //!< A modelwide Counter for the normals.
-  unsigned int           texCoordCount;   //!< A modelwide Counter for the texCoord.
-  unsigned int           faceCount;       //!< A modelwide Counter for the faces
-  unsigned int           triangleCount;   //!< Number of triangles >= faceCount
-  tArray<GLfloat>*       vertices;        //!< The Array that handles the Vertices.
-  tArray<GLfloat>*       normals;         //!< The Array that handles the Normals.
-  tArray<GLfloat>*       vTexture;        //!< The Array that handles the VertexTextureCoordinates.
-  sTriangleExt*          triangles;       //!< The Array of triangles in the abstract_model.h style
+  unsigned int               vertexCount;     //!< A modelwide Counter for vertices.
+  unsigned int               normalCount;     //!< A modelwide Counter for the normals.
+  unsigned int               texCoordCount;   //!< A modelwide Counter for the texCoord.
+  unsigned int               faceCount;       //!< A modelwide Counter for the faces
+  unsigned int               triangleCount;   //!< Number of triangles >= faceCount
+  tArray<GLfloat>*           vertices;        //!< The Array that handles the Vertices.
+  tArray<GLfloat>*           normals;         //!< The Array that handles the Normals.
+  tArray<GLfloat>*           vTexture;        //!< The Array that handles the VertexTextureCoordinates.
+  sTriangleExt*              triangles;       //!< The Array of triangles in the abstract_model.h style
 
-  ModelGroup*            firstGroup;      //!< The first of all groups.
-  ModelGroup*            currentGroup;    //!< The currentGroup. this is the one we will work with.
-  int                    groupCount;      //!< The Count of Groups.
+  ModelGroup*                firstGroup;      //!< The first of all groups.
+  ModelGroup*                currentGroup;    //!< The currentGroup. this is the one we will work with.
+  int                        groupCount;      //!< The Count of Groups.
 
-  tList<ModelMaterial>*  materialList;    //!< A list for all the Materials in this Model
+  std::list<ModelMaterial*>  materialList;    //!< A list for all the Materials in this Model
 };
 

trunk/src/story_entities/campaign.h

@@ -3 +3 @@
 #define _CAMPAIGN_H
 
-#include "stdincl.h"
 #include "story_entity.h"
+
 #include <list>