Changeset 7993 in orxonox.OLD for branches

Timestamp:

May 30, 2006, 9:36:50 PM (18 years ago)

Author:

stefalie

Message:

branches/water: 5 textures

File:

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

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

@@ -48 +48 @@
   mat.setDiffuseMap("pictures/dudvmap.bmp", GL_TEXTURE_2D, 3);
   // set up depth texture
-  //mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 2);
+  mat.setDiffuseMap("pictures/sky-replace.jpg", GL_TEXTURE_2D, 4);
 
 
@@ -106 +106 @@
   Shader::Uniform(shader, "dudvMap").set(3);
   // Set the variable "depthMap" to correspond to the fifth texture unit
-  //Shader::Uniform(shader, "depthMap").set(4);
+  Shader::Uniform(shader, "depthMap").set(4);
   // Give the variable "waterColor" a blue color
   Shader::Uniform(shader, "waterColor").set(0.1f, 0.2f, 0.4f, 1.0f);