Changeset 5914 for code/branches

Timestamp:

Oct 9, 2009, 1:12:16 PM (15 years ago)

Author:

rgrieder

Message:

• Fixed missing includes
• Fixed non-world coordinate camera position in HumanController
• Removed std::cout debug output in Level.cc

Location:

code/branches/core5/src

Files:

• libraries/core/EventIncludes.h (modified) (1 diff)
• orxonox/Level.cc (modified) (1 diff)
• orxonox/Scene.cc (modified) (1 diff)
• orxonox/controllers/HumanController.cc (modified) (1 diff)
• orxonox/sound/AmbientSound.cc (modified) (1 diff)
• orxonox/sound/WorldSound.cc (modified) (1 diff)

code/branches/core5/src/libraries/core/EventIncludes.h

@@ -32 +32 @@
 #include "CorePrereqs.h"
 #include "Executor.h"
+#include "XMLPort.h"
 
 /**

code/branches/core5/src/orxonox/Level.cc

@@ -110 +110 @@
             this->gametype_ = gametype;
 
-std::cout << "Load Gametype: " << this->gametype_ << std::endl;
-
         Gametype* rootgametype = orxonox_cast<Gametype*>(identifier->fabricate(this));
         this->setGametype(rootgametype);
-
-std::cout << "root gametype: " << rootgametype->getIdentifier()->getName() << std::endl;
 
         for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)

code/branches/core5/src/orxonox/Scene.cc

@@ -42 +42 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
+#include "core/GUIManager.h"
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"

code/branches/core5/src/orxonox/controllers/HumanController.cc

@@ -87 +87 @@
             if (camera)
             {
-                SoundManager::getInstance().setListenerPosition(camera->getPosition());
-                SoundManager::getInstance().setListenerOrientation(camera->getOrientation());
+                SoundManager::getInstance().setListenerPosition(camera->getWorldPosition());
+                SoundManager::getInstance().setListenerOrientation(camera->getWorldOrientation());
             }
             else

code/branches/core5/src/orxonox/sound/AmbientSound.cc

@@ -29 +29 @@
 #include "AmbientSound.h"
 
+#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"

code/branches/core5/src/orxonox/sound/WorldSound.cc

@@ -32 +32 @@
 #include <AL/alut.h>
 #include "util/Math.h"
+#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"