Changeset 7647 in orxonox.OLD

Timestamp:

May 17, 2006, 1:40:05 PM (18 years ago)

Author:

amaechler

Message:

branches/atmospheric_engine: loop updates and chopper sound

Location:

branches/atmospheric_engine/src

Files:

• lib/sound/sound_source.cc (modified) (3 diffs)
• lib/sound/sound_source.h (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (3 diffs)
• world_entities/space_ships/helicopter.h (modified) (2 diffs)

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

@@ -122 +122 @@
       alSourceStop(this->sourceID);
     alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+    alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE  );
     alSourcePlay(this->sourceID);
 
@@ -145 +146 @@
   alSourceStop(this->sourceID);
   alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+  alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE  );
   alSourcePlay(this->sourceID);
 
@@ -157 +159 @@
 
 /**
- * @brief Plays back buffer on this Source and loops it
+ * @brief Plays and loops a SoundSource
+ */
+void SoundSource::loop()
+{
+  if (this->buffer && this->retrieveSource())
+  {
+    if (this->bPlay)
+      alSourceStop(this->sourceID);
+
+    alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+    alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE  );
+    alSourcePlay(this->sourceID);
+
+    if (DEBUG >= 3)
+      SoundEngine::checkError("Play LoopSource", __LINE__);
+    this->bPlay = true;
+  }
+}
+
+
+/**
+ * @brief Plays and loops buffer on this Source
  * @param buffer the buffer to play back on this Source
  */

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

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

branches/atmospheric_engine/src/world_entities/space_ships/helicopter.cc

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
+#include "util/loading/resource_manager.h"
+
 #include "key_mapper.h"
 #include "event_handler.h"
@@ -96 +98 @@
   this->getWeaponManager().changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+
+  //load sound
+  if (this->chopperBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->chopperBuffer);
+  this->chopperBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/chopper.wav", WAV);
+
 }
 
@@ -205 +213 @@
   State::getCameraNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
   State::getCameraTargetNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
+
+  this->soundSource.loop(this->chopperBuffer);
+  PRINTF(0)( "Playing ChopperSound\n" );
 }
 

branches/atmospheric_engine/src/world_entities/space_ships/helicopter.h

@@ -10 +10 @@
 #include "playable.h"
 
+#include "sound_buffer.h"
+#include "sound_source.h"
 
 class Helicopter : public Playable
@@ -71 +73 @@
     float                 airViscosity;
 
+    SoundSource           soundSource;
+    SoundBuffer*          chopperBuffer;
+
 };