Changeset 8919 in orxonox.OLD for branches/mountain_lake/src/world_entities/environments/mapped_water.h

Timestamp:

Jun 29, 2006, 7:09:59 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: waterColor fading compiles, but doesnt work yet

File:

• branches/mountain_lake/src/world_entities/environments/mapped_water.h (modified) (3 diffs)

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

@@ -96 +96 @@
   void fadeRefraction(float refraction, float time) { this->newRefraction = refraction; this->refractionFadeTime = time; this->bFadeRefraction = true; }
   void fadeWaterHeight(float y, float time) { this->newWaterHeight = y; this->waterHeightFadeTime = time; this->bFadeWaterHeight = true; }
+  void fadeWaterColor(float r, float g, float b, float time) { this->newWaterColor = Vector(r, g, b); this->waterColorFadeTime = time; this->bFadeWaterColor = true; }
 
 private:
@@ -140 +141 @@
   Shader::Uniform*          refr_uni;               //!< uniform that is used for the strength of the refraction
 
-  // fading
+  // fading TODO fix this so it isnt so hacky anymore
   tAnimation<MappedWater>*  waterUVFader;
   float                     newWaterUV;
@@ -169 +170 @@
   float                     waterHeightFadeTime;
   bool                      bFadeWaterHeight;
+  tAnimation<MappedWater>*  waterColorRFader;
+  tAnimation<MappedWater>*  waterColorGFader;
+  tAnimation<MappedWater>*  waterColorBFader;
+  Vector                    newWaterColor;
+  float                     waterColorFadeTime;
+  bool                      bFadeWaterColor;
 
   int tempcounter;