Changeset 7084 in orxonox.OLD for trunk/src

Timestamp:

Feb 7, 2006, 4:51:27 PM (19 years ago)

Author:

bensch

Message:

HACK

Location:

trunk/src/world_entities

Files:

• projectiles/bomb.cc (modified) (1 diff)
• projectiles/projectile.cc (modified) (5 diffs)
• projectiles/projectile.h (modified) (3 diffs)
• weapons/test_gun.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/bomb.cc

@@ -79 +79 @@
   this->detonationMaterial = new Material();
   this->detonationMaterial->setDiffuse(1, 0, 0);
+
+  this->loadExplosionSound("sound/explosions/explosion_7_far.wav");
   //   this->detonationMaterial->setTransparency(.1);
   /**

trunk/src/world_entities/projectiles/projectile.cc

@@ -22 +22 @@
 #include "world_entities/weapons/weapon.h"
 #include "model.h"
+#include "resource_manager.h"
 
 using namespace std;
@@ -37 +38 @@
   this->target = NULL;
   this->removeNode();
+
+  this->explosionBuffer = NULL;
+  this->engineBuffer = NULL;
 }
 
@@ -45 +49 @@
 Projectile::~Projectile ()
 {
+  if (this->explosionBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->explosionBuffer);
+  if (this->engineBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->engineBuffer);
   /*
      do not delete the test projectModel, since it is pnode
@@ -50 +58 @@
   */
   //delete this->projectileModel;
+}
+
+
+void Projectile::loadExplosionSound(const char* explosionSound)
+{
+  if (this->explosionBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->explosionBuffer);
+
+  else if (explosionSound != NULL)
+  {
+    this->explosionBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(explosionSound, WAV);
+    if (this->explosionBuffer != NULL)
+    {
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", explosionSound, this->getName());
+    }
+    else
+    {
+      PRINTF(2)("Failed to load sound %s to explosion %s.\n.", explosionSound, this->getName());
+    }
+  }
+  else
+    this->explosionBuffer = NULL;
+}
+
+
+void Projectile::loadEngineSound(const char* engineSound)
+{
+  if (this->engineBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->engineBuffer);
+
+  else if (engineSound != NULL)
+  {
+    this->engineBuffer = (SoundBuffer*)ResourceManager::getInstance()->load(engineSound, WAV);
+    if (this->engineBuffer != NULL)
+    {
+      PRINTF(4)("Loaded sound %s to Pickup: %s.\n", engineSound, this->getName());
+    }
+    else
+    {
+      PRINTF(2)("Failed to load sound %s to engine %s.\n.", engineSound, this->getName());
+    }
+  }
+  else
+    this->engineBuffer = NULL;
 }
 
@@ -114 +166 @@
 */
 void Projectile::destroy ()
-{}
+{
+  if (this->explosionBuffer != NULL)
+    this->soundSource.play(this->explosionBuffer);
+}
 

trunk/src/world_entities/projectiles/projectile.h

@@ -12 +12 @@
 #include "world_entity.h"
 
+#include "sound_source.h"
+#include "sound_buffer.h"
+
 class Projectile : public WorldEntity
 {
@@ -22 +25 @@
     void setLifeSpan(float lifeSpan);
 
-
+    void loadExplosionSound(const char* explosionSound);
+    void loadEngineSound(const char* engineSound);
     void setMinEnergy(float energyMin);
     /** @returns the minimal charched energy */
@@ -58 +62 @@
 
     PNode*                target;                    //!< A target for guided Weapons.
+
+    SoundSource          soundSource;
+  private:
+    SoundBuffer*          explosionBuffer;
+    SoundBuffer*          engineBuffer;
 };
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -97 +97 @@
 {
   this->init();
-  this->loadParams(root);
+  if (root != NULL)
+    this->loadParams(root);
 }