Changeset 6046 in orxonox.OLD for branches/spaceshipcontrol/src/lib/graphics/importer/vertex_array_model.cc

Timestamp:

Dec 11, 2005, 2:42:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/controll: Should compile on windows again

File:

• branches/spaceshipcontrol/src/lib/graphics/importer/vertex_array_model.cc (modified) (4 diffs)

branches/spaceshipcontrol/src/lib/graphics/importer/vertex_array_model.cc

@@ -33 +33 @@
 VertexArrayModel::VertexArrayModel()
 {
-  this->setClassID(CL_MODEL, "VertexArrayModel");
+  this->setClassID(CL_VERTEX_ARRAY_MODEL, "VertexArrayModel");
 
   this->finalized = false;
@@ -88 +88 @@
   glVertexPointer(3, GL_FLOAT, 0, this->vertices.getArray());
   glNormalPointer(GL_FLOAT, 0, this->normals.getArray());
-  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());  
+  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());
 
   printf("%d\n", this->indices.getCount());
@@ -100 +100 @@
   /*  const GLfloat* pVertices = NULL;
       const GLfloat* pNorm = NULL;
-      
+
       glBegin(GL_TRIANGLES);
       for( int i = 0; i < this->triangleCount; ++i)
@@ -109 +109 @@
       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]);
-      
+
       }
       glEnd();