Changeset 6454 in orxonox.OLD for trunk/src

Timestamp:

Jan 9, 2006, 11:20:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: changing the height of the Grid should work

Location:

trunk/src/lib/graphics/importer

Files:

• grid.cc (modified) (1 diff)
• grid.h (modified) (2 diffs)
• vertex_array_model.h (modified) (1 diff)

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

@@ -27 +27 @@
 Grid::Grid(float sizeX, float sizeY, unsigned int rows, unsigned int columns)
 {
-
-  GLuint i, j;
-  for (i = 0; i < rows; i++)
-  {
-    for (j = 0; j < columns; j++)
-    {
-      this->addVertex((float)i - (float)sizeY/2.0, 0.0, (float)j - (float)sizeX/2.0);
-      this->addNormal(0.0, 1, 0.0);
-      this->addTexCoor((float)i/(float)columns, (float)j/(float)rows);
-      this->addColor((float)i/20.0, 0.0, (float)j/20.0);
-    }
-  }
-
-  for (i = 0; i < rows-1; i++)
-  {
-    for (j = 0; j < columns; j++)
-    {
-      this->addIndice( rows*i + j );
-      this->addIndice( rows*(i+1) + j );
-    }
-    this->newStripe();
-  }
+  this->planeModel(sizeX, sizeY, rows, columns);
 
   this->_rows = rows;

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

@@ -21 +21 @@
   virtual ~Grid();
 
-  void setSizeX(float sizeX) { this->_sizeX = sizeX; };
-  void setSizeY(float sizeY) { this->_sizeY = sizeY; };
-
   float sizeX() const { return this->_sizeX; };
   float sizeY() const { return this->_sizeY; };
@@ -29 +26 @@
   unsigned int columns() const { return this->_columns; };
 
-  float& height(unsigned int row, unsigned int column);
+  float& height(unsigned int row, unsigned int column) { return this->vertex(row*_columns + row).y;};
 
 private:

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

@@ -51 +51 @@
   unsigned int indiceCount() const { return this->indices.size(); };
 
-//  float& vertex(unsigned int i) { return this->vertices[i]; };
-
+  Vector& vertex(unsigned int i) { return this->vertices[i]; };
+  Vector& normal(unsigned int i) { return this->normals[i]; };
+  //Vector& texCoord(unsigned int i) { return this->texCoord[i]; };
+  Vector& color(unsigned int i) { return this->colors[i]; };
+  GLuint  index(unsigned int i) { return this->indices[i]; };
   //
   void planeModel(float sizeX, float sizeY, unsigned int resolutionX, unsigned int resolutionY);