Changeset 8632 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 3:12:48 PM (18 years ago)

Author:

stefalie

Message:

water: mighty reflection is still at the wrong place

File:

• branches/water/src/world_entities/environments/mapped_water.cc (modified) (5 diffs)

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

@@ -166 +166 @@
 
   glPushMatrix();
-  glTranslatef(this->waterPos.x ,0 ,this->waterPos.z);
+  // don't use a glTranslate here, the reflection point won't be at the right place anymore
   glRotatef(this->waterAngle, 0, 1, 0);
 
@@ -185 +185 @@
   glMultiTexCoord2f(GL_TEXTURE2, 0, normalUV + move2);     // Normal map texture
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                       // DUDV map texture
-  glVertex3f(0, this->waterPos.y, 0);
+  glVertex3f(this->waterPos.x, this->waterPos.y, this->waterPos.z);
 
   // The front left vertice for the water
@@ -192 +192 @@
   glMultiTexCoord2f(GL_TEXTURE2, 0, move2);          // Normal map texture
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
-  glVertex3f(0, this->waterPos.y, this->zWidth);
+  glVertex3f(this->waterPos.x, this->waterPos.y, this->waterPos.z + this->zWidth);
 
   // The front right vertice for the water
@@ -199 +199 @@
   glMultiTexCoord2f(GL_TEXTURE2, normalUV, move2);      // Normal map texture
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
-  glVertex3f(this->xWidth, this->waterPos.y, this->zWidth);
+  glVertex3f(this->waterPos.x + this->xWidth, this->waterPos.y, this->waterPos.z + this->zWidth);
 
   // The back right vertice for the water
@@ -206 +206 @@
   glMultiTexCoord2f(GL_TEXTURE2, normalUV, normalUV + move2);  // Normal map texture
   glMultiTexCoord2f(GL_TEXTURE3, 0, 0);                        // DUDV map texture
-  glVertex3f(this->xWidth, this->waterPos.y, 0);
+  glVertex3f(this->waterPos.x + this->xWidth, this->waterPos.y, this->waterPos.z);
   glEnd();