Changeset 4798 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 6, 2005, 2:22:11 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some more stability in triangle count calculation

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• model.cc (modified) (5 diffs)
• model.h (modified) (1 diff)

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

@@ -148 +148 @@
   this->texCoordCount = 0;
   this->faceCount = 0;
+  this->triangleCount = 0;
+  this->triangles = NULL;
 
   this->scaleFactor = 1;
@@ -303 +305 @@
   if (this->normals)
     delete this->normals;
+  if (this->triangles)
+    delete this->triangles;
 
   this->vertices = NULL;
   this->vTexture = NULL;
   this->normals = NULL;
+  this->triangles = NULL; this->triangleCount = 0;
 }
 
@@ -819 +824 @@
 bool Model::buildTriangleList()
 {
+  if( unlikely(this->triangles != NULL))
+    return true;
   /* make sure, that all the arrays are finalized */
   if( unlikely(!this->vertices->isFinalized()))
@@ -836 +843 @@
   /* count the number of triangles */
   /* now iterate through all groups and build up the triangle list */
+  this->triangleCount = 0;
   this->currentGroup = this->firstGroup;
   while( this->currentGroup != NULL)
   {
-      // Putting Faces to GL
     tmpFace = this->currentGroup->firstFace;
     while( tmpFace != NULL)
     {
-      tmpElem = tmpFace->firstElem;
 
       /* if its a triangle just add it to the list */
@@ -854 +860 @@
         this->triangleCount += 2;
       }
+      else if( tmpFace->vertexCount > 4)
+      {
+        PRINTF(0)("NASTY NASTY: More than 4 vertices for a face, there will be errors in the triangles information!\n");
+      //exit(0);
+      }
+      tmpFace = tmpFace->next;
     }
     this->currentGroup = this->currentGroup->next;
   }
 
-  PRINTF(0)("***************************************GOT %i triangles\n", this->triangleCount);
+  PRINTF(0)("***************************************GOT %i triangles, %i vertices\n", this->triangleCount, this->vertexCount);
+
 
   /* allocate memory for the new triangle structures */

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

@@ -175 +175 @@
   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
+  unsigned int     triangleCount;   //!< Number of triangles >= faceCount
   Array<GLfloat>*  vertices;        //!< The Array that handles the Vertices.
   Array<GLfloat>*  normals;         //!< The Array that handles the Normals.