Changeset 8919 in orxonox.OLD for branches

Timestamp:

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

Author:

stefalie

Message:

mountain_lake: waterColor fading compiles, but doesnt work yet

Location:

branches/mountain_lake/src/world_entities/environments

Files:

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

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

@@ -106 +106 @@
   this->bFadeReflStrength = false;
   this->bFadeRefraction = false;
+  this->bFadeWaterColor = false;
 
   this->tempcounter = 0;
@@ -574 +575 @@
   this->move2 = this->move * this->kNormalMapScale;
 
-  // fading
+  // fading TODO fix this so it isnt hacky anymore
   if(bFadeWaterUV)
   {
@@ -659 +660 @@
   }
 
-
-//   if(this->tempcounter == 300)
-//   {
-//     PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
-//     this->fadeWaterUV(1, 10);
-//   }
+  if(bFadeWaterColor)
+  {
+    this->waterColorRFader = new tAnimation<MappedWater>(this, &MappedWater::resetWaterColorR);
+    this->waterColorRFader->setInfinity(ANIM_INF_CONSTANT);
+
+    this->waterColorRFader->addKeyFrame(this->waterColor.x, this->waterColorFadeTime, ANIM_LINEAR);
+    this->waterColorRFader->addKeyFrame(this->newWaterColor.x, 0, ANIM_LINEAR);
+
+    this->waterColorRFader->replay();
+
+    this->waterColorGFader = new tAnimation<MappedWater>(this, &MappedWater::resetWaterColorG);
+    this->waterColorGFader->setInfinity(ANIM_INF_CONSTANT);
+
+    this->waterColorGFader->addKeyFrame(this->waterColor.x, this->waterColorFadeTime, ANIM_LINEAR);
+    this->waterColorGFader->addKeyFrame(this->newWaterColor.x, 0, ANIM_LINEAR);
+
+    this->waterColorGFader->replay();
+
+    this->waterColorBFader = new tAnimation<MappedWater>(this, &MappedWater::resetWaterColorB);
+    this->waterColorBFader->setInfinity(ANIM_INF_CONSTANT);
+
+    this->waterColorBFader->addKeyFrame(this->waterColor.x, this->waterColorFadeTime, ANIM_LINEAR);
+    this->waterColorBFader->addKeyFrame(this->newWaterColor.x, 0, ANIM_LINEAR);
+
+    this->waterColorBFader->replay();
+
+    bFadeWaterColor = false;
+  }
+
   if(this->tempcounter == 100)
   {
     PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
-    this->fadeWaterHeight(0, 15);
+    this->fadeWaterColor(1, 0, 1, 15);
   }
   //PRINTF(0)("counter %i/n", tempcounter);

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;