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

Timestamp:

Jun 28, 2006, 6:32:49 PM (19 years ago)

Author:

stefalie

Message:

mountain_lake: …

File:

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

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

@@ -53 +53 @@
   void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; }
   void setWaterAngle(float angle) { this->waterAngle = angle; }
-  void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); this->newWaterColor = this->waterColor; }
+  void setWaterColor(float r, float g, float b) { this->waterColor = Vector(r,g,b); }
   void setWaterUV(float uv) { this->waterUV = uv; }
   void setWaterFlow(float flow) { this->waterFlow = flow; };
   void setNormalMapScale(float scale) { this->kNormalMapScale = scale; }
-  void setShineSize(float shine) { this->shineSize = shine; }
+  void setShineSize(float shine) { this->shineSize = shine; this->newShineSize = shine; }
   void setShineStrength(float strength) { this->shineStrength = strength; }
   void setReflStrength(float strength) { this->reflStrength = strength; }
@@ -76 +76 @@
 
   // fade functions, hacky HACK
-  void fadeWaterColor(float r, float g, float b, float time) {this->newWaterColor = Vector(r, g, b); this->colorFadeTime = time; }
+  void fadeWaterColor(float r, float g, float b, float time) {  }
   void fadeShineSize(float shine, float time) {this->newShineSize = shine; this->shineSizeFadeTime = time; }
   void fadeLightPos(float x, float y, float z, float time);
@@ -128 +128 @@
   bool                          bFadeShineSize;
 
-  // skirmish HACK
-  Vector              newWaterColor;          //!< used to fade the water color
-  float               colorFadeTime;
   int tempcounter;
 };