Changeset 7065 in orxonox.OLD for trunk

Timestamp:

Feb 7, 2006, 1:13:58 PM (19 years ago)

Author:

bensch

Message:

powerups sounds when pickup

Location:

trunk/src

Files:

• lib/sound/sound_source.h (modified) (1 diff)
• world_entities/power_ups/param_power_up.cc (modified) (1 diff)
• world_entities/power_ups/param_power_up.h (modified) (1 diff)
• world_entities/power_ups/power_up.cc (modified) (5 diffs)
• world_entities/power_ups/power_up.h (modified) (3 diffs)
• world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• world_entities/power_ups/turret_power_up.h (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.cc (modified) (1 diff)
• world_entities/power_ups/weapon_power_up.h (modified) (1 diff)

trunk/src/lib/sound/sound_source.h

@@ -33 +33 @@
     /** @returns true, if the Source is Playing */
     inline bool   isPlaying() const { return this->bPlay; };
+    /** @param sourceNode the Source this is attached to. */
+    inline void setSourceNode(const PNode* sourceNode) { this->sourceNode = sourceNode;};
     /** @returns the SoundBuffer of this Source */
     inline const SoundBuffer* getBuffer() const { return this->buffer; }

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -38 +38 @@
 };
 
-ParamPowerUp::ParamPowerUp () : PowerUp(0.0, 1.0, 0.0)
-{
-  this->init();
-}
-
 ParamPowerUp::ParamPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)
 {
   this->init();
+  this->loadPickupSound("sound/powerups/power_up_6.wav");
   if( root != NULL)
     this->loadParams(root);

trunk/src/world_entities/power_ups/param_power_up.h

@@ -22 +22 @@
 
 public:
-  ParamPowerUp();
-  ParamPowerUp(const TiXmlElement* root);
+  ParamPowerUp(const TiXmlElement* root = NULL);
   virtual ~ParamPowerUp ();
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -21 +21 @@
 #include "primitive_model.h"
 
+#include "resource_manager.h"
 #include "load_param.h"
 
@@ -42 +43 @@
   this->sphereMaterial->setDiffuse(r, g, b);
   this->toList(OM_COMMON);
+
+  this->soundSource.setSourceNode(this);
+  this->soundBuffer = NULL;
 }
 
@@ -47 +51 @@
 {
   delete this->sphereMaterial;
+  if (this->soundBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->soundBuffer);
 }
 
@@ -53 +59 @@
 {
   WorldEntity::loadParams(root);
+
   LoadParam(root, "respawnType", this, PowerUp, setRespawnType);
+
   LoadParam(root, "respawnTime", this, PowerUp, setRespawnTime);
+
+  LoadParam(root, "pickup-sound", this, PowerUp, loadPickupSound);
 }
 
+
+void PowerUp::loadPickupSound(const char* pickupSound)
+{
+  if (this->soundBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->soundBuffer);
+
+  else if (pickupSound != NULL)
+{
+  this->soundBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(pickupSound, WAV);
+  if (this->soundBuffer != NULL)
+  {
+    PRINTF(4)("Loaded sound %s to Pickup: %s.\n", pickupSound, this->getName());
+  }
+  else
+  {
+    PRINTF(2)("Failed to load sound %s to pickup %s.\n.", pickupSound, this->getName());
+  }
+}
+  else
+    this->soundBuffer = NULL;
+}
 
 void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
@@ -64 +95 @@
     if(dynamic_cast<Extendable*>(entity)->pickup(this))
     {
+      if(soundBuffer != NULL)
+        this->soundSource.play(this->soundBuffer);
+
       switch(respawnType) {
         case RESPAWN_NONE:

trunk/src/world_entities/power_ups/power_up.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+
+#include "sound_buffer.h"
+#include "sound_source.h"
 
 class Material;
@@ -23 +26 @@
   void collidesWith (WorldEntity* entity, const Vector& location);
 
+  void loadPickupSound(const char* pickupSound);
+
   virtual void draw () const;
   virtual void tick(float dt);
@@ -37 +42 @@
 
 private:
+  SoundSource    soundSource;
+  SoundBuffer*   soundBuffer;
   Material* sphereMaterial;
   PowerUpRespawn respawnType;

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -26 +26 @@
 
 CREATE_FACTORY(TurretPowerUp, CL_TURRET_POWER_UP);
-
-TurretPowerUp::TurretPowerUp () : PowerUp(0.0, 1.0, 0.0)
-{
-  this->init();
-}
 
 TurretPowerUp::TurretPowerUp(const TiXmlElement* root) : PowerUp(0.0, 1.0, 0.0)

trunk/src/world_entities/power_ups/turret_power_up.h

@@ -15 +15 @@
 
  public:
-  TurretPowerUp();
-  TurretPowerUp(const TiXmlElement* root);
+  TurretPowerUp(const TiXmlElement* root = NULL);
   virtual ~TurretPowerUp ();
 

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -31 +31 @@
 CREATE_FACTORY(WeaponPowerUp, CL_WEAPON_POWER_UP);
 
-WeaponPowerUp::WeaponPowerUp () : PowerUp(1.0, 1.0, 0.0)
-{
-  this->init();
-}
-
 WeaponPowerUp::WeaponPowerUp(const TiXmlElement* root) : PowerUp(1.0, 1.0, 0.0)
 {
   this->init();
+  this->loadPickupSound("sound/powerups/whats this2.wav");
   if( root != NULL)
     this->loadParams(root);

trunk/src/world_entities/power_ups/weapon_power_up.h

@@ -16 +16 @@
 
 public:
-  WeaponPowerUp();
-  WeaponPowerUp(const TiXmlElement* root);
+  WeaponPowerUp(const TiXmlElement* root = NULL);
   virtual ~WeaponPowerUp ();