Changeset 4802 in orxonox.OLD

Timestamp:

Jul 6, 2005, 4:28:52 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: ok, the normals are included now and just work fine. there is no more work on the triangle creation process to be done. Now comes spatial data partitioning. but i will take a brake before this

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (1 diff)
• model.cc (modified) (3 diffs)

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

@@ -77 +77 @@
 {
   unsigned int   indexToVertices[3];   //!< index to the verteces of the triangle
+  unsigned int   indexToNormals[3];    //!< index to the normals of the triangle
   unsigned int   indexToTexCoor[3];    //!< index to the texture coordinates
 } sTriangleExt;

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

@@ -237 +237 @@
 
   const GLfloat* pVertices = NULL;
+  const GLfloat* pNorm = NULL;
 
   glBegin(GL_TRIANGLES);
   for( int i = 0; i < this->triangleCount; ++i)
   {
+    //printf("int i = %i\n", i);
+    pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[0]];
     pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[0]];
+    glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
     glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
 
+    pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[1]];
     pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[1]];
+    glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
     glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
 
+    pNorm = &this->normals->getArray()[this->triangles[i].indexToNormals[2]];
     pVertices = &this->vertices->getArray()[this->triangles[i].indexToVertices[2]];
+    glNormal3f(pNorm[0], pNorm[1], pNorm[2]);
     glVertex3f(pVertices[0], pVertices[1], pVertices[2]);
 
@@ -916 +924 @@
         {
           this->triangles[index].indexToVertices[j] = (unsigned int)tmpElem->vertexNumber * 3;
+          this->triangles[index].indexToNormals[j] = (unsigned int)tmpElem->normalNumber * 3;
           this->triangles[index].indexToTexCoor[j] = (unsigned int)tmpElem->texCoordNumber * 3;
           tmpElem = tmpElem->next;
@@ -925 +934 @@
 
         this->triangles[index].indexToVertices[0] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 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].indexToNormals[0] = (unsigned int)tmpElem->normalNumber * 3;
         this->triangles[index + 1].indexToTexCoor[0] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
         this->triangles[index].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
         this->triangles[index].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
         this->triangles[index].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
         this->triangles[index].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
 
         this->triangles[index + 1].indexToVertices[2] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToNormals[2] = (unsigned int)tmpElem->normalNumber * 3;
         this->triangles[index + 1].indexToTexCoor[2] = (unsigned int)tmpElem->texCoordNumber * 3;
         tmpElem = tmpElem->next;
 
         this->triangles[index + 1].indexToVertices[1] = (unsigned int)tmpElem->vertexNumber * 3;
+        this->triangles[index + 1].indexToNormals[1] = (unsigned int)tmpElem->normalNumber * 3;
         this->triangles[index + 1].indexToTexCoor[1] = (unsigned int)tmpElem->texCoordNumber * 3;