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

Timestamp:

Jun 4, 2005, 12:38:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (4 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -65 +65 @@
 #include "event_handler.h"
 
+#include "sound_engine.h"
+
 using namespace std;
 
@@ -182 +184 @@
   delete this->particleEngine;
   TextEngine::getInstance()->flush();
+  SoundEngine::getInstance()->flushAllBuffers();
+
   delete AnimationPlayer::getInstance(); // this should be at the end of the unloading sequence.
   delete PhysicsEngine::getInstance();
@@ -468 +472 @@
   this->spawn(terrain);
 
+  SoundEngine::getInstance()->setListener(this->localCamera);
 
 
@@ -1079 +1084 @@
   this->garbageCollector->update();
   this->nullParent->update (this->dtS);
+
+  SoundEngine::getInstance()->update();
 }