Changeset 7740 in orxonox.OLD

Timestamp:

May 20, 2006, 11:42:28 AM (18 years ago)

Author:

patrick

Message:

water: the stuff is drawn twice now, there where some logical errors in the code. not yet drawn on the texture i'm afraid

Location:

branches/water/src

Files:

• story_entities/game_world.cc (modified) (1 diff)
• world_entities/environments/mapped_water.cc (modified) (5 diffs)
• world_entities/environments/mapped_water.h (modified) (2 diffs)

branches/water/src/story_entities/game_world.cc

@@ -490 +490 @@
       mw->activateReflection();
 
+      //camera and light
+      this->dataTank->localCamera->apply ();
+      this->dataTank->localCamera->project ();
+      LightManager::getInstance()->draw();
       // draw everything to be included in the reflection
       for (unsigned int i = 0; i < this->dataTank->drawLists.size(); ++i)

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

@@ -28 +28 @@
   this->setClassID(CL_MAPPED_WATER, "MappedWater");
   this->toList(OM_ENVIRON);
-  
+
   if (root != NULL)
     this->loadParams(root);
-    
+
+
     mat.setDiffuseMap(&this->texture, 0);
+    // Change the view port to be the size of the texture we will render to
+    // HACK
+    this->textureSize = 512;
 }
 
 MappedWater::~MappedWater()
 {
-  
+
 }
 
@@ -50 +54 @@
 void MappedWater::draw() const
 {
-  glPushMatrix(); 
- 
+  glPushMatrix();
+
   /*
   glTranslatef (this->getAbsCoor ().x,
@@ -61 +65 @@
   //glEnable(GL_LIGHTING);
 
- 
+
   //mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 1);
   //mat.setTransparency(1.0);
   //mat.setDiffuse(1.0, 0, .1);
- 
- 
+
+
   // HACK
 
@@ -106 +110 @@
 void MappedWater::activateReflection()
 {
-  // Change the view port to be the size of the texture we will render to
-  // HACK
-  int textureSize = 512;
   glPushAttrib(GL_VIEWPORT_BIT);
+  glPushMatrix();
+
   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();
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glLoadIdentity();
   //g_Camera.Look();
 
-  // So we don't affect any other objects in the world we push on a new matrix
-  //glPushMatrix();
 
   // If our camera is above the water we will render the scene flipped upside down.
@@ -164 +165 @@
     // Bind the current scene to our reflection texture
   //glBindTexture(GL_TEXTURE_2D, g_Texture[REFLECTION_ID]);
-  
-  
-  
- glBindTexture(GL_TEXTURE_2D, texture.getTexture());
- // ;
- // mat.setDiffuseMap(&texture, 0);
- glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
-  
-  glPopAttrib();
+
+
+
+
 }
 
 void MappedWater::deactivateReflection()
 {
+  glBindTexture(GL_TEXTURE_2D, texture.getTexture());
 
+  mat.setDiffuseMap(&texture, 0);
+  glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, textureSize, textureSize);
+
+  glPopAttrib();
+  glPopMatrix();
 }
 

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

@@ -23 +23 @@
     void activateReflection();
     void deactivateReflection();
-    
+
     void activateRefraction();
     void deactivateRefraction();
-    
+
     void draw() const;
     void tick(float dt);
@@ -36 +36 @@
     float           waterHeight;       //!< y-coord of the Water
     Material        mat;
-    
+
     Texture         texture;
+    int             textureSize;       //!< size of the texture
 
 };