Changeset 7460 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

May 1, 2006, 12:30:34 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

Location:

trunk/src/world_entities/weapons

Files:

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

trunk/src/world_entities/weapons/weapon.cc

@@ -107 +107 @@
     this->soundBuffers[i] = NULL;                  //< No Sounds
 
-  this->soundSource = new SoundSource(this);       //< Every Weapon has exacty one SoundSource.
+  this->soundSource = new OrxSound::SoundSource(this);       //< Every Weapon has exacty one SoundSource.
   this->emissionPoint.setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
   this->emissionPoint.setName("EmissionPoint");
@@ -263 +263 @@
   else if (!soundFile.empty())
   {
-    this->soundBuffers[action] = (SoundBuffer*)ResourceManager::getInstance()->load(soundFile, WAV);
+    this->soundBuffers[action] = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(soundFile, WAV);
     if (this->soundBuffers[action] != NULL)
     {

trunk/src/world_entities/weapons/weapon.h

@@ -218 +218 @@
     // PHASES //
     ////////////
-    SoundSource*         soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
-
-    WeaponState          currentState;                     //!< The State the weapon is in.
-    WeaponAction         requestedAction;                  //!< An action to try to Engage after the currentState ends.
-    float                stateDuration;                    //!< how long the state has taken until now.
-    float                times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState.
-    Animation3D*         animation[WS_STATE_COUNT];        //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
-    SoundBuffer*         soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction.
-
-    PNode                emissionPoint;                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
-
-    bool                 hideInactive;                    //!< Hides the Weapon if it is inactive
-    bool                 chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
-
-    ClassID              projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
-    FastFactory*         projectileFactory;               //!< A factory, that produces and handles the projectiles.
+    OrxSound::SoundSource* soundSource;                      //!< A SoundSource to play sound from (this is connected to the PNode of the Weapon)
+
+    WeaponState            currentState;                     //!< The State the weapon is in.
+    WeaponAction           requestedAction;                  //!< An action to try to Engage after the currentState ends.
+    float                  stateDuration;                    //!< how long the state has taken until now.
+    float                  times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState.
+    Animation3D*           animation[WS_STATE_COUNT];        //!< Animations for all the States (you can say yourself on what part of the gun this animation acts).
+    OrxSound::SoundBuffer* soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction.
+
+    PNode                  emissionPoint;                   //!< The point, where the projectiles are emitted. (this is coppled with the Weapon by default)
+
+    bool                   hideInactive;                    //!< Hides the Weapon if it is inactive
+    bool                   chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
+
+    ClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
+    FastFactory*           projectileFactory;               //!< A factory, that produces and handles the projectiles.
   };