Changeset 3898 in orxonox.OLD for orxonox/branches/sound_engine/src/world_entities

Timestamp:

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

Author:

bensch

Message:

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

Location:

orxonox/branches/sound_engine/src/world_entities

Files:

• test_gun.cc (modified) (4 diffs)
• weapon.cc (modified) (1 diff)
• weapon.h (modified) (2 diffs)

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: