Changeset 4795 in orxonox.OLD

Timestamp:

Jul 6, 2005, 1:39:33 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: now the model handles triangles and quads

File:

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

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

@@ -833 +833 @@
 
   int i = 0;                       //!< the counter for the triangle array
-  ModelFaceElement* tmpElem;       //!< the temporary face element
+  ModelFaceElement* tmpElem;       //!< the temporary faceelement reference
+  ModelFace* tmpFace;              //!< the temporary face referece
 
   /* now iterate through all groups and build up the triangle list */
@@ -840 +841 @@
   {
       // Putting Faces to GL
-    ModelFace* tmpFace = this->currentGroup->firstFace;
-    while (tmpFace != NULL)
+    tmpFace = this->currentGroup->firstFace;
+    while( tmpFace != NULL)
     {
       tmpElem = tmpFace->firstElem;
 
       /* if its a triangle just add it to the list */
-      if (tmpFace->vertexCount == 3)
+      if( tmpFace->vertexCount == 3)
       {
-        for(int j = 0; j < 3; ++j)
+        for( int j = 0; j < 3; ++j)
         {
           this->triangles[i].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber;
@@ -854 +855 @@
           tmpElem = tmpElem->next;
         }
+        ++i;
+      } /* if the polygon is a quad */
+      else if( tmpFace->vertexCount == 4)
+      {
+
+        this->triangles[i].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber;
+        tmpElem = tmpElem->next;
+
+        this->triangles[i].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber;
+        tmpElem = tmpElem->next;
+
+        this->triangles[i].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
+        ++i;
+
+        this->triangles[i].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber;
+        tmpElem = tmpElem->next;
+
+        this->triangles[i].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber;
+        tmpElem = tmpElem->next;
+
+        this->triangles[i].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[i].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
+        ++i;
       }
-
-      ModelFaceElement* tmpElem = tmpFace->firstElem;
-      while (tmpElem != NULL)
-      {
-              //      PRINTF(2)("%s\n", tmpElem->value);
-        this->addGLElement(tmpElem);
-        tmpElem = tmpElem->next;
-      }
-      tmpFace = tmpFace->next;
-    }
-    glEnd();
-    glEndList();
-
+    }
     this->currentGroup = this->currentGroup->next;
   }