Changeset 3898 in orxonox.OLD

Timestamp:

Apr 19, 2005, 8:31:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/sound_engine: sound works sloppy, test it

Location:

orxonox/branches/sound_engine/src

Files:

• story_entities/world.cc (modified) (3 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/test_gun.cc (modified) (4 diffs)
• world_entities/weapon.cc (modified) (1 diff)
• world_entities/weapon.h (modified) (2 diffs)

orxonox/branches/sound_engine/src/story_entities/world.cc

@@ -35 +35 @@
 #include "light.h"
 #include "text_engine.h"
+#include "sound_engine.h"
 
 #include "track_manager.h"
@@ -147 +148 @@
   cn->unbind(this->localPlayer);
   cn->reset();
+
+  ResourceManager::getInstance()->unload(this->music);
 
   ResourceManager::getInstance()->debug();
@@ -271 +274 @@
       trackManager->finalize();
 
-      
+      this->music = (Sound*)ResourceManager::getInstance()->load("sound/orx.mp3", RESOURCE_SOUND_MUSIC, RP_LEVEL);
+      this->music->play();
       /*monitor progress*/
       this->glmis->step();

orxonox/branches/sound_engine/src/story_entities/world.h

@@ -24 +24 @@
 class Terrain;
 class GarbageCollector;
-class Text;
+class Sound;
 
 //! The game world Interface
@@ -108 +108 @@
   LightManager* lightMan;             //!< The Lights of the Level
   Terrain* terrain;                   //!< The Terrain of the World.
+  Sound* music;                       //!< The Music to Play in the Level
 
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon

orxonox/branches/sound_engine/src/world_entities/test_gun.cc

@@ -32 +32 @@
 #include "animation3d.h"
 
+#include "resource_manager.h"
+#include "sound_engine.h"
+
 using namespace std;
 
@@ -72 +75 @@
       this->animation->addKeyFrame(Vector(-2.6, 0.1, -2.5), Quaternion(), 0.1, ANIM_LINEAR);
     }
+
+  this->shootSound = (Sound*)ResourceManager::getInstance()->load("sound/explo.wav", RESOURCE_SOUND_EFFECT, RP_LEVEL);
   /*
   if( this->leftRight == 0)
@@ -127 +132 @@
 void TestGun::fire()
 {
+  if (likely(this->shootSound != NULL))
+    this->shootSound->play();
+
   if( !this->hasWeaponIdleTimeElapsed())
     {
@@ -144 +152 @@
   
   this->animation->replay();
+
 }
 

orxonox/branches/sound_engine/src/world_entities/weapon.cc

@@ -207 +207 @@
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();
+
+  this->shootSound = NULL;
 }
 

orxonox/branches/sound_engine/src/world_entities/weapon.h

@@ -38 +38 @@
 class Projectile;
 class Weapon;
+class Sound;
 
 typedef enum {
@@ -158 +159 @@
   float idleTime;
   float slowDownFactor;
+  Sound* shootSound;
 
  private: