Changeset 8828 in orxonox.OLD for branches/mountain_lake

Timestamp:

Jun 27, 2006, 3:01:54 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: some fading hacks… doesnt work at all… yet

Location:

branches/mountain_lake/src/world_entities/environments

Files:

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

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

@@ -292 +292 @@
   
 
-//   if(this->tempcounter == 200) {
+//   if(this->tempcounter == 100) {
 //     this->resetWaterColor(1, 0, 0);
 //     resetShininess(1);
@@ -299 +299 @@
 //     }
 //   tempcounter++;
+
+  if(this->tempcounter == 10) {
+    this->fadeWaterColor(1, 0, 0, 10);
+
+    PRINTF(0)("test waterchangecolor ");
+    }
+  tempcounter++;
+
+  if(this->newWaterColor != this->waterColor)
+  {
+    float time = this->colorFadeTime / dt;
+    float x = (this->newWaterColor.x - this->waterColor.x) * time +this->waterColor.x;
+    float y = (this->newWaterColor.y - this->waterColor.y) * time +this->waterColor.y;
+    float z = (this->newWaterColor.z - this->waterColor.z) * time +this->waterColor.z;
+
+    this->colorFadeTime -= dt;
+    this->resetWaterColor(x, y, z);
+  }
     
 }

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

@@ -44 +44 @@
 
   // functions to set parameters for the water, usually they're called through loadparam
-  void setLightPos(float x, float y, float z) { this->lightPos = Vector(x,y,z); };
-  void setWaterPos(float x, float y, float z) { this->waterPos = Vector(x,y,z); };
-  void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; };
-  void setWaterAngle(float angle) { this->waterAngle = angle; };
-  void setWaterUV(float uv) { this->waterUV = uv; };
+  void setLightPos(float x, float y, float z) { this->lightPos = Vector(x,y,z); }
+  void setWaterPos(float x, float y, float z) { this->waterPos = Vector(x,y,z); }
+  void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; }
+  void setWaterAngle(float angle) { this->waterAngle = angle; }
+  void setWaterUV(float uv) { this->waterUV = uv; }
   void setWaterFlow(float flow) { this->waterFlow = flow; };
-  void setNormalMapScale(float scale) { this->kNormalMapScale = scale; };
-  void setShininess(float shine) { this->shininess = shine; };
-  void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); };
+  void setNormalMapScale(float scale) { this->kNormalMapScale = scale; }
+  void setShininess(float shine) { this->shininess = shine; }
+  void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); this->newWaterColor = this->waterColor; }
 
   // functions to change water parameters during runtime
@@ -61 +61 @@
 
   // fade functions
-  void fadeWaterColor(float r, float g, float b, float time);
+  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 fadeLightPos(float x, float y, float z, float time);
@@ -76 +76 @@
   float               waterAngle;             //!< defines how much the water will be turned around the point waterPos
   Vector              waterColor;             //!< color of the water
-  float               move;                   //!< textures coords, speeds, positions for the shaded textures....
+
+  Vector              newWaterColor;          //!< used to fade the water color
+  float               colorFadeTime;
+
+  float               move;
   float               move2;
   float               waterUV;                //!< size of the waves