Changeset 9805 in orxonox.OLD for branches/new_class_id/src/world_entities/weapons/weapon.cc

Timestamp:

Sep 24, 2006, 3:21:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

File:

• branches/new_class_id/src/world_entities/weapons/weapon.cc (modified) (14 diffs)

branches/new_class_id/src/world_entities/weapons/weapon.cc

@@ -24 +24 @@
 #include "world_entities/projectiles/projectile.h"
 
-#include "util/loading/resource_manager.h"
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
@@ -32 +31 @@
 #include "sound_source.h"
 #include "sound_buffer.h"
+#include "resource_sound_buffer.h"
 
 #include "elements/glgui_energywidget.h"
@@ -59 +59 @@
     if (this->animation[i] && Animation::objectList().exists(animation[i]))  //!< @todo this should check animation3D
       delete this->animation[i];
-  for (int i = 0; i < WA_ACTION_COUNT; i++)
-    if (this->soundBuffers[i] != NULL && OrxSound::SoundBuffer::objectList().exists(this->soundBuffers[i]))
-      ResourceManager::getInstance()->unload(this->soundBuffers[i]);
 
   if (OrxSound::SoundSource::objectList().exists(this->soundSource))
@@ -121 +118 @@
     this->animation[i] = NULL;                   //< No animation
   }
-  for (int i = 0; i < WA_ACTION_COUNT; i++)
-    this->soundBuffers[i] = NULL;                  //< No Sounds
 
   this->soundSource = new OrxSound::SoundSource(this);       //< Every Weapon has exacty one SoundSource.
@@ -273 +268 @@
   if (action >= WA_ACTION_COUNT)
     return;
-  if (this->soundBuffers[action] != NULL)
-    ResourceManager::getInstance()->unload(this->soundBuffers[action]);
 
   else if (!soundFile.empty())
   {
-    this->soundBuffers[action] = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load(soundFile, WAV);
-    if (this->soundBuffers[action] != NULL)
+    this->soundBuffers[action] = OrxSound::ResourceSoundBuffer(soundFile);
+    if (this->soundBuffers[action].loaded())
     {
       PRINTF(4)("Loaded sound %s to action %s.\n", soundFile.c_str(), actionToChar(action));
@@ -289 +282 @@
   }
   else
-    this->soundBuffers[action] = NULL;
+    this->soundBuffers[action] = OrxSound::SoundBuffer();
 }
 
@@ -423 +416 @@
   {
     case WA_SHOOT:
-      return this->fireW();
-      break;
+    return this->fireW();
+    break;
     case WA_CHARGE:
-      return this->chargeW();
-      break;
+    return this->chargeW();
+    break;
     case WA_RELOAD:
-      return this->reloadW();
-      break;
+    return this->reloadW();
+    break;
     case WA_DEACTIVATE:
-      return this->deactivateW();
-      break;
+    return this->deactivateW();
+    break;
     case WA_ACTIVATE:
-      return this->activateW();
-      break;
+    return this->activateW();
+    break;
     default:
-      PRINTF(2)("Action %s Not Implemented yet \n", Weapon::actionToChar(action));
-      return false;
+    PRINTF(2)("Action %s Not Implemented yet \n", Weapon::actionToChar(action));
+    return false;
   }
 }
@@ -452 +445 @@
   {
     // play Sound
-    if (likely(this->soundBuffers[WA_ACTIVATE] != NULL))
+    if (likely(this->soundBuffers[WA_ACTIVATE].loaded()))
       this->soundSource->play(this->soundBuffers[WA_ACTIVATE]);
     this->updateWidgets();
@@ -474 +467 @@
     PRINTF(4)("Deactivating the Weapon %s\n", this->getCName());
     // play Sound
-    if (this->soundBuffers[WA_DEACTIVATE] != NULL)
+    if (this->soundBuffers[WA_DEACTIVATE].loaded())
       this->soundSource->play(this->soundBuffers[WA_DEACTIVATE]);
     // deactivate
@@ -493 +486 @@
   {
     // playing Sound
-    if (this->soundBuffers[WA_CHARGE] != NULL)
+    if (this->soundBuffers[WA_CHARGE].loaded())
       this->soundSource->play(this->soundBuffers[WA_CHARGE]);
 
@@ -518 +511 @@
   {
     // playing Sound
-    if (this->soundBuffers[WA_SHOOT] != NULL)
+    if (this->soundBuffers[WA_SHOOT].loaded())
       this->soundSource->play(this->soundBuffers[WA_SHOOT]);
     this->updateWidgets();
@@ -551 +544 @@
 
 
-  if (this->soundBuffers[WA_RELOAD] != NULL)
+  if (this->soundBuffers[WA_RELOAD].loaded())
     this->soundSource->play(this->soundBuffers[WA_RELOAD]);
 
@@ -694 +687 @@
   {
     case WA_SHOOT:
-      return "shoot";
-      break;
+    return "shoot";
+    break;
     case WA_CHARGE:
-      return "charge";
-      break;
+    return "charge";
+    break;
     case WA_RELOAD:
-      return "reload";
-      break;
+    return "reload";
+    break;
     case WA_ACTIVATE:
-      return "activate";
-      break;
+    return "activate";
+    break;
     case WA_DEACTIVATE:
-      return "deactivate";
-      break;
+    return "deactivate";
+    break;
     case WA_SPECIAL1:
-      return "special1";
-      break;
+    return "special1";
+    break;
     default:
-      return "none";
-      break;
+    return "none";
+    break;
   }
 }
@@ -757 +750 @@
   {
     case WS_SHOOTING:
-      return "shooting";
-      break;
+    return "shooting";
+    break;
     case WS_CHARGING:
-      return "charging";
-      break;
+    return "charging";
+    break;
     case WS_RELOADING:
-      return "reloading";
-      break;
+    return "reloading";
+    break;
     case WS_ACTIVATING:
-      return "activating";
-      break;
+    return "activating";
+    break;
     case WS_DEACTIVATING:
-      return "deactivating";
-      break;
+    return "deactivating";
+    break;
     case WS_IDLE:
-      return "idle";
-      break;
+    return "idle";
+    break;
     case WS_INACTIVE:
-      return "inactive";
-      break;
+    return "inactive";
+    break;
     default:
-      return "none";
-      break;
-  }
-}
+    return "none";
+    break;
+  }
+}