Changeset 6249 in orxonox.OLD for branches/height_map/src/lib/graphics/importer/vertex_array_model.cc

Timestamp:

Dec 21, 2005, 4:24:50 PM (18 years ago)

Author:

bottac

Message:

Uses VertexArrayModel now

File:

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

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

@@ -71 +71 @@
                       GL_TEXTURE_COORD_ARRAY |
                       GL_NORMAL_ARRAY);
-  //  glEnableClientState(GL_INDEX_ARRAY);
+  glEnableClientState(GL_INDEX_ARRAY);
 
   glVertexPointer(3, GL_FLOAT, 0, this->vertices.getArray());
@@ -77 +77 @@
   glTexCoordPointer(2, GL_FLOAT, 0, this->texCoords.getArray());  
 
-  for (GLuint i = 1; i < this->stripes.size(); ++i)
+      glDrawElements(GL_TRIANGLE_STRIP, this->indices.getCount(), GL_UNSIGNED_BYTE, this->indices.getArray());
+/*  for (GLuint i = 1; i < this->stripes.size(); ++i)
     {
       glDrawRangeElements(GL_TRIANGLE_STRIP,
@@ -85 +86 @@
                           GL_UNSIGNED_BYTE,
                           this->indices.getArray());
-    }
+    }*/
 }
 
@@ -194 +195 @@
       for (j = 0; j < 20; j++)
         {
-          this->addVertex(i* 50, .5, (j)*50);
+          this->addVertex((float)i, .5, (float)(j));
           this->addNormal(0, 1, 0);
           this->addTexCoor((float)i/20.0, (float)j/20.0);