Changeset 6519 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Jan 18, 2006, 12:38:19 AM (18 years ago)

Author:

bensch

Message:

trunk: better smoother water

Location:

trunk/src/lib/graphics/importer

Files:

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

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

@@ -28 +28 @@
 
   float& height(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column).y;};
+  Vector& vertexG(unsigned int row, unsigned int column) { return this->vertex(row*this->_columns + column); };
+  Vector& normalG(unsigned int row, unsigned int column) { return this->normal(row*this->_columns + column); };
 
 

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

@@ -137 +137 @@
   PRINTF(4)("drawing 3D-VertexArrayModel %s\n", this->getName());
   glEnableClientState(GL_VERTEX_ARRAY );
-  //glEnableClientState(GL_TEXTURE_COORD_ARRAY );
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY );
   glEnableClientState(GL_NORMAL_ARRAY );
   glEnableClientState(GL_COLOR_ARRAY );
@@ -144 +144 @@
   glVertexPointer(3, GL_FLOAT, 0, &this->vertices[0]);
   glNormalPointer(GL_FLOAT, 0, &this->normals[0]);
-  //glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
+  glTexCoordPointer(2, GL_FLOAT, 0, &this->texCoords[0]);
   glColorPointer(3, GL_FLOAT, 0, &this->colors[0]);