Changeset 5774 in orxonox.OLD for trunk/src/lib/graphics/importer/model.cc

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: stl in Model

File:

• trunk/src/lib/graphics/importer/model.cc (modified) (7 diffs)

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 */