Changeset 7741 in orxonox.OLD

Timestamp:

May 20, 2006, 11:56:55 AM (18 years ago)

Author:

patrick

Message:

water: i think i eliminated some more bugs. the texture now displayed is strange… it's a simple texture. perhaps bensch knows what happened here

Location:

branches/water/src

Files:

• story_entities/game_world.cc (modified) (3 diffs)
• world_entities/environments/mapped_water.cc (modified) (2 diffs)

branches/water/src/story_entities/game_world.cc

@@ -443 +443 @@
 void GameWorld::display ()
 {
-  // clear buffer
-  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-
   // render the reflection texture
   this->renderPassReflection();
@@ -477 +474 @@
 void GameWorld::renderPassReflection()
 {
+    // clear buffer
+  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+
   const std::list<BaseObject*>* reflectedWaters;
   MappedWater* mw;
@@ -518 +518 @@
 void GameWorld::renderPassAll()
 {
+  // clear buffer
+  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
   GraphicsEngine* engine = GraphicsEngine::getInstance();
 

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

@@ -111 +111 @@
 {
   glPushAttrib(GL_VIEWPORT_BIT);
-  glPushMatrix();
+//   glPushMatrix();
 
+  //glLoadIdentity();
   glViewport(0,0, textureSize, textureSize);
 
+
   // Clear the color and depth bits, reset the matrix and position our camera.
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glLoadIdentity();
+
   //g_Camera.Look();
 
@@ -159 +160 @@
       glDisable(GL_CLIP_PLANE0);
   }*/
+}
 
-  // Restore the previous matrix
-  //glPopMatrix();
-
-    // Bind the current scene to our reflection texture
-  //glBindTexture(GL_TEXTURE_2D, g_Texture[REFLECTION_ID]);
-
-
-
-
-}
 
 void MappedWater::deactivateReflection()
 {
-  glBindTexture(GL_TEXTURE_2D, texture.getTexture());
+  //glBindTexture(GL_TEXTURE_2D, texture.getTexture());
 
-  mat.setDiffuseMap(&texture, 0);
+  //mat.setDiffuseMap(&texture, 0);
+  mat.select();
   glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
 
+
   glPopAttrib();
-  glPopMatrix();
+//   glPopMatrix();
 }