Changeset 8181 in orxonox.OLD for branches/atmospheric_engine/src/lib/graphics/effects

Timestamp:

Jun 7, 2006, 9:36:31 AM (19 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: more rain and sound fadein hacking

File:

• branches/atmospheric_engine/src/lib/graphics/effects/rain_effect.cc (modified) (1 diff)

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

@@ -167 +167 @@
 void RainEffect::tick (float dt)
 {
-        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;
-
-                // 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.loop(this->rainBuffer, this->soundRainVolume * progress);
-
+        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->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)
+                this->deactivate();
+
         this->rainStartDuration = 10;
-        // this->activate;
-}
+        this->localTimer = 0;
+        this->activate();
+
+}