Changeset 4799 in orxonox.OLD

Timestamp:

Jul 6, 2005, 3:55:22 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the triangle data should be constructed correctly now, if you start orxonox you will only see shit… this means, that the trangles data are not correct at all… I'm woking on this one

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

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

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

@@ -41 +41 @@
     inline unsigned int getCount()const { return this->entryCount; };
     inline int getIndex(T* entry) const;
-    inline bool isFinalized() { return this->finalized; }
+    inline bool isFinalized() const { return this->finalized; }
     void debug() const ;
 
@@ -104 +104 @@
   //  if ((array = (GLfloat*)malloc( entryCount* sizeof(GLfloat))) == NULL)
   if (!(this->array = new GLfloat [this->entryCount]))
-    PRINTF(1)("could not allocate %i data Blocks\n", this->entryCount);
+    PRINTF(0)("could not allocate %i data Blocks\n", this->entryCount);
   Entry* walker = this->firstEntry;
   for (int i=0; i<this->entryCount; i++)

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

@@ -225 +225 @@
 void Model::draw () const
 {
+  /*
   PRINTF(4)("drawing the 3D-Models\n");
   ModelGroup* tmpGroup = this->firstGroup;
@@ -233 +234 @@
       tmpGroup = tmpGroup->next;
     }
+  */
+
+  if(unlikely(this->triangles == NULL))
+    return;
+
+  const GLfloat* pVertices = NULL;
+
+  glBegin(GL_TRIANGLES);
+  for( int i = 0; i < this->triangleCount; ++i)
+  {
+    pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[0]];
+    glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
+
+    pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[1]];
+    glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
+
+    pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[2]];
+    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();
 }
 
@@ -874 +899 @@
 
   /* allocate memory for the new triangle structures */
-  if( unlikely((this->triangles = new sTriangleExt[this->triangleCount]) == 0));
+  if( (this->triangles = new sTriangleExt[this->triangleCount]) == NULL)
   {
-    PRINTF(2)("Could not allocate memory for triangle list\n");
+    PRINTF(1)("Could not allocate memory for triangle list\n");
     return false;
   }
@@ -907 +932 @@
         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;
         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;
         tmpElem = tmpElem->next;
 
         this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
         this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
-        ++index;
-
-        this->triangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber;
         tmpElem = tmpElem->next;
 
-        this->triangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber;
-        tmpElem = tmpElem->next;
-
-        this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
-        this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
-        ++index;
+        this->triangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber;
+        this->triangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber;
+
+        index += 2;
       }
+      tmpFace = tmpFace->next;
     }
     this->currentGroup = this->currentGroup->next;
   }
+  return true;
 }