Changeset 4793 in orxonox.OLD

Timestamp:

Jul 6, 2005, 12:50:31 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some comments, started implementing the Model::buildTriangleList() function, Array::getIndex now makes a value not reference comparison

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• array.h (modified) (2 diffs)
• model.cc (modified) (2 diffs)
• model.h (modified) (3 diffs)

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

@@ -155 +155 @@
 
 
-
+/**
+   \brief gets back the index of the entry in the array. value check
+   \param entry: the entry to look up
+   \returns the index in the array, -1 if not found
+ */
 template<class T>
 int Array<T>::getIndex(T* entry) const
@@ -164 +168 @@
   for(int i = 0; i < this->entryCount; ++i)
   {
-    if( unlikely(entry == &this->array[i]))
+    if( unlikely(*entry == this->array[i]))
       return i;
   }

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

@@ -12 +12 @@
    main-programmer: Benjamin Grauer
    co-programmer: ...
+
+   2005-07-06: (Patrick) added new function buildTriangleList()
 */
 
@@ -817 +819 @@
 bool Model::buildTriangleList()
 {
-
+  /* make sure, that all the arrays are finalized */
+  this->vertices->finalizeArray();
+  this->vTexture->finalizeArray();
+  if( normals->getCount() == 0) // vertices-Array must be built for this
+    this->buildVertexNormals();
+  this->normals->finalizeArray();
+
+  if( unlikely((this->triangles = new sTriangle[this->vertices->getCount()]) == 0));
+  {
+    PRINTF(2)("Could not allocate memory for triangle list\n");
+    return false;
+  }
+
+  int i = 0;                       //!< the counter for the triangle array
+  ModelFaceElement* tmpElem;       //!< the temporary face element
+
+  /* now iterate through all groups and build up the triangle list */
+  this->currentGroup = this->firstGroup;
+  while( this->currentGroup != NULL)
+  {
+      // Putting Faces to GL
+    ModelFace* tmpFace = this->currentGroup->firstFace;
+    while (tmpFace != NULL)
+    {
+      tmpElem = tmpFace->firstElem;
+
+      /* if its a triangle just add it to the list */
+      if (tmpFace->vertexCount == 3)
+      {
+        for(int j = 0; j < 3; ++j)
+        {
+          //this->triangles[i].indexToVertices[j] = this->vertices->getIndex(tmpElem);
+          tmpElem = tmpElem->next;
+        }
+      }
+
+      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;
+  }
 }
 

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

@@ -7 +7 @@
 #define _MODEL_H
 
+#include "abstract_model.h"
 #include "base_object.h"
 #include "material.h"
@@ -17 +18 @@
 template<class T> class Array;
 template<class T> class tList;
+
 
 //! an enumerator fot the different Model Types.
@@ -176 +178 @@
   Array<GLfloat>*  normals;         //!< The Array that handles the Normals.
   Array<GLfloat>*  vTexture;        //!< The Array that handles the VertexTextureCoordinates.
+  sTriangle*       triangles;       //!< The Array of triangles in the abstract_model.h style
 
   ModelGroup*      firstGroup;      //!< The first of all groups.