[Orxonox-commit 1193] r5914 - in code/branches/core5/src: libraries/core orxonox orxonox/controllers orxonox/sound

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-10-09 13:12:16 +0200 (Fri, 09 Oct 2009)
New Revision: 5914

Modified:
   code/branches/core5/src/libraries/core/EventIncludes.h
   code/branches/core5/src/orxonox/Level.cc
   code/branches/core5/src/orxonox/Scene.cc
   code/branches/core5/src/orxonox/controllers/HumanController.cc
   code/branches/core5/src/orxonox/sound/AmbientSound.cc
   code/branches/core5/src/orxonox/sound/WorldSound.cc
Log:
- Fixed missing includes
- Fixed non-world coordinate camera position in HumanController
- Removed std::cout debug output in Level.cc

Modified: code/branches/core5/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/core5/src/libraries/core/EventIncludes.h	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/libraries/core/EventIncludes.h	2009-10-09 11:12:16 UTC (rev 5914)
@@ -31,6 +31,7 @@
 
 #include "CorePrereqs.h"
 #include "Executor.h"
+#include "XMLPort.h"
 
 /**
     @brief Defines a new event state (a state of the object which can be changed by events).

Modified: code/branches/core5/src/orxonox/Level.cc
===================================================================
--- code/branches/core5/src/orxonox/Level.cc	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/orxonox/Level.cc	2009-10-09 11:12:16 UTC (rev 5914)
@@ -109,13 +109,9 @@
         else
             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)
             (*it)->setGametype(rootgametype);
 

Modified: code/branches/core5/src/orxonox/Scene.cc
===================================================================
--- code/branches/core5/src/orxonox/Scene.cc	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/orxonox/Scene.cc	2009-10-09 11:12:16 UTC (rev 5914)
@@ -41,6 +41,7 @@
 
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
+#include "core/GUIManager.h"
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
 #include "Radar.h"

Modified: code/branches/core5/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/core5/src/orxonox/controllers/HumanController.cc	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/orxonox/controllers/HumanController.cc	2009-10-09 11:12:16 UTC (rev 5914)
@@ -86,8 +86,8 @@
             Camera* camera = HumanController::localController_s->controllableEntity_->getCamera();
             if (camera)
             {
-                SoundManager::getInstance().setListenerPosition(camera->getPosition());
-                SoundManager::getInstance().setListenerOrientation(camera->getOrientation());
+                SoundManager::getInstance().setListenerPosition(camera->getWorldPosition());
+                SoundManager::getInstance().setListenerOrientation(camera->getWorldOrientation());
             }
             else
                 COUT(3) << "HumanController, Warning: Using a ControllableEntity without Camera" << std::endl;

Modified: code/branches/core5/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/core5/src/orxonox/sound/AmbientSound.cc	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/orxonox/sound/AmbientSound.cc	2009-10-09 11:12:16 UTC (rev 5914)
@@ -28,6 +28,7 @@
 
 #include "AmbientSound.h"
 
+#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
 

Modified: code/branches/core5/src/orxonox/sound/WorldSound.cc
===================================================================
--- code/branches/core5/src/orxonox/sound/WorldSound.cc	2009-10-08 21:23:13 UTC (rev 5913)
+++ code/branches/core5/src/orxonox/sound/WorldSound.cc	2009-10-09 11:12:16 UTC (rev 5914)
@@ -31,6 +31,7 @@
 
 #include <AL/alut.h>
 #include "util/Math.h"
+#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"