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

Timestamp:

Jun 15, 2006, 1:01:31 AM (18 years ago)

Author:

amaechler

Message:

atmospheric_engine: fade work

File:

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

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

@@ -38 +38 @@
 CREATE_FACTORY(RainEffect, CL_RAIN_EFFECT);
 
-// TODO: Dim Light with Rain, Finish preCaching, check out if multiple rain emitters work,  Think about what happens with building poss. to hang movewithcam off, benchmark, possible to activate lightening, turn off visibility when in a building, variable emitter size depending on playable, also rain velocity
+/* TODO:
+        - preCaching
+        - test multiple rain emitters
+        - Think about what happens with building poss. to hang movewithcam off
+        - Possible to activate lightening
+        - turn off visibility when in a building
+        - variable emitter size depending on playable
+*/
 
 RainEffect::RainEffect(const TiXmlElement* root)
@@ -158 +165 @@
         if (this->rainWindForce != 0) this->soundSource.loop(this->windBuffer, 0.1f * this->rainWindForce);
 
-        lightMan->setAmbientColor(.1,.1,.1);
+        if (this->rainFadeInDuration == 0)
+                lightMan->setAmbientColor(.1,.1,.1);
 
         return 0;
@@ -195 +203 @@
 
                 // Dim Light
-                lightMan->setAmbientColor(1.1 - progress, 1.1 - progress, 1.1 - progress);
+                lightMan->setAmbientColor(1 - progress * 0.9, 1 - progress * 0.9, 1 - progress * 0.9);
 
                 // use alpha in color to fade in
@@ -210 +218 @@
                 // this->soundSource.fadein(this->rainBuffer, 10);
         }
-        else if (this->rainFadeOutDuration != 0 && this->localTimer < this->rainFadeOutDuration) {
-                this->localTimer += dt;
-                float progress = 1 - (this->localTimer / this->rainFadeOutDuration);
-
-                // Dim Light
-                lightMan->setAmbientColor(1.1 - progress, 1.1 - progress, 1.1 - progress);
-
-                // use alpha in color to fade in
-                RainEffect::rainParticles->setColor(0,   0.3, 0.3, 0.5, 0.2 * progress); // grey blue 1
-                RainEffect::rainParticles->setColor(0.5, 0.4, 0.4, 0.5, 0.2 * progress); // grey blue 2
-                RainEffect::rainParticles->setColor(1,   0.7, 0.7, 0.7, 0.2 * progress); // light grey
-
-                // increase radius for more "heavy" rain
-                RainEffect::rainParticles->setRadius(0, 0.03 * progress);
-                RainEffect::rainParticles->setRadius(0.2, 0.02 * progress);
-                RainEffect::rainParticles->setRadius(1, 0.01 * progress);
-
-                // increase sound volume
-                // this->soundSource.fadein(this->rainBuffer, 10);
+        else if ( this->rainFadeOutDuration != 0 ) {
+                if ( this->localTimer < this->rainFadeOutDuration ) {
+                        this->localTimer += dt;
+                        float progress = 1 - (this->localTimer / this->rainFadeOutDuration);
+        
+                        // Fade In Light
+                        lightMan->setAmbientColor(1 - progress * 0.9, 1 - progress * 0.9, 1 - progress * 0.9);
+
+                        // use alpha in color to fade out
+                        RainEffect::rainParticles->setColor(0,   0.3, 0.3, 0.5, 0.2 * progress); // grey blue 1
+                        RainEffect::rainParticles->setColor(0.5, 0.4, 0.4, 0.5, 0.2 * progress); // grey blue 2
+                        RainEffect::rainParticles->setColor(1,   0.7, 0.7, 0.7, 0.2 * progress); // light grey
+        
+                        // decrease radius
+                        RainEffect::rainParticles->setRadius(0, 0.03 * progress);
+                        RainEffect::rainParticles->setRadius(0.2, 0.02 * progress);
+                        RainEffect::rainParticles->setRadius(1, 0.01 * progress);
+        
+                        // decrease sound volume
+                        // this->soundSource.fadeout(this->rainBuffer, 10);
+                }
+                else
+                        this->deactivate();
         }
         
@@ -242 +254 @@
 
         this->localTimer = 0;
+
         this->activate();
 
@@ -248 +261 @@
 void RainEffect::stopRaining() {
 
-        if (this->rainActivate)
-                this->deactivate();
+        if (!this->rainActivate)
+                this->activate();
 
         if (!this->rainFadeOutDuration > 0)
@@ -255 +268 @@
 
         this->localTimer = 0;
-        this->activate();
-
-}
+
+}