Changeset 5709 in orxonox.OLD

Timestamp:

Nov 22, 2005, 4:03:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new ModelInfo-member in AbstractModel

Location:

branches/collision_detection/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (1 diff)
• model.cc (modified) (4 diffs)

branches/collision_detection/src/lib/graphics/importer/abstract_model.h

@@ -128 +128 @@
 
   public:
-    AbstractModel() {}
+    AbstractModel() {
+      this->pModelInfo.numVertices = 0;
+      this->pModelInfo.numTriangles = 0;
+      this->pModelInfo.numNormals = 0;
+      this->pModelInfo.numTexCoor = 0;
+
+      this->pModelInfo.pVertices = NULL;
+      this->pModelInfo.pTriangles = NULL;
+      this->pModelInfo.pNormals = NULL;
+      this->pModelInfo.pTexCoor = NULL;
+    }
     virtual ~AbstractModel() {}
 
-    inline const modelInfo* getModelInfo() const { return this->pModelInfo; }
+    inline const modelInfo* getModelInfo() const { return &this->pModelInfo; }
 
 
   protected:
-    modelInfo*     pModelInfo;      //!< Reference to the modelInfo
+    modelInfo      pModelInfo;      //!< Reference to the modelInfo
 };
 

branches/collision_detection/src/lib/graphics/importer/model.cc

@@ -158 +158 @@
   this->triangleCount = 0;
   this->triangles = NULL;
-  this->pModelInfo = NULL;
 
   this->scaleFactor = 1;
@@ -208 +207 @@
   delete tmpIt;
   delete materialList;
-  delete this->pModelInfo;
 }
 
@@ -226 +224 @@
 
   /* load the ModelInfo */
-  this->pModelInfo = new modelInfo;
-  this->pModelInfo->numVertices = this->vertexCount;
-  this->pModelInfo->pVertices = this->vertices->getArray();
-  this->pModelInfo->numTriangles = this->triangleCount;
-  this->pModelInfo->pTriangles = this->triangles;
-  this->pModelInfo->numNormals = this->normalCount;
-  this->pModelInfo->pNormals = this->normals->getArray();
-  this->pModelInfo->numTexCoor = this->vTexture->getCount();
-  this->pModelInfo->pTexCoor = this->vTexture->getArray();
+  this->pModelInfo.numVertices = this->vertexCount;
+  this->pModelInfo.pVertices = this->vertices->getArray();
+  this->pModelInfo.numTriangles = this->triangleCount;
+  this->pModelInfo.pTriangles = this->triangles;
+  this->pModelInfo.numNormals = this->normalCount;
+  this->pModelInfo.pNormals = this->normals->getArray();
+  this->pModelInfo.numTexCoor = this->vTexture->getCount();
+  this->pModelInfo.pTexCoor = this->vTexture->getArray();
 
   this->finalized = true;
@@ -929 +926 @@
   PRINTF(3)("got %i triangles, %i vertices\n", this->triangleCount, this->vertexCount);
 
-  
+
   /* write MODELINFO structure */