Changeset 6471 in orxonox.OLD for trunk

Timestamp:

Jan 11, 2006, 12:28:17 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: testing, but not working

Location:

trunk/src

Files:

• lib/graphics/importer/vertex_array_model.cc (modified) (2 diffs)
• world_entities/environments/water.cc (modified) (2 diffs)

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]);
 

trunk/src/world_entities/environments/water.cc

@@ -105 +105 @@
 void Water::draw() const
 {
-  //SkyBox::enableCubeMap();
+  SkyBox::enableCubeMap();
 
  // this->waterShader->activateShader();
@@ -112 +112 @@
   //Shader::deactivateShader();
 
-  //SkyBox::disableCubeMap();
+  SkyBox::disableCubeMap();
 }