Changeset 6012 in orxonox.OLD

Timestamp:

Dec 10, 2005, 5:50:35 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: vertex_array_model is way better now

Location:

trunk/src/lib/graphics/importer

Files:

• vertex_array_model.cc (modified) (5 diffs)
• vertex_array_model.h (modified) (1 diff)

trunk/src/lib/graphics/importer/vertex_array_model.cc

@@ -55 +55 @@
     PRINT(4)("\n");
   }
-  this->cleanup();
 }
 
@@ -91 +90 @@
   glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());  
 
+  printf("%d\n", this->indices.getCount());
   glDrawElements(GL_TRIANGLE_STRIP,
                  this->indices.getCount(),
@@ -190 +190 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool VertexArrayModel::importToVertexArray()
+void VertexArrayModel::importToVertexArray()
 {
   // finalize the Arrays
@@ -196 +196 @@
   this->texCoords.finalizeArray();
   this->normals.finalizeArray();
-
-
-  glEnableClientState(GL_VERTEX_ARRAY);
-  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-  glEnableClientState(GL_NORMAL_ARRAY);
+  this->indices.finalizeArray();
+
+  //  glEnableClientState(GL_VERTEX_ARRAY);
+  //  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  //  glEnableClientState(GL_NORMAL_ARRAY);
   //  glEnableClientState(GL_INDEX_ARRAY);
-
-  glVertexPointer(3, GL_FLOAT, 0, this->vertices.getArray());
-  glNormalPointer(GL_FLOAT, 0, this->normals.getArray());
-  glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());
 }
 
@@ -225 +221 @@
       for (j = 0; j < 20; j++)
         {
-          this->addVertex(i, i-10*j-10, j);
-          this->addNormal(i-10, 1, j-10);
+          this->addVertex(i* 50, .5, (j)*50);
+          this->addNormal(0, 1, 0);
           this->addTexCoor((float)i/20.0, (float)j/20.0);
 

trunk/src/lib/graphics/importer/vertex_array_model.h

@@ -44 +44 @@
 
  private:
-  bool importToVertexArray();
-
-  bool cleanup();
+  void importToVertexArray();
 
  private: