Changeset 8877 in orxonox.OLD for branches/mountain_lake/src

Timestamp:

Jun 28, 2006, 5:34:52 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: cleanup

Location:

branches/mountain_lake/src/world_entities/environments

Files:

• mapped_water.cc (modified) (1 diff)
• mapped_water.h (modified) (1 diff)

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

@@ -149 +149 @@
   Shader::Uniform(shader, "dudvMap").set(3);
   // Set the variable "depthMap" to correspond to the fifth texture unit
-  Shader::Uniform(shader, "depthMap").set(2);
+  Shader::Uniform(shader, "depthMap").set(1);
   // Give the variable "waterColor" a blue color
   color_uni = new Shader::Uniform(shader, "waterColor");

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

@@ -117 +117 @@
   Shader::Uniform*    shineSize_uni;          //!< uniform that is used for the specular shininessd of the water
   Shader::Uniform*    shineStrength_uni;      //!< uniform that is used for the strenght of the specular reflection
+  Shader::Uniform*    reflStrength_uni;       //!< uniform that is used for the strength of the reflection
   Shader::Uniform*    refr_uni;               //!< uniform that is used for the strength of the refraction
-  Shader::Uniform*    reflStrength_uni;       //!< uniform that is used for the strength of the reflection
 
   // skirmish HACK