Changeset 2013 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 25, 2008, 9:50:26 PM (16 years ago)

Author:

rgrieder

Message:

tiny adjustments to various files. just came across certain things..

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• OrxonoxStableHeaders.h (modified) (4 diffs)
• gamestates/GSGraphics.cc (modified) (3 diffs)
• gamestates/GSIOConsole.cc (modified) (1 diff)
• gui/OgreCEGUIRenderer.cpp (modified) (1 diff)
• gui/OgreCEGUIResourceProvider.cpp (modified) (1 diff)
• gui/OgreCEGUITexture.cpp (modified) (1 diff)
• objects/Trigger.h (modified) (1 diff)

code/branches/objecthierarchy/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
+#if defined(ORXONOX_ENABLE_PCH)
 
 // including std headers here is useless since they're already precompiled
@@ -47 +47 @@
 #include <Ogre.h>
 #include <CEGUI.h>
+#include "ois/OIS.h"
 #include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread/thread.hpp>
-
+//#include <boost/thread/mutex.hpp>
+//#include <boost/thread/condition.hpp>
+//#include <boost/thread/thread.hpp>
+#include <boost/static_assert.hpp>
 #include "tinyxml/ticpp.h"
 #include "tinyxml/tinyxml.h"
+#include "tolua/tolua++.h"
 
-//Get around Windows hackery (windows.h is included by Ogre)
+//Get around Windows hackery (windows.h is included by Ogre.h)
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 
 #  ifdef max
@@ -67 +69 @@
 //----------- Our files ----------
 //--------------------------------
-// only include when not debugging so that we may find issues with missing headers quicker
-#if defined(NDEBUG)
+//// only include when not debugging so that we may find issues with missing headers quicker
+//#if defined(NDEBUG)
 
 #include "util/Convert.h"
 #include "util/Debug.h"
+#include "util/Exception.h"
 #include "util/Math.h"
 #include "util/Multitype.h"
-#include "util/OutputBuffer.h"
-#include "util/OutputHandler.h"
 #include "util/Sleep.h"
 #include "util/String.h"
@@ -85 +86 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/CommandExecutor.h"
+#include "core/Core.h"
 #include "core/Executor.h"
+#include "core/ObjectList.h"
+#include "core/Super.h"
 #include "core/XMLIncludes.h"
 #include "core/XMLPort.h"
+#include "core/input/SimpleInputState.h"
+#include "core/input/InputManager.h"
 
 #include "network/Synchronisable.h"
 
-//#include "tools/Mesh.h"
-//#include "tools/Timer.h"
-//#include "objects/Model.h"
-//#include "objects/Tickable.h"
-//#include "objects/WorldEntity.h"
+#include "Settings.h"
 
-#endif /* ifdef NDEBUG */
+//#endif /* ifdef NDEBUG */
 
 #endif /* ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) */

code/branches/objecthierarchy/src/orxonox/gamestates/GSGraphics.cc

@@ -489 +489 @@
             it->windowResized(this->renderWindow_->getWidth(), this->renderWindow_->getHeight());
 
-                // OIS needs this under linux even if we only use relative input measurement.
-                if (this->inputManager_)
+        // OIS needs this under linux even if we only use relative input measurement.
+        if (this->inputManager_)
             this->inputManager_->setWindowExtents(renderWindow_->getWidth(), renderWindow_->getHeight());
     }
@@ -506 +506 @@
 
         // instruct InputManager to clear the buffers (core library so we cannot use the interface)
-                if (this->inputManager_)
+        if (this->inputManager_)
             this->inputManager_->clearBuffers();
     }
@@ -518 +518 @@
     void GSGraphics::windowClosed(Ogre::RenderWindow *rw)
     {
-        // using CommandExecutor in order to avoid depending on Orxonox.h.
-        //CommandExecutor::execute("exit", false);
         this->requestState("root");
     }

code/branches/objecthierarchy/src/orxonox/gamestates/GSIOConsole.cc

@@ -36 +36 @@
 
 #include "core/ConsoleCommand.h"
-#include "core/TclThreadManager.h"
 #include "GraphicsEngine.h"
 

code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUIRenderer.cpp

@@ -25 +25 @@
 *************************************************************************/
 
+#include "OrxonoxStableHeaders.h"
 #include <CEGUIImagesetManager.h>
 #include <CEGUIImageset.h>

code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUIResourceProvider.cpp

@@ -24 +24 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *************************************************************************/
+#include "OrxonoxStableHeaders.h"
 #include "OgreCEGUIResourceProvider.h"
 

code/branches/objecthierarchy/src/orxonox/gui/OgreCEGUITexture.cpp

@@ -25 +25 @@
 *************************************************************************/
 
+#include "OrxonoxStableHeaders.h"
 #include <CEGUISystem.h>
 #include <CEGUIExceptions.h>

code/branches/objecthierarchy/src/orxonox/objects/Trigger.h

@@ -36 +36 @@
 
 #include "worldentities/PositionableEntity.h"
-
-#include "../tools/BillboardSet.h"
+#include "tools/BillboardSet.h"
 
 namespace orxonox {