Changeset 8489 in orxonox.OLD

Timestamp:

Jun 15, 2006, 6:30:28 PM (18 years ago)

Author:

stefalie

Message:

water: diner time

File:

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

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

@@ -41 +41 @@
   /// loads the textures
   // set up refleciton texture
-  //Texture texture(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
-  //mat.setDiffuseMap(texture, 0);
+  //Texture reflTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
+  //mat.setDiffuseMap(reflTex, 0);
   mat.setDiffuseMap("pictures/refl.bmp", GL_TEXTURE_2D, 0);
   // load refraction texture
+  //Texture refrTex(GL_TEXTURE_2D, this->textureSize, this->textureSize, channels, type);
+  //mat.setDiffuseMap(refrTex, 1);
   mat.setDiffuseMap("pictures/refr.bmp", GL_TEXTURE_2D, 1);
   // load normal map
@@ -245 +247 @@
 {
   // makes the water flow
+  // TODO change it so that the waterflow doesnt depend on the frame rate
   this->move += this->g_WaterFlow;
   this->move2 = this->move * this->kNormalMapScale;