Changeset 8837 in orxonox.OLD for branches/mountain_lake/src/lib/graphics/effects/rain_effect.cc

Timestamp:

Jun 27, 2006, 5:26:04 PM (19 years ago)

Author:

hdavid

Message:

branches/mountain_lake: fading sky/cloud colors works, RainEffect::stopRaining is a bit buggy

File:

• branches/mountain_lake/src/lib/graphics/effects/rain_effect.cc (modified) (5 diffs)

branches/mountain_lake/src/lib/graphics/effects/rain_effect.cc

@@ -103 +103 @@
   this->rainFadeOutDuration = 0;
   
-  this->cloudColor = Vector(0.8f, 0.8f, 0.8f);
+  this->cloudColor = Vector(0.6f, 0.6f, 0.6f);
   this->skyColor = Vector(0.0f, 0.0f, 0.0f);
 
@@ -180 +180 @@
   if (this->rainWindForce != 0)
     this->soundSource.play(this->windBuffer, 0.1f * this->rainWindForce, true);
-
-  if (this->rainFadeInDuration == 0)
-    lightMan->setAmbientColor(.1,.1,.1);
   
   // Change the cloudcolor,skycolor
   this->oldCloudColor = CloudEffect::cloudColor;
   this->oldSkyColor = CloudEffect::skyColor;
-  CloudEffect::changeCloudColor(this->cloudColor);
-  CloudEffect::changeSkyColor(this->skyColor);
+  CloudEffect::changeCloudColor(this->cloudColor, this->rainFadeInDuration);
+  CloudEffect::changeSkyColor(this->skyColor, this->rainFadeInDuration);
 }
 
@@ -207 +204 @@
   lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
   
-  CloudEffect::changeCloudColor(this->oldCloudColor);
-  CloudEffect::changeSkyColor(this->oldSkyColor);
+  CloudEffect::changeCloudColor(this->oldCloudColor, this->rainFadeOutDuration);
+  CloudEffect::changeSkyColor(this->oldSkyColor, this->rainFadeOutDuration);
 }
 
@@ -291 +288 @@
 
   if (!this->rainFadeInDuration > 0)
-    this->rainFadeInDuration = 20;
+    this->rainFadeInDuration = 10;
 
   this->localTimer = 0;
@@ -308 +305 @@
 
   if (!this->rainFadeOutDuration > 0)
-    this->rainFadeOutDuration = 20;
+    this->rainFadeOutDuration = 10;
 
   this->localTimer = 0;