Changeset 6265 in orxonox.OLD for branches

Timestamp:

Dec 22, 2005, 7:10:54 PM (19 years ago)

Author:

bensch

Message:

heightMap: drawing works: *fu* GLubyte…

Location:

branches/height_map/src/lib/graphics/importer

Files:

• vertex_array_model.cc (modified) (5 diffs)
• vertex_array_model.h (modified) (2 diffs)

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

@@ -84 +84 @@
       glDrawElements( GL_TRIANGLE_STRIP,
                       this->stripes[i] - this->stripes[i-1],
-                      GL_UNSIGNED_BYTE,
+                      GL_UNSIGNED_INT,
                       &this->indices[this->stripes[i-1]] );
     }
@@ -171 +171 @@
  * @param type The information Passed with each Vertex
 */
-void VertexArrayModel::addIndice(GLubyte indice)
+void VertexArrayModel::addIndice(GLuint indice)
 {
   this->indices.push_back(indice);
@@ -206 +206 @@
 void VertexArrayModel::planeModel()
 {
-  unsigned int sizeX = 20, sizeY = 20;
-
-  unsigned int i, j;
+  GLuint sizeX = 20;
+  GLuint sizeY = 20;
+
+  GLuint i, j;
   for (i = 0; i < sizeY; i++)
     {
@@ -228 +229 @@
     }
     this->newStripe();
-    this->debug();
   }
 }
@@ -299 +299 @@
   for (GLuint i = 1; i < this->stripes.size(); ++i)
   {
-    PRINT(0)("Stripe-%d ::", i);
+    PRINT(0)("Stripe-%d (s:%d:e:%d):: ", i, this->stripes[i-1], this->stripes[i]);
     for (GLuint j = this->stripes[i-1] ; j < this->stripes[i]; j++)
     {

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

@@ -40 +40 @@
   void addColor(float r, float g, float b);
 
-  void addIndice(GLubyte indice);
+  void addIndice(GLuint indice);
 
   void finalize();
@@ -61 +61 @@
   std::vector<GLfloat>       colors;          //!< The Array that handles Colors.
 
-  std::vector<GLubyte>       indices;         //!< The Array that tells us what Vertex is connected to which other one.
+  std::vector<GLuint>        indices;         //!< The Array that tells us what Vertex is connected to which other one.
 
   std::vector<GLuint>        stripes;         //!< A lsit of Stripes of this Model.