Changeset 4961 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 28, 2005, 1:19:50 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: music now plays back, as one would expect, and the ReosurceManager handles ogg's.
Also the naming has changed a bit, and doxygen tags are complete in ogg_player.h/cc

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -66 +66 @@
 
 #include "sound_engine.h"
+#include "ogg_player.h"
 
 #include "class_list.h"
@@ -206 +207 @@
 
   LoadClassDescription::printAll();
+
+
+  ResourceManager::getInstance()->unload(this->music);
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 }
@@ -226 +230 @@
   //strcpy(this->worldName, name);
   this->debugWorldNr = worldID;
+
+  this->music = NULL;
 }
 
@@ -517 +523 @@
 
   ClassList::debug();
+
+  this->music = (OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
+  music->playback();
 }
 
@@ -954 +963 @@
 
   SoundEngine::getInstance()->update();
+  music->update();
 }
 

orxonox/trunk/src/story_entities/world.h

@@ -24 +24 @@
 class PilotNode;
 
+class OggPlayer;
 //! The game world Interface
 /**
@@ -112 +113 @@
 
 
+  OggPlayer* music;
   // IMPORTANT WORLD-ENTITIES
   PNode* nullParent;                  //!< The zero-point, that everything has as its parent.