Changeset 8821 in orxonox.OLD for branches/mountain_lake/src/world_entities/environments

Timestamp:

Jun 27, 2006, 12:40:05 PM (18 years ago)

Author:

stefalie

Message:

water: minor changes

File:

• branches/mountain_lake/src/world_entities/environments/mapped_water.cc (modified) (2 diffs)

branches/mountain_lake/src/world_entities/environments/mapped_water.cc

@@ -104 +104 @@
   mat.setDiffuseMap(refrTex, 1);
   // load normal map
-  mat.setDiffuseMap("pictures/normalmap.bmp", GL_TEXTURE_2D, 2);
+  mat.setDiffuseMap("pictures/water_normalmap.bmp", GL_TEXTURE_2D, 2);
   // load dudv map
-  mat.setDiffuseMap("pictures/dudvmap.bmp", GL_TEXTURE_2D, 3);
+  mat.setDiffuseMap("pictures/water_dudvmap.bmp", GL_TEXTURE_2D, 3);
 
   // sets texture parameters for reflection texture
@@ -247 +247 @@
   glBegin(GL_QUADS);
   // The back left vertice for the water
-  glMultiTexCoord2f(GL_TEXTURE0, 0, waterUV);            // Reflection texture
-  glMultiTexCoord2f(GL_TEXTURE1, 0, waterUV - move);        // Refraction texture
-  glMultiTexCoord2f(GL_TEXTURE2, 0, normalUV + move2);     // Normal map texture
-  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                       // DUDV map texture
+  glMultiTexCoord2f(GL_TEXTURE0, 0, waterUV);                   // Reflection texture
+  glMultiTexCoord2f(GL_TEXTURE1, 0, waterUV - move);            // Refraction texture
+  glMultiTexCoord2f(GL_TEXTURE2, 0, normalUV + move2);          // Normal map texture
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                         // DUDV map texture
   glVertex3f(this->waterPos.x, this->waterPos.y, this->waterPos.z);
 
   // The front left vertice for the water
-  glMultiTexCoord2f(GL_TEXTURE0, 0, 0);                  // Reflection texture
-  glMultiTexCoord2f(GL_TEXTURE1, 0, -move);           // Refraction texture
-  glMultiTexCoord2f(GL_TEXTURE2, 0, move2);          // Normal map texture
-  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
+  glMultiTexCoord2f(GL_TEXTURE0, 0, 0);                         // Reflection texture
+  glMultiTexCoord2f(GL_TEXTURE1, 0, -move);                     // Refraction texture
+  glMultiTexCoord2f(GL_TEXTURE2, 0, move2);                     // Normal map texture
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                         // DUDV map texture
   glVertex3f(this->waterPos.x, this->waterPos.y, this->waterPos.z + this->zWidth);
 
   // The front right vertice for the water
-  glMultiTexCoord2f(GL_TEXTURE0, waterUV, 0);             // Reflection texture
-  glMultiTexCoord2f(GL_TEXTURE1, waterUV, -move);         // Refraction texture
-  glMultiTexCoord2f(GL_TEXTURE2, normalUV, move2);      // Normal map texture
-  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
+  glMultiTexCoord2f(GL_TEXTURE0, waterUV, 0);                   // Reflection texture
+  glMultiTexCoord2f(GL_TEXTURE1, waterUV, -move);               // Refraction texture
+  glMultiTexCoord2f(GL_TEXTURE2, normalUV, move2);              // Normal map texture
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                         // DUDV map texture
   glVertex3f(this->waterPos.x + this->xWidth, this->waterPos.y, this->waterPos.z + this->zWidth);
 
   // The back right vertice for the water
-  glMultiTexCoord2f(GL_TEXTURE0, waterUV, waterUV);        // Reflection texture
-  glMultiTexCoord2f(GL_TEXTURE1, waterUV, waterUV - move);       // Refraction texture
-  glMultiTexCoord2f(GL_TEXTURE2, normalUV, normalUV + move2);  // Normal map texture
-  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
+  glMultiTexCoord2f(GL_TEXTURE0, waterUV, waterUV);             // Reflection texture
+  glMultiTexCoord2f(GL_TEXTURE1, waterUV, waterUV - move);      // Refraction texture
+  glMultiTexCoord2f(GL_TEXTURE2, normalUV, normalUV + move2);   // Normal map texture
+  glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                         // DUDV map texture
   glVertex3f(this->waterPos.x + this->xWidth, this->waterPos.y, this->waterPos.z);
   glEnd();