Changeset 9805 in orxonox.OLD for branches/new_class_id/src/world_entities/effects

Timestamp:

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

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

Location:

branches/new_class_id/src/world_entities/effects

Files:

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

branches/new_class_id/src/world_entities/effects/lightning_bolt.cc

@@ -20 +20 @@
 #include "material.h"
 
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 
 
@@ -56 +56 @@
   this->seedTime = 4.0f;
 
-  this->soundSource = NULL;
-  this->thunderBuffer = NULL;
-
   this->soundSource.setSourceNode(this);
 
-  //load sound
-  if (this->thunderBuffer != NULL)
-    ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
+  this->thunderBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/thunder.wav");
 }
 

branches/new_class_id/src/world_entities/effects/lightning_bolt.h

@@ -52 +52 @@
 
     OrxSound::SoundSource    soundSource;
-    OrxSound::SoundBuffer*   thunderBuffer;
+    OrxSound::SoundBuffer    thunderBuffer;
 };