Changeset 3898 in orxonox.OLD for orxonox/branches/sound_engine/src/story_entities

Timestamp:

Apr 19, 2005, 8:31:01 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/sound_engine: sound works sloppy, test it

Location:

orxonox/branches/sound_engine/src/story_entities

Files:

• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "light.h"
 #include "text_engine.h"
+#include "sound_engine.h"
 
 #include "track_manager.h"
@@ -147 +148 @@
   cn->unbind(this->localPlayer);
   cn->reset();
+
+  ResourceManager::getInstance()->unload(this->music);
 
   ResourceManager::getInstance()->debug();
@@ -271 +274 @@
       trackManager->finalize();
 
-      
+      this->music = (Sound*)ResourceManager::getInstance()->load("sound/orx.mp3", RESOURCE_SOUND_MUSIC, RP_LEVEL);
+      this->music->play();
       /*monitor progress*/
       this->glmis->step();

orxonox/branches/sound_engine/src/story_entities/world.h

@@ -24 +24 @@
 class Terrain;
 class GarbageCollector;
-class Text;
+class Sound;
 
 //! The game world Interface
@@ -108 +108 @@
   LightManager* lightMan;             //!< The Lights of the Level
   Terrain* terrain;                   //!< The Terrain of the World.
+  Sound* music;                       //!< The Music to Play in the Level
 
   GLuint objectList;                  //!< temporary: \todo this will be ereased soon