Changeset 4106 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

May 7, 2005, 4:26:35 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: new Model Definitions, to make it more safe (better output)

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• model.cc (modified) (10 diffs)
• model.h (modified) (2 diffs)

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

@@ -140 +140 @@
   this->currentGroup = this->firstGroup = new ModelGroup;
   this->groupCount = 0;
+  this->vertexCount = 0;
+  this->normalCount = 0;
+  this->texCoordCount = 0;
   
   this->scaleFactor = 1;
@@ -355 +358 @@
 Material* Model::addMaterial(const char* materialName)
 {
-  
   Material* newMat = new Material();
   newMat->setName(materialName);
@@ -424 +426 @@
   PRINTF(5)("reading in a vertex: %f %f %f\n", &subbuffer1, &subbuffer2, &subbuffer3);
   this->vertices->addEntry(subbuffer1*scaleFactor, subbuffer2*scaleFactor, subbuffer3*scaleFactor);
+  this->vertexCount++;
   return true;
 }
@@ -438 +441 @@
   PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
   this->vertices->addEntry(x*scaleFactor, y*scaleFactor, z*scaleFactor);
+  this->vertexCount++;
   return true;
 }
@@ -455 +459 @@
   PRINTF(5)("found vertex-Normal %f, %f, %f\n", &subbuffer1,&subbuffer2,&subbuffer3);
   this->normals->addEntry(subbuffer1, subbuffer2, subbuffer3);
+  this->normalCount++;
   return true;
 }
@@ -470 +475 @@
   PRINTF(5)("found vertex-Normal %f, %f, %f\n", x, y, z);
   this->normals->addEntry(x, y, z);
+  this->normalCount++;
+  return true;
 }
 
@@ -487 +494 @@
   this->vTexture->addEntry(subbuffer1);
   this->vTexture->addEntry(subbuffer2);
+  this->texCoordCount++;
   return true;
 }
@@ -502 +510 @@
   this->vTexture->addEntry(u);
   this->vTexture->addEntry(v);
+  this->texCoordCount++;
+  return true;
 }
 
@@ -583 +593 @@
   for (int i = 0; i < faceElemCount; i++)
     {
-      if (this->currentGroup->currentFace->vertexCount>0)
+      if (this->currentGroup->currentFace->vertexCount > 0)
         tmpElem = tmpElem->next = new ModelFaceElement;
 
@@ -592 +602 @@
         tmpElem->normalNumber = va_arg(itemlist, int) -1;
       this->currentGroup->currentFace->vertexCount++;
+
+      if (unlikely(tmpElem->vertexNumber > this->vertexCount))
+        PRINTF(1)("VERTEX %d IS NOT IN THE LIST -> DANGER OF SEGFAULT (max is: %d)\n", tmpElem->vertexNumber, this->vertexCount);
+      if (unlikely(tmpElem->normalNumber > this->normalCount))
+        PRINTF(1)("VERTEX %d IS NOT IN THE LIST -> DANGER OF SEGFAULT (max is: %d)\n", tmpElem->normalNumber, this->normalCount);
+      if (unlikely(tmpElem->texCoordNumber > this->texCoordCount))
+        PRINTF(1)("VERTEX %d IS NOT IN THE LIST -> DANGER OF SEGFAULT (max is: %d)\n", tmpElem->texCoordNumber, this->texCoordCount);
     }
   va_end(itemlist);

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

@@ -99 +99 @@
   bool finalized;             //!< Sets the Object to be finalized.
 
+  int vertexCount;            //!< A modelwide Counter for vertices.
+  int normalCount;            //!< A modelwide Counter for the normals.
+  int texCoordCount;          //!< A modelwide Counter for the texCoord.
   Array* vertices;            //!< The Array that handles the Vertices.
-  int verticesCount;          //!< A global Counter for vertices.
   Array* normals;             //!< The Array that handles the Normals.
   Array* vTexture;            //!< The Array that handles the VertexTextureCoordinates.
@@ -158 +160 @@
   bool setMaterial(Material* mtl);
   void finalize(void);
+
+  /** \returns The number of Vertices of the Model */
+  inline int getVertexCount(void) const {return this->vertexCount;}
+  /** \returns The number of Normals of the Model */
+  inline int getNormalCount(void) const {return this->normalCount;}
+  /** \returns The number of Texture Coordinates of the Model*/
+  inline int getTexCoordCount(void) const {return this->texCoordCount;}
 };