Changeset 9805 in orxonox.OLD for branches/new_class_id/src/world_entities/weather_effects/rain_effect.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/weather_effects/rain_effect.cc (modified) (4 diffs)

branches/new_class_id/src/world_entities/weather_effects/rain_effect.cc

@@ -19 +19 @@
 #include "util/loading/load_param.h"
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 
 #include "glincl.h"
@@ -64 +64 @@
 
     //load rain sound
-    if (this->rainBuffer != NULL)
-        ResourceManager::getInstance()->unload(this->rainBuffer);
-    this->rainBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/rain.wav", WAV);
+    this->rainBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/rain.wav");
 
     //load wind sound
     if (this->rainWindForce != 0) {
-        if (this->windBuffer != NULL)
-            ResourceManager::getInstance()->unload(this->windBuffer);
-        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
+      this->windBuffer = OrxSound::ResourceSoundBuffer("sound/atmosphere/wind.wav");
     }
 
@@ -86 +82 @@
 RainEffect::~RainEffect() {
     this->deactivate();
-
-    if (this->rainBuffer != NULL)
-        ResourceManager::getInstance()->unload(this->rainBuffer);
-
-    if (this->windBuffer != NULL)
-        ResourceManager::getInstance()->unload(this->windBuffer);
 }
 
@@ -101 +91 @@
     this->rainParticles = NULL;
     this->emitter = NULL;
-    this->rainBuffer = NULL;
-    this->windBuffer = NULL;
     this->lightMan = NULL;