Changeset 6261 in orxonox.OLD for branches

Timestamp:

Dec 22, 2005, 5:39:18 PM (19 years ago)

Author:

bensch

Message:

heightmap: better stipes

File:

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

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

@@ -67 +67 @@
 {
   PRINTF(4)("drawing the 3D-VertexArrayModels\n");
+  glDisable(GL_LIGHTING);
 
   glEnableClientState(GL_VERTEX_ARRAY );
@@ -79 +80 @@
   glColorPointer(3, GL_FLOAT, 0, this->colors.getArray());
 
-//      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,
-                          this->stripes[i-1],
-                          this->stripes[i],
-                          this->indices.getCount(),
-                          GL_UNSIGNED_BYTE,
-                          this->indices.getArray());
+      glDrawElements(GL_TRIANGLE_STRIP, this->stripes[i] - this->stripes[i-1], GL_UNSIGNED_BYTE, this->indices.getArray()+this->stripes[i-1]);
+//       glDrawRangeElements(GL_TRIANGLE_STRIP,
+//                        this->stripes[i-1],
+//                        this->stripes[i],
+//                        this->indices.getCount(),
+//                        GL_UNSIGNED_BYTE,
+//                        this->indices.getArray());
     }
+    glEnable(GL_LIGHTING);
 }
 
@@ -100 +102 @@
 void VertexArrayModel::newStripe()
 {
-  this->stripes.push_back(this->vertices.getCount()-1);
+  this->stripes.push_back(this->indices.getCount());
 }
 
@@ -184 +186 @@
   this->newStripe();
 
+  for (int i = 0 ; i < this->stripes.size(); i++)
+  {
+    printf("== %d ==\n", stripes[i]);
+
+  }
+
   /*
     glEnableClientState(GL_VERTEX_ARRAY |
@@ -212 +220 @@
       for (j = 0; j < sizeX; j++)
         {
-          this->addVertex((float)i - sizeY/2.0, -(float)i * (float)j/(float)sizeY/(float)sizeX * 10.0 , (float)(j) - sizeX/2.0);
+          this->addVertex((float)i - sizeY/2.0, sin(-(float)i/(float)sizeY*5.0) * cos((float)j/(float)sizeX*5.0) * 10.0 , (float)(j) - sizeX/2.0);
           this->addNormal((float)i/(float)sizeY, 1, (float)j/(float)sizeX);
           this->addTexCoor((float)i/(float)sizeY, (float)j/(float)sizeY);