Changeset 3917 in orxonox.OLD

Timestamp:

Apr 21, 2005, 3:34:38 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: minor

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

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

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

@@ -54 +54 @@
 
   this->materialList = new tList<Material>;
+
+  if (this->type == MODEL_VERTEX_ARRAY)
+    glEnableClientState(GL_VERTEX_ARRAY | GL_NORMAL_ARRAY | GL_TEXTURE_COORD_ARRAY);
 }
 
@@ -820 +823 @@
 
   this->currentGroup = this->firstGroup;
-
+  glVertexPointer(3, GL_FLOAT, 0, this->vertices->getArray());
+  glNormalPointer(3, 0, this->normals->getArray());
+  glTexCoordPointer(2, GL_FLOAT, 0, this->vTexture->getArray());
 
 }

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

@@ -8 +8 @@
 
 #include "material.h"
+#include "glincl.h"
 
 // FORWARD DEFINITION //
@@ -65 +66 @@
     char* name;         //!< the Name of the Group. this is an identifier, that can be accessed via the draw (char* name) function.
 
-    unsigned int listNumber;//!< The number of the GL-List this Group gets.
+    GLubyte* indices;   //!< The indices of the Groups. Needed for vertex-arrays
+    GLuint listNumber;  //!< The number of the GL-List this Group gets.
     Face* firstFace;    //!< The first Face in this group.
     Face* currentFace;  //!< The current Face in this Group (the one we are currently working with.)