Changeset 7810 in orxonox.OLD for trunk/src/world_entities

Timestamp:

May 24, 2006, 3:57:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Weather effects back here

Location:

trunk/src/world_entities

Files:

• effects/billboard.cc (copied) (copied from branches/atmospheric_engine/src/world_entities/effects/billboard.cc)
• effects/billboard.h (copied) (copied from branches/atmospheric_engine/src/world_entities/effects/billboard.h)
• space_ships/helicopter.cc (modified) (5 diffs)
• space_ships/helicopter.h (modified) (2 diffs)

trunk/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"
@@ -49 +51 @@
 {
   this->setPlayer(NULL);
+
+  if (this->chopperBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->chopperBuffer);
 }
 
@@ -96 +101 @@
   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 = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/chopper.wav", WAV);
+
 }
 
@@ -205 +216 @@
   State::getCameraNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
   State::getCameraTargetNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
+
+  this->soundSource.loop(this->chopperBuffer);
+  // PRINTF(0)( "Playing ChopperSound\n" );
 }
 
@@ -211 +225 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
-
+  this->soundSource.stop();
 }
 

trunk/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;
 
+    OrxSound::SoundSource soundSource;
+    OrxSound::SoundBuffer*chopperBuffer;
+
 };