Changeset 8884 in orxonox.OLD

Timestamp:

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

Author:

stefalie

Message:

mountain_lake: fading works… sometimes

Location:

branches/mountain_lake/src/world_entities/environments

Files:

• mapped_water.cc (modified) (4 diffs)
• mapped_water.h (modified) (3 diffs)

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

@@ -19 +19 @@
 #include "util/loading/resource_manager.h"
 #include "state.h"
+#include "t_animation.h"
 #include "math.h"
 
@@ -39 +40 @@
   if (root != NULL)
     this->loadParams(root);
+  this->newShineSize = this->shineSize;
+
 
   /// initialization of the textures
@@ -92 +95 @@
   this->move = 0;
   this->move2 = this->move * this->kNormalMapScale;
-
-
 }
 
@@ -370 +371 @@
   this->move += this->waterFlow * dt;
   this->move2 = this->move * this->kNormalMapScale;
-  
-
-//   if(this->tempcounter == 100) {
-//     this->resetWaterColor(1, 0, 0);
-//     resetShininess(1);
-//     resetLightPos(0, 50, 0);
-//     PRINTF(0)("test waterchangecolor ");
-//     }
-//   tempcounter++;
+
+  // fading
+  if(this->shineSize != this->newShineSize)
+  {
+    if(bFadeShineSize)
+    {
+      this->shineSizeFader = new tAnimation<MappedWater>(this, &MappedWater::resetShineSize);
+      this->shineSizeFader->setInfinity(ANIM_INF_CONSTANT);
+
+      this->shineSizeFader->addKeyFrame(this->shineSize, this->shineSizeFadeTime, ANIM_LINEAR);
+      this->shineSizeFader->addKeyFrame(this->newShineSize, 0, ANIM_LINEAR);
+
+      bFadeShineSize = false;
+      this->shineSizeFader->replay();
+    }
+  }
+
+  if(this->tempcounter == 100)
+  {
+    PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
+    this->fadeShineSize(1, 10);
+  }
+  //PRINTF(0)("counter %i/n", tempcounter);
+  tempcounter++;
 
 //   if(this->tempcounter == 100) {

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