Changeset 4204 in orxonox.OLD

Timestamp:

May 17, 2005, 2:05:57 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: added Buffer to the ResourceManager

Location:

orxonox/branches/openAL/src

Files:

• lib/sound/sound_engine.cc (modified) (2 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (3 diffs)

orxonox/branches/openAL/src/lib/sound/sound_engine.cc

@@ -24 +24 @@
 #include "list.h"
 #include "AL/alc.h"
-
+#include "resource_manager.h"
 using namespace std;
 
@@ -164 +164 @@
   SoundEngine::singletonRef = NULL;
 
-}
+  // deleting all the Resources
+  tIterator<SoundSource>* sourceIterator = this->sourceList->getIterator();
+  SoundSource* enumSource = sourceIterator->nextElement();
+  while (enumSource)
+    {
+      delete enumSource;
+      enumSource = sourceIterator->nextElement();
+    }
+  delete sourceIterator;
+
+  tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
+  SoundBuffer* enumBuffer = bufferIterator->nextElement();
+  while (enumBuffer)
+    {
+      ResourceManager::getInstance()->unload(enumBuffer);
+      enumBuffer = bufferIterator->nextElement();
+    }
+  delete bufferIterator;
+}
+
+/**
+   \brief creates a new SoundSource.
+   \param fileName The Name to load the SoundBuffer from
+   \param The sourceNode to bind this SoundSource to.
+   \returns The newly created SoundSource
+
+   acctualy this is nothing more than a wrapper around the ResourceManager.
+*/
+SoundSource* SoundEngine::createSource(const char* fileName, PNode* sourceNode)
+{
+  return new SoundSource((SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL), sourceNode);
+}
+
 
 /**

orxonox/branches/openAL/src/lib/sound/sound_engine.h

@@ -71 +71 @@
   virtual ~SoundEngine(void);
 
+  SoundSource* createSource(const char* fileName, PNode* sourceNode);
+
   void setListener(PNode* listener);
 

orxonox/branches/openAL/src/story_entities/world.cc

@@ -491 +491 @@
   SoundEngine::getInstance()->setListener(tn);
   SoundBuffer* tBuffer = new SoundBuffer(ResourceManager::getFullName("sound/explo.wav"));
-  SoundSource* tSound = new SoundSource(tBuffer, this->localPlayer);
-  tSound->setRolloffFactor(0.1);
+  SoundSource* tSound = SoundEngine::getInstance()->createSource("sound/explo.wav", this->localPlayer);
+  tSound->setRolloffFactor(0);
   tSound->play();
 

orxonox/branches/openAL/src/util/resource_manager.cc

@@ -23 +23 @@
 #include "texture.h"
 #include "text_engine.h"
+#include "sound_engine.h"
 
 #include "list.h"
@@ -284 +285 @@
           else
             PRINTF(2)("Sorry, %s does not exist. Not loading Font\n", fullName);
+          break;
+        case WAV:
+          if(isFile(fullName))
+            tmpResource->pointer = new SoundBuffer(fullName);
           break;
         case IMAGE:
@@ -369 +374 @@
             case IMAGE:
               delete (Texture*)resource->pointer;
+              break;
+            case WAV:
+              delete (SoundBuffer*)resource->pointer;
               break;
             case TTF: