Changeset 8267 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc

Timestamp:

Jun 8, 2006, 4:28:24 PM (18 years ago)

Author:

amaechler

Message:

raise the number:)

File:

• branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) (7 diffs)

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

@@ -86 +86 @@
         LoadParam(root, "life", this, RainEffect, setRainLife);
         LoadParam(root, "wind", this, RainEffect, setRainWind);
-        LoadParam(root, "startraining", this, RainEffect, setRainStart);
+        LoadParam(root, "fadeinduration", this, RainEffect, setRainFadeIn);
+        LoadParam(root, "fadeoutduration", this, RainEffect, setRainFadeOut);
 
         LOAD_PARAM_START_CYCLE(root, element);
@@ -109 +110 @@
         this->rainMaxParticles = this->rainRate * this->rainLife;
         this->rainWindForce  = 0;
-        this->rainStartDuration = 0;
+        this->rainFadeInDuration = 0;
+        this->rainFadeOutDuration = 0;
         this->localTimer = 0;
         this->soundRainVolume = 0.8f;
@@ -117 +119 @@
         lightMan = LightManager::getInstance();
         this->rainAmbient = lightMan->getAmbientColor();
+
+        return 0;
 }
 
@@ -155 +159 @@
 
         lightMan->setAmbientColor(.1,.1,.1);
+
+        return 0;
 }
 
@@ -170 +176 @@
         // Restore Light Ambient
         lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
+
+        return 0;
 }
 
@@ -182 +190 @@
         }
 
-        if (this->rainStartDuration != 0 && this->localTimer < this->rainStartDuration) {
+        if (this->rainFadeInDuration != 0 && this->localTimer < this->rainFadeInDuration) {
                 this->localTimer += dt;
-                float progress = this->localTimer / this->rainStartDuration;
+                float progress = this->localTimer / this->rainFadeInDuration;
 
                 // Dim Light
@@ -210 +218 @@
                 this->deactivate();
 
-        this->rainStartDuration = 10;
+        if (!this->rainFadeInDuration > 0)
+                this->rainFadeInDuration = 20;
+
         this->localTimer = 0;
         this->activate();