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

Timestamp:

Jun 8, 2006, 2:04:37 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: general activate, cleanups

File:

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

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

@@ -125 +125 @@
         PRINTF(0)( "Activating RainEffect, coord: %f, %f, %f, size: %f, %f, rate: %f, velocity: %f, moveRain: %s\n", this->rainCoord.x, this->rainCoord.y, this->rainCoord.z, this->rainSize.x, this-> rainSize.y, this->rainRate, this->rainVelocity, this->rainMove ? "true" : "false" );
 
+        this->rainActivate = true;
+
         if (unlikely(RainEffect::rainParticles == NULL))
         {
@@ -134 +136 @@
                 RainEffect::rainParticles->setRadius(0.2, 0.02);
                 RainEffect::rainParticles->setRadius(1, 0.01);
-                RainEffect::rainParticles->setColor(0, 0.3, 0.3, 0.5, 0.2); // grey blue 1
-                RainEffect::rainParticles->setColor(0.5, 0.4, 0.4, 0.5, 0.2); // grey blue 2
-                RainEffect::rainParticles->setColor(1, 0.7, 0.7, 0.7, 0.2); // light grey
+                RainEffect::rainParticles->setColor(0, 0.3, 0.3, 0.5, 0.2);     // grey blue 1
+                RainEffect::rainParticles->setColor(0.5, 0.4, 0.4, 0.5, 0.2);   // grey blue 2
+                RainEffect::rainParticles->setColor(1, 0.7, 0.7, 0.7, 0.2);     // light grey
         }
 
@@ -158 +160 @@
 {
         PRINTF(0)("Deactivating RainEffect\n");
+        
+        this->rainActivate = false;
         this->emitter->setSystem(NULL);
-
         this->soundSource.stop();
 
@@ -167 +170 @@
 void RainEffect::tick (float dt)
 {
-        if (RainEffect::rainParticles != NULL) {
-                if (this->rainMove) {
-                        this->rainCoord = State::getCameraNode()->getAbsCoor();
-                        this->emitter->setRelCoor(this->rainCoord.x , this->rainCoord.y+800, this->rainCoord.z);
-                }
+        if (!this->rainActivate)
+                return;
+                
+        if (this->rainMove) {
+                this->rainCoord = State::getCameraNode()->getAbsCoor();
+                this->emitter->setRelCoor(this->rainCoord.x , this->rainCoord.y+800, this->rainCoord.z);
+        }
+
+        if (this->rainStartDuration != 0 && this->localTimer < this->rainStartDuration) {
+                this->localTimer += dt;
+                float progress = this->localTimer / this->rainStartDuration;
+
+                // PRINTF(0)("Progress %f: \n", 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);
+        }
         
-                if (this->rainStartDuration != 0 && this->localTimer < this->rainStartDuration) {
-                        this->localTimer += dt;
-                        float progress = this->localTimer / this->rainStartDuration;
-        
-                        // PRINTF(0)("Progress %f: \n", 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);
-                }
-        }
 }
 
 void RainEffect::startRaining() {
 
-        if (RainEffect::rainParticles != NULL)
+        if (this->rainActivate)
                 this->deactivate();