Changeset 7646 in orxonox.OLD

Timestamp:

May 17, 2006, 12:41:35 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: added loop function in sound_source

Location:

branches/atmospheric_engine/src/lib

Files:

• graphics/effects/rain_effect.cc (modified) (5 diffs)
• graphics/effects/rain_effect.h (modified) (3 diffs)
• sound/sound_source.cc (modified) (2 diffs)
• sound/sound_source.h (modified) (1 diff)

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

@@ -17 +17 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
+#include "util/loading/resource_manager.h"
 
 #include "glincl.h"
-#include "debug.h"
+// #include "debug.h"
 
 #include "state.h"
@@ -40 +41 @@
   if (root != NULL)
     this->loadParams(root);
+
+  // this->soundSource.setSourceNode(this);
+
+  //load sound
+  if (this->rainBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->rainBuffer);
+  this->rainBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
 
   this->init();
@@ -65 +73 @@
 {
   this->emitter = new PlaneEmitter(this->rainSize);
+
 }
 
@@ -79 +88 @@
                 RainEffect::rainParticles->setName("RainParticles");
                 RainEffect::rainParticles->setLifeSpan(2, 2);
-                RainEffect::rainParticles->setRadius(0.05, 0.05);
+                RainEffect::rainParticles->setRadius(0.02, 0.02);
+                RainEffect::rainParticles->setRadius(0.01, 0.01);
+                RainEffect::rainParticles->setRadius(0.03, 0.03);
                 RainEffect::rainParticles->setRadius(0.04, 0.04);
-                RainEffect::rainParticles->setRadius(0.03, 0.03);
-                RainEffect::rainParticles->setColor(0, 0, 0, 1, .3);
-                RainEffect::rainParticles->setColor(0.5, 0.5, 0.5, 1, 0.2);
-                RainEffect::rainParticles->setColor(0.8, 0.8, 0.2, 0.3, 0.3);
-                RainEffect::rainParticles->setColor(1, 0.5, 0.5, 1, 0);
+                RainEffect::rainParticles->setColor(0.7, 0.3, 0.3, 0.5, 0.2); // grey blue 1
+                RainEffect::rainParticles->setColor(1, 0.4, 0.4, 0.5, 0.1); // grey blue 2
+                RainEffect::rainParticles->setColor(0.5, 0.7, 0.7, 0.7, 0); // light grey
         }
 
         this->emitter->setSystem(RainEffect::rainParticles);
 
-        RainEffect::rainParticles->debug();
+        // RainEffect::rainParticles->debug();
 
         this->emitter->setRelCoor(this->rainCoord);
 
         this->emitter->setEmissionRate(this->rainRate);
-        this->emitter->setEmissionVelocity(-this->rainVelocity);
+        this->emitter->setEmissionVelocity(this->rainVelocity);
 
-        this->emitter->setSpread(0, .3);
+        this->emitter->setSpread(0, .2);
+
+        this->soundSource.loop(this->rainBuffer);
+        PRINTF(0)( "Playing RainSound\n" );
 }
 
@@ -107 +119 @@
   this->emitter->setSystem(NULL);
 }
+
+void RainEffect::tick (float dt)
+{
+
+}

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

@@ -16 +16 @@
 #include "weather_effect.h"
 
+#include "sound_buffer.h"
+#include "sound_source.h"
+
 
 class RainEffect : public WeatherEffect
@@ -30 +33 @@
     virtual bool deactivate();
 
+    virtual void tick(float dt);
+
     inline void setRainCoord(float x, float y, float z) { this->rainCoord = Vector(x, y, z); }
     inline void setRainSize(float x, float y) { this->rainSize = Vector2D(x, y); }
     inline void setRainRate(float rate) { this->rainRate = rate;}
-    inline void setRainVelocity(float velocity) { this->rainVelocity = velocity; }
+    inline void setRainVelocity(float velocity) { this->rainVelocity = -velocity; }
 
   private:
@@ -43 +48 @@
     GLfloat                           rainRate;
     GLfloat                           rainVelocity;
+
+    SoundSource                       soundSource;
+    SoundBuffer*                      rainBuffer;
 };
 

branches/atmospheric_engine/src/lib/sound/sound_source.cc

@@ -122 +122 @@
       alSourceStop(this->sourceID);
     alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
-      alSourcePlay(this->sourceID);
+    alSourcePlay(this->sourceID);
 
     if (DEBUG >= 3)
@@ -153 +153 @@
   if (DEBUG >= 3)
     SoundEngine::checkError("Play Source", __LINE__);
+}
+
+
+/**
+ * @brief Plays back buffer on this Source and loops it
+ * @param buffer the buffer to play back on this Source
+ */
+void SoundSource::loop(const SoundBuffer* buffer)
+{
+  if (!this->retrieveSource())
+  {
+    PRINTF(2)("No more Free sources (You might consider raising the Source-Count).\n");
+    return;
+  }
+
+  alSourceStop(this->sourceID);
+  alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+  alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE  );
+
+  alSourcePlay(this->sourceID);
+
+  if (unlikely(this->buffer != NULL))
+    alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+  this->bPlay = true;
+
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Play LoopSource", __LINE__);
 }
 

branches/atmospheric_engine/src/lib/sound/sound_source.h

@@ -28 +28 @@
     void play();
     void play(const SoundBuffer* buffer);
+    void loop(const SoundBuffer* buffer);
     void stop();
     void pause();