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

Timestamp:

Jun 4, 2005, 12:38:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

Location:

orxonox/trunk/src/world_entities

Files:

• test_gun.cc (modified) (3 diffs)
• weapon.h (modified) (1 diff)
• world_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/test_gun.cc

@@ -31 +31 @@
 #include "list.h"
 #include "animation3d.h"
+#include "sound_engine.h"
 
 #include "object_manager.h"
@@ -89 +90 @@
       this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT); 
     }
-
+  
+  this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV);
+  this->weaponSource = new SoundSource(this->fireSound, this);
+  this->weaponSource->setRolloffFactor(.1);
   Projectile* p = new TestBullet(this);
   ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
@@ -146 +150 @@
 
   Projectile* pj = dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET));
+  weaponSource->play();
+
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
   pj->setAbsDir(this->getAbsDir());

orxonox/trunk/src/world_entities/weapon.h

@@ -175 +175 @@
   int leftRight;   // this will become an enum
 
+  SoundBuffer* fireSound;
+  SoundSource* weaponSource;
+
+
  private:
   bool enabled;                    //<! states if the weapon is enabled or not

orxonox/trunk/src/world_entities/world_entity.h

@@ -13 +13 @@
 #include "load_param.h"
 
-
 //class CollisionCluster;
 class CharacterAttributes;
 class Model;
+class SoundEngine;
+class SoundBuffer;
+class SoundSource;
+
 //! Basic class from which all interactive stuff in the world is derived from
 class WorldEntity : public PNode