Changeset 4797 in orxonox.OLD for orxonox

Timestamp:

Jul 6, 2005, 1:54:16 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: whiped out a segfault, that is produced, when the Array::finalize() function is called multiple times

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• array.h (modified) (1 diff)
• model.cc (modified) (2 diffs)

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

@@ -41 +41 @@
     inline unsigned int getCount()const { return this->entryCount; };
     inline int getIndex(T* entry) const;
+    inline bool isFinalized() { return this->finalized; }
     void debug() const ;
 

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

@@ -820 +820 @@
 {
   /* make sure, that all the arrays are finalized */
-  this->vertices->finalizeArray();
-  this->vTexture->finalizeArray();
+  if( unlikely(!this->vertices->isFinalized()))
+    this->vertices->finalizeArray();
+  if( unlikely(!this->vTexture->isFinalized()))
+    this->vTexture->finalizeArray();
   if( normals->getCount() == 0) // vertices-Array must be built for this
     this->buildVertexNormals();
-  this->normals->finalizeArray();
+  if( unlikely(!this->normals->isFinalized()))
+    this->normals->finalizeArray();
 
 
@@ -855 +858 @@
   }
 
+  PRINTF(0)("***************************************GOT %i triangles\n", this->triangleCount);
+
   /* allocate memory for the new triangle structures */
-  if( unlikely((this->triangles = new sTriangleExt[this->vertices->getCount()]) == 0));
+  if( unlikely((this->triangles = new sTriangleExt[this->triangleCount]) == 0));
   {
     PRINTF(2)("Could not allocate memory for triangle list\n");