Changeset 8018 in orxonox.OLD

Timestamp:

May 31, 2006, 12:25:16 PM (18 years ago)

Author:

stefalie

Message:

branches/water: under/over water?

File:

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

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

@@ -203 +203 @@
 void MappedWater::activateReflection()
 {
+  // save viewport matrix and change the viewport size
   glPushAttrib(GL_VIEWPORT_BIT);
-
-
-  //glLoadIdentity();
   glViewport(0,0, textureSize, textureSize);
 
   glPushMatrix();
-  // Clear the color and depth bits, reset the matrix and position our camera.
-
-  //g_Camera.Look();
-
 
   // If our camera is above the water we will render the scene flipped upside down.
   // In order to line up the reflection nicely with the world we have to translate
   // the world to the position of our reflected surface, multiplied by two.
-  //if(g_Camera.Position().y > waterHeight)
-  //{
-  // Translate the world, then flip it upside down
-  glTranslatef(0.0f, this->waterHeight*2.0f, 0.0f);
-  glScalef(1.0, -1.0, 1.0);
-
-  // Since the world is updside down we need to change the culling to FRONT
-  //glCullFace(GL_FRONT);
-
-  // Set our plane equation and turn clipping on
-  //double plane[4] = {0.0, 1.0, 0.0, -waterHeight};
-  //glEnable(GL_CLIP_PLANE0);
-  //glClipPlane(GL_CLIP_PLANE0, plane);
-
-  // Render the world upside down and clipped (only render the top flipped).
-  // If we don't turn OFF caustics for the reflection texture we get horrible
-  // artifacts in the water.  That is why we set bRenderCaustics to FALSE.
-  //RenderWorld(false);
-
-  // Turn clipping off
-  // glDisable(GL_CLIP_PLANE0);
-
-  // Restore back-face culling
-  //  glCullFace(GL_BACK);
-  //}
-  /*else
+  Vector pos = State::getCameraNode()->getAbsCoor();
+  if(pos.y > waterHeight)
   {
-      // If the camera is below the water we don't want to flip the world,
-      // but just render it clipped so only the top is drawn.
-      double plane[4] = {0.0, 1.0, 0.0, waterHeight};
-      glEnable(GL_CLIP_PLANE0);
-      glClipPlane(GL_CLIP_PLANE0, plane);
-      RenderWorld(true);
-      glDisable(GL_CLIP_PLANE0);
-  }*/
+    // Translate the world, then flip it upside down
+    glTranslatef(0.0f, waterHeight*2.0f, 0.0f);
+    glScalef(1.0, -1.0, 1.0);
+
+    // Since the world is updside down we need to change the culling to FRONT
+    glCullFace(GL_FRONT);
+
+    // Set our plane equation and turn clipping on
+    double plane[4] = {0.0, 1.0, 0.0, -waterHeight};
+    glEnable(GL_CLIP_PLANE0);
+    glClipPlane(GL_CLIP_PLANE0, plane);
+  }
+  else
+  {
+    // If the camera is below the water we don't want to flip the world,
+    // but just render it clipped so only the top is drawn.
+    double plane[4] = {0.0, 1.0, 0.0, waterHeight};
+    glEnable(GL_CLIP_PLANE0);
+    glClipPlane(GL_CLIP_PLANE0, plane);
+  }
 }
 
@@ -258 +240 @@
 void MappedWater::deactivateReflection()
 {
-//  glBindTexture(GL_TEXTURE_2D, texture.getTexture()); //is done by mat.select();
-  //glBindTexture(GL_TEXTURE_2D, this->mat.getDiffuseTexture(0));
-
-  //mat.setDiffuseMap(&texture, 0);
+  glDisable(GL_CLIP_PLANE0);
+  glCullFace(GL_BACK);
 
   mat.select();
   glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
-  //glDisable(GL_CLIP_PLANE0);
 
   glPopMatrix();
-
   glPopAttrib();
 }