Changeset 4800 in orxonox.OLD for orxonox/trunk/src/lib/graphics/importer

Timestamp:

Jul 6, 2005, 3:59:44 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: found the problem, got the offsets wrong in the triangle vertices indexes. there are still some unfilled triangles, will work in this one now

File:

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

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

@@ -236 +236 @@
   */
 
-  if(unlikely(this->triangles == NULL))
-    return;
-
   const GLfloat* pVertices = NULL;
 
@@ -253 +250 @@
     glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
 
-
-//     glVertex3fv(&this->vertices->getArray()[this->triangles[i].indexToVertices[1]]);
-//     glVertex3fv(&this->vertices->getArray()[this->triangles[i].indexToVertices[2]]);
   }
   glEnd();
@@ -921 +915 @@
         for( int j = 0; j < 3; ++j)
         {
-          this->triangles[index].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber;
-          this->triangles[index].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber;
+          this->triangles[index].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber * 3;
+          this->triangles[index].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber * 3;
           tmpElem = tmpElem->next;
         }
@@ -930 +924 @@
       {
 
-        this->triangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber;
-
-        this->triangles[index + 1].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index + 1].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber;
+        this->triangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
+
+        this->triangles[index + 1].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->triangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber;
-
-        this->triangles[index + 1].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index + 1].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber;
+        this->triangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
+
+        this->triangles[index + 1].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
+        this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
-        this->triangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
+        this->triangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
 
         index += 2;