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

Timestamp:

May 18, 2006, 4:25:18 PM (19 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: bug fixes and cleanup

File:

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

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

@@ -24 +24 @@
 #include "spark_particles.h"
 #include "plane_emitter.h"
+#include "shell_command.h"
 
 #include "parser/tinyxml/tinyxml.h"
 
-//SHELL_COMMAND(activate, RainEffect, activateRain);
-//SHELL_COMMAND(deactivate, RainEffect, deactivateRain);
+SHELL_COMMAND(activate, RainEffect, activateRain);
+SHELL_COMMAND(deactivate, RainEffect, deactivateRain);
 
 using namespace std;
@@ -43 +44 @@
                 this->loadParams(root);
 
-        //load sound
+        //load rain sound
         if (this->rainBuffer != NULL)
                 ResourceManager::getInstance()->unload(this->rainBuffer);
         this->rainBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
+
+        //load wind sound
+        if (this->rainWindForce > 0) {
+                if (this->windBuffer != NULL)
+                        ResourceManager::getInstance()->unload(this->windBuffer);
+                this->windBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/wind.wav", WAV);
+        }
 
         this->activate();
@@ -54 +62 @@
 {
         this->deactivate();
+
+        if (this->rainBuffer != NULL)
+                ResourceManager::getInstance()->unload(this->rainBuffer);
+
+        if (this->windBuffer != NULL)
+                ResourceManager::getInstance()->unload(this->windBuffer);
 }
 
@@ -114 +128 @@
 
         this->emitter->setSpread(this->rainWindForce / 50, 0.2);
-
+        
         this->soundSource.loop(this->rainBuffer);
-        PRINTF(0)( "Playing RainSound\n" );
+        if (this->rainWindForce > 0)
+                this->soundSource.loop(this->windBuffer);
 }
 
@@ -123 +138 @@
 {
         PRINTF(0)("Deactivating RainEffect\n");
+        this->emitter->setSystem(NULL);
 
-        this->emitter->setSystem(NULL);
+        this->soundSource.stop();
 }
+
+void RainEffect::activateRain()
+{
+        this->activate();
+}
+
+void RainEffect::deactivateRain()
+{
+        this->deactivate();
+}
+
 
 void RainEffect::tick (float dt)