Changeset 8920 in orxonox.OLD

Timestamp:

Jun 29, 2006, 7:11:48 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: waterColor works

Location:

branches/mountain_lake/src/world_entities/environments

Files:

• mapped_water.cc (modified) (4 diffs)
• mapped_water.h (modified) (1 diff)

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

@@ -107 +107 @@
   this->bFadeRefraction = false;
   this->bFadeWaterColor = false;
-
-  this->tempcounter = 0;
 }
 
@@ -673 +671 @@
     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->addKeyFrame(this->waterColor.y, this->waterColorFadeTime, ANIM_LINEAR);
+    this->waterColorGFader->addKeyFrame(this->newWaterColor.y, 0, ANIM_LINEAR);
 
     this->waterColorGFader->replay();
@@ -681 +679 @@
     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->addKeyFrame(this->waterColor.z, this->waterColorFadeTime, ANIM_LINEAR);
+    this->waterColorBFader->addKeyFrame(this->newWaterColor.z, 0, ANIM_LINEAR);
 
     this->waterColorBFader->replay();
@@ -688 +686 @@
     bFadeWaterColor = false;
   }
-
-  if(this->tempcounter == 100)
-  {
-    PRINTF(0)("\n\n\n\n\n\n///////////////////////test waterchangecolor/////////////////////\n\n\n\n\n\n");
-    this->fadeWaterColor(1, 0, 1, 15);
-  }
-  //PRINTF(0)("counter %i/n", tempcounter);
-  tempcounter++;
 }
 

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

@@ -176 +176 @@
   float                     waterColorFadeTime;
   bool                      bFadeWaterColor;
-
-  int tempcounter;
 };