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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

Location:

trunk/src/world_entities

Files:

• effects/lightning_bolt.cc (modified) (1 diff)
• effects/lightning_bolt.h (modified) (1 diff)
• power_ups/power_up.cc (modified) (2 diffs)
• power_ups/power_up.h (modified) (1 diff)
• projectiles/projectile.cc (modified) (2 diffs)
• projectiles/projectile.h (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)
• weapons/weapon.h (modified) (1 diff)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/effects/lightning_bolt.cc

@@ -61 +61 @@
   if (this->thunderBuffer != NULL)
     ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);
+  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);
 }
 

trunk/src/world_entities/effects/lightning_bolt.h

@@ -50 +50 @@
     float seedTime;
 
-    SoundSource    soundSource;
-    SoundBuffer*   thunderBuffer;
+    OrxSound::SoundSource    soundSource;
+    OrxSound::SoundBuffer*   thunderBuffer;
 };
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -82 +82 @@
   else if (!pickupSound.empty())
   {
-    this->pickupBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+    this->pickupBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
     if (this->pickupBuffer != NULL)
     {
@@ -103 +103 @@
   else if (!respawnSound.empty())
   {
-    this->respawnBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
+    this->respawnBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(respawnSound, WAV);
     if (this->respawnBuffer != NULL)
     {

trunk/src/world_entities/power_ups/power_up.h

@@ -45 +45 @@
 
 private:
-  SoundSource         soundSource;
-  SoundBuffer*        pickupBuffer;
-  SoundBuffer*        respawnBuffer;
-  Material*           sphereMaterial;
-  PowerUpRespawn      respawnType;
-  float               respawnTime;
-  float               respawnStart;
-  static const char*  respawnTypes[];
+  OrxSound::SoundSource  soundSource;
+  OrxSound::SoundBuffer* pickupBuffer;
+  OrxSound::SoundBuffer* respawnBuffer;
+  Material*              sphereMaterial;
+  PowerUpRespawn         respawnType;
+  float                  respawnTime;
+  float                  respawnStart;
+  static const char*     respawnTypes[];
 
-  WorldEntity*        collider;
+  WorldEntity*           collider;
 };
 

trunk/src/world_entities/projectiles/projectile.cc

@@ -68 +68 @@
   else if (!explosionSound.empty())
   {
-    this->explosionBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
+    this->explosionBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
     if (this->explosionBuffer != NULL)
     {
@@ -90 +90 @@
   else if (!engineSound.empty())
   {
-    this->engineBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
+    this->engineBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
     if (this->engineBuffer != NULL)
     {

trunk/src/world_entities/projectiles/projectile.h

@@ -52 +52 @@
   protected:
     // energy
-    float                 energyMin;                 //!< The minimal Energy a Projectile needs to be emitted.
-    bool                  bChargeable;               //!< if the Projectile is Charegeable
+    float                  energyMin;                 //!< The minimal Energy a Projectile needs to be emitted.
+    bool                   bChargeable;               //!< if the Projectile is Charegeable
 
-    float                 lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
-    float                 lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
+    float                  lifeCycle;                 //!< The percentage of the Lifetime done [0-1]
+    float                  lifeSpan;                  //!< The entire lifespan of the Shoot. in seconds
 
-    Vector                flightDirection;           //!< DOF direction in which the shoot flighs
+    Vector                 flightDirection;           //!< DOF direction in which the shoot flighs
 
-    Vector                velocity;                  //!< velocity of the projectile.
+    Vector                 velocity;                  //!< velocity of the projectile.
 
-    PNode*                target;                    //!< A target for guided Weapons.
+    PNode*                 target;                    //!< A target for guided Weapons.
 
-    SoundSource          soundSource;
+    OrxSound::SoundSource  soundSource;
   private:
-    SoundBuffer*          explosionBuffer;
-    SoundBuffer*          engineBuffer;
+    OrxSound::SoundBuffer* explosionBuffer;
+    OrxSound::SoundBuffer* engineBuffer;
 };
 

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.
   };
 

trunk/src/world_entities/world_entity.h

@@ -16 +16 @@
 
 // FORWARD DECLARATION
-class SoundBuffer;
-class SoundSource;
+namespace OrxSound { class SoundBuffer; class SoundSource; }
 class BVTree;
 class Model;