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

Timestamp:

Jun 28, 2006, 6:21:24 PM (19 years ago)

Author:

stefalie

Message:

mountain_lake: fading works… sometimes

File:

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

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

@@ -28 +28 @@
 #include "shader.h"
 
+// forward declaration
+template <class T> class tAnimation;
 
 class MappedWater : public WorldEntity
@@ -75 +77 @@
   // fade functions, hacky HACK
   void fadeWaterColor(float r, float g, float b, float time) {this->newWaterColor = Vector(r, g, b); this->colorFadeTime = time; }
-  void fadeShininess(float shine, float time);
+  void fadeShineSize(float shine, float time) {this->newShineSize = shine; this->shineSizeFadeTime = time; }
   void fadeLightPos(float x, float y, float z, float time);
 
@@ -120 +122 @@
   Shader::Uniform*    refr_uni;               //!< uniform that is used for the strength of the refraction
 
+  // fading
+  tAnimation<MappedWater>*      shineSizeFader;
+  float                         newShineSize;
+  float                         shineSizeFadeTime;
+  bool                          bFadeShineSize;
+
   // skirmish HACK
   Vector              newWaterColor;          //!< used to fade the water color