Changeset 4108 in orxonox.OLD

Timestamp:

May 7, 2005, 4:49:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: model even saver now

File:

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

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

@@ -566 +566 @@
       else
         tmpElem->normalNumber = -1;
-      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);
 
       faceString += tmpLen;
@@ -608 +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);
@@ -716 +703 @@
     }
 
-  for (int i=0; i<vertices->getCount()/3;i++)
+  for (int i=0; i < vertices->getCount()/3;i++)
     {
       normArray[i].normalize();
       PRINTF(5)("Found Normale number %d: (%f; %f, %f).\n", i, normArray[i].x, normArray[i].y, normArray[i].z);
       
-      this->normals->addEntry(normArray[i].x, normArray[i].y, normArray[i].z);
+      this->addVertexNormal(normArray[i].x, normArray[i].y, normArray[i].z);
 
     }
@@ -857 +844 @@
 
   if (elem->texCoordNumber != -1)
-    glTexCoord2fv(this->vTexture->getArray() + elem->texCoordNumber * 2);
+    {
+      if (likely(elem->texCoordNumber <= this->texCoordCount))
+        glTexCoord2fv(this->vTexture->getArray() + elem->texCoordNumber * 2);
+      else
+        PRINTF(2)("TextureCoordinate %d is not in the List (max: %d)\nThe Model might be incomplete\n",
+                  elem->texCoordNumber, this->texCoordCount);
+    }
   if (elem->normalNumber != -1)
-    glNormal3fv(this->normals->getArray() + elem->normalNumber * 3);
+    {
+    if (likely(elem->normalNumber <= this->normalCount))
+      glNormal3fv(this->normals->getArray() + elem->normalNumber * 3);
+    else
+        PRINTF(2)("Normal %d is not in the List (max: %d)\nThe Model might be incomplete",
+                  elem->normalNumber, this->normalCount);      
+    }
   if (elem->vertexNumber != -1)
-    glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
+    {
+      if (likely(elem->vertexNumber <= this->vertexCount))
+          glVertex3fv(this->vertices->getArray() + elem->vertexNumber * 3);
+      else
+        PRINTF(2)("Vertex %d is not in the List (max: %d)\nThe Model might be incomplete",
+                  elem->vertexNumber, this->vertexCount);      
+    }   
+
 }