Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8877 in orxonox.OLD for branches/mountain_lake


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/mountain_lake/src/world_entities/environments/mapped_water.cc

    r8867 r8877  
    149149  Shader::Uniform(shader, "dudvMap").set(3);
    150150  // Set the variable "depthMap" to correspond to the fifth texture unit
    151   Shader::Uniform(shader, "depthMap").set(2);
     151  Shader::Uniform(shader, "depthMap").set(1);
    152152  // Give the variable "waterColor" a blue color
    153153  color_uni = new Shader::Uniform(shader, "waterColor");
  • branches/mountain_lake/src/world_entities/environments/mapped_water.h

    r8868 r8877  
    117117  Shader::Uniform*    shineSize_uni;          //!< uniform that is used for the specular shininessd of the water
    118118  Shader::Uniform*    shineStrength_uni;      //!< uniform that is used for the strenght of the specular reflection
     119  Shader::Uniform*    reflStrength_uni;       //!< uniform that is used for the strength of the reflection
    119120  Shader::Uniform*    refr_uni;               //!< uniform that is used for the strength of the refraction
    120   Shader::Uniform*    reflStrength_uni;       //!< uniform that is used for the strength of the reflection
    121121
    122122  // skirmish HACK
Note: See TracChangeset for help on using the changeset viewer.