[Orxonox-commit 1134] r5855 - in code/branches/core5/src: libraries/core libraries/core/input libraries/network libraries/tools libraries/util orxonox/gamestates orxonox/overlays
rgrieder at orxonox.net
rgrieder at orxonox.net
Fri Oct 2 08:36:25 CEST 2009
Author: rgrieder
Date: 2009-10-02 08:36:25 +0200 (Fri, 02 Oct 2009)
New Revision: 5855
Added:
code/branches/core5/src/libraries/util/Clock.cc
code/branches/core5/src/libraries/util/Clock.h
Removed:
code/branches/core5/src/libraries/core/Clock.cc
code/branches/core5/src/libraries/core/Clock.h
Modified:
code/branches/core5/src/libraries/core/CMakeLists.txt
code/branches/core5/src/libraries/core/Core.cc
code/branches/core5/src/libraries/core/CorePrereqs.h
code/branches/core5/src/libraries/core/GUIManager.cc
code/branches/core5/src/libraries/core/Game.cc
code/branches/core5/src/libraries/core/GraphicsManager.cc
code/branches/core5/src/libraries/core/TclThreadManager.cc
code/branches/core5/src/libraries/core/input/InputDevice.h
code/branches/core5/src/libraries/core/input/InputManager.cc
code/branches/core5/src/libraries/network/Client.cc
code/branches/core5/src/libraries/network/Server.cc
code/branches/core5/src/libraries/tools/Timer.cc
code/branches/core5/src/libraries/util/CMakeLists.txt
code/branches/core5/src/libraries/util/UtilPrereqs.h
code/branches/core5/src/orxonox/gamestates/GSClient.cc
code/branches/core5/src/orxonox/gamestates/GSDedicated.cc
code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc
code/branches/core5/src/orxonox/gamestates/GSGraphics.cc
code/branches/core5/src/orxonox/gamestates/GSLevel.cc
code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc
code/branches/core5/src/orxonox/gamestates/GSRoot.cc
code/branches/core5/src/orxonox/overlays/InGameConsole.cc
Log:
Moved Clock from core to util (used in Scope anyway).
Modified: code/branches/core5/src/libraries/core/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/core/CMakeLists.txt 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/CMakeLists.txt 2009-10-02 06:36:25 UTC (rev 5855)
@@ -18,7 +18,6 @@
#
SET_SOURCE_FILES(CORE_SRC_FILES
- Clock.cc
ConfigFileManager.cc
ConfigValueContainer.cc
Core.cc
Deleted: code/branches/core5/src/libraries/core/Clock.cc
===================================================================
--- code/branches/core5/src/libraries/core/Clock.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/Clock.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -1,78 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-/**
- @file
- @brief
-*/
-
-#include "Clock.h"
-#include <OgreTimer.h>
-
-namespace orxonox
-{
- Clock::Clock()
- : timer_(new Ogre::Timer())
- , storedTime_(0)
- , tickTime_(0)
- , tickDt_(0)
- , tickDtFloat_(0.0f)
- , lastTimersTime_(0)
- {
- }
-
- Clock::~Clock()
- {
- delete timer_;
- }
-
- void Clock::capture()
- {
- unsigned long timersTime = timer_->getMicroseconds();
- tickTime_ = storedTime_ + timersTime;
- tickDt_ = timersTime - lastTimersTime_;
- tickDtFloat_ = static_cast<float>(tickDt_) / 1000000.0f;
-
- if (timersTime > 0xFFFFFFFF/4)
- {
- // Ogre timer will overflow at 2^32 microseconds if unsigned long is 32 bit
- storedTime_ += timersTime;
- lastTimersTime_ = 0;
- timer_->reset();
- }
- else
- {
- lastTimersTime_ = timersTime;
- }
- }
-
- unsigned long long Clock::getRealMicroseconds() const
- {
- return this->timer_->getMicroseconds() + this->storedTime_;
- }
-}
Deleted: code/branches/core5/src/libraries/core/Clock.h
===================================================================
--- code/branches/core5/src/libraries/core/Clock.h 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/Clock.h 2009-10-02 06:36:25 UTC (rev 5855)
@@ -1,67 +0,0 @@
-/*
- * ORXONOX - the hottest 3D action shooter ever to exist
- * > www.orxonox.net <
- *
- *
- * License notice:
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Author:
- * Reto Grieder
- * Co-authors:
- * ...
- *
- */
-
-#ifndef _Clock_H__
-#define _Clock_H__
-
-#include "CorePrereqs.h"
-#include "util/OgreForwardRefs.h"
-
-namespace orxonox
-{
- class _CoreExport Clock
- {
- public:
- Clock();
- ~Clock();
-
- void capture();
-
- unsigned long long getMicroseconds() const { return tickTime_; }
- unsigned long long getMilliseconds() const { return tickTime_ / 1000; }
- unsigned long getSeconds() const { return static_cast<long> (tickTime_ / 1000000); }
- float getSecondsPrecise() const { return static_cast<float>(tickTime_ / 1000000.0f); }
-
- float getDeltaTime() const { return tickDtFloat_; }
- long getDeltaTimeMicroseconds() const { return tickDt_; }
-
- unsigned long long getRealMicroseconds() const;
-
- private:
- Clock(const Clock& instance);
-
- Ogre::Timer* timer_;
- unsigned long long storedTime_;
- unsigned long long tickTime_;
- long tickDt_;
- float tickDtFloat_;
- unsigned long lastTimersTime_;
- };
-}
-
-#endif /* _Clock_H__ */
Modified: code/branches/core5/src/libraries/core/Core.cc
===================================================================
--- code/branches/core5/src/libraries/core/Core.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/Core.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -47,11 +47,11 @@
# undef max
#endif
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/SignalHandler.h"
#include "PathConfig.h"
-#include "Clock.h"
#include "CommandExecutor.h"
#include "CommandLine.h"
#include "ConfigFileManager.h"
Modified: code/branches/core5/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/core5/src/libraries/core/CorePrereqs.h 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/CorePrereqs.h 2009-10-02 06:36:25 UTC (rev 5855)
@@ -96,7 +96,6 @@
class ClassTreeMaskIterator;
class ClassTreeMaskNode;
class ClassTreeMaskObjectIterator;
- class Clock;
class CommandEvaluation;
class CommandExecutor;
class CommandLine;
Modified: code/branches/core5/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/GUIManager.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/GUIManager.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -48,11 +48,11 @@
# include <CEGUILua.h>
#endif
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
#include "Core.h"
-#include "Clock.h"
#include "LuaState.h"
#include "PathConfig.h"
#include "Resource.h"
Modified: code/branches/core5/src/libraries/core/Game.cc
===================================================================
--- code/branches/core5/src/libraries/core/Game.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/Game.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -37,12 +37,12 @@
#include <exception>
#include <boost/weak_ptr.hpp>
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/ScopeGuard.h"
#include "util/Sleep.h"
#include "util/SubString.h"
-#include "Clock.h"
#include "CommandLine.h"
#include "ConsoleCommand.h"
#include "Core.h"
Modified: code/branches/core5/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/GraphicsManager.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/GraphicsManager.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -47,10 +47,10 @@
#include <OgreWindowEventUtilities.h>
#include "SpecialConfig.h"
+#include "util/Clock.h"
#include "util/Exception.h"
#include "util/StringUtils.h"
#include "util/SubString.h"
-#include "Clock.h"
#include "ConsoleCommand.h"
#include "ConfigValueIncludes.h"
#include "CoreIncludes.h"
Modified: code/branches/core5/src/libraries/core/TclThreadManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/TclThreadManager.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/TclThreadManager.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -35,9 +35,9 @@
#include <OgreTimer.h>
#include <cpptcl/cpptcl.h>
+#include "util/Clock.h"
#include "util/Convert.h"
#include "util/Exception.h"
-#include "Clock.h"
#include "CommandExecutor.h"
#include "ConsoleCommand.h"
#include "CoreIncludes.h"
Modified: code/branches/core5/src/libraries/core/input/InputDevice.h
===================================================================
--- code/branches/core5/src/libraries/core/input/InputDevice.h 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/input/InputDevice.h 2009-10-02 06:36:25 UTC (rev 5855)
@@ -40,9 +40,9 @@
#include <vector>
#include <ois/OISInputManager.h>
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Exception.h"
-#include "core/Clock.h"
#include "InputState.h"
namespace orxonox
Modified: code/branches/core5/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/core5/src/libraries/core/input/InputManager.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/core/input/InputManager.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -40,10 +40,10 @@
#include <ois/OISInputManager.h>
#include <boost/foreach.hpp>
+#include "util/Clock.h"
#include "util/Convert.h"
#include "util/Exception.h"
#include "util/ScopeGuard.h"
-#include "core/Clock.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/ConsoleCommand.h"
Modified: code/branches/core5/src/libraries/network/Client.cc
===================================================================
--- code/branches/core5/src/libraries/network/Client.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/network/Client.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -42,8 +42,8 @@
#include <cassert>
+#include "util/Clock.h"
#include "util/Debug.h"
-#include "core/Clock.h"
#include "synchronisable/Synchronisable.h"
#include "packet/Chat.h"
#include "packet/Gamestate.h"
Modified: code/branches/core5/src/libraries/network/Server.cc
===================================================================
--- code/branches/core5/src/libraries/network/Server.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/network/Server.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -45,8 +45,8 @@
#include <cassert>
#include <string>
+#include "util/Clock.h"
#include "util/Debug.h"
-#include "core/Clock.h"
#include "core/ObjectList.h"
#include "core/Executor.h"
#include "packet/Chat.h"
Modified: code/branches/core5/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/core5/src/libraries/tools/Timer.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/tools/Timer.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -30,10 +30,10 @@
#include <set>
+#include "util/Clock.h"
#include "core/CoreIncludes.h"
#include "core/ConsoleCommand.h"
#include "core/CommandExecutor.h"
-#include "core/Clock.h"
#include "core/Functor.h"
namespace orxonox
Modified: code/branches/core5/src/libraries/util/CMakeLists.txt
===================================================================
--- code/branches/core5/src/libraries/util/CMakeLists.txt 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/util/CMakeLists.txt 2009-10-02 06:36:25 UTC (rev 5855)
@@ -19,6 +19,7 @@
SET_SOURCE_FILES(UTIL_SRC_FILES
Clipboard.cc
+ Clock.cc
CRC32.cc
Exception.cc
ExprParser.cc
Copied: code/branches/core5/src/libraries/util/Clock.cc (from rev 5854, code/branches/core5/src/libraries/core/Clock.cc)
===================================================================
--- code/branches/core5/src/libraries/util/Clock.cc (rev 0)
+++ code/branches/core5/src/libraries/util/Clock.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -0,0 +1,73 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "Clock.h"
+#include <OgreTimer.h>
+
+namespace orxonox
+{
+ Clock::Clock()
+ : timer_(new Ogre::Timer())
+ , storedTime_(0)
+ , tickTime_(0)
+ , tickDt_(0)
+ , tickDtFloat_(0.0f)
+ , lastTimersTime_(0)
+ {
+ }
+
+ Clock::~Clock()
+ {
+ delete timer_;
+ }
+
+ void Clock::capture()
+ {
+ unsigned long timersTime = timer_->getMicroseconds();
+ tickTime_ = storedTime_ + timersTime;
+ tickDt_ = timersTime - lastTimersTime_;
+ tickDtFloat_ = static_cast<float>(tickDt_) / 1000000.0f;
+
+ if (timersTime > 0xFFFFFFFF/4)
+ {
+ // Ogre timer will overflow at 2^32 microseconds if unsigned long is 32 bit
+ storedTime_ += timersTime;
+ lastTimersTime_ = 0;
+ timer_->reset();
+ }
+ else
+ {
+ lastTimersTime_ = timersTime;
+ }
+ }
+
+ unsigned long long Clock::getRealMicroseconds() const
+ {
+ return this->timer_->getMicroseconds() + this->storedTime_;
+ }
+}
Copied: code/branches/core5/src/libraries/util/Clock.h (from rev 5854, code/branches/core5/src/libraries/core/Clock.h)
===================================================================
--- code/branches/core5/src/libraries/util/Clock.h (rev 0)
+++ code/branches/core5/src/libraries/util/Clock.h 2009-10-02 06:36:25 UTC (rev 5855)
@@ -0,0 +1,67 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Clock_H__
+#define _Clock_H__
+
+#include "UtilPrereqs.h"
+#include "OgreForwardRefs.h"
+
+namespace orxonox
+{
+ class _UtilExport Clock
+ {
+ public:
+ Clock();
+ ~Clock();
+
+ void capture();
+
+ unsigned long long getMicroseconds() const { return tickTime_; }
+ unsigned long long getMilliseconds() const { return tickTime_ / 1000; }
+ unsigned long getSeconds() const { return static_cast<long> (tickTime_ / 1000000); }
+ float getSecondsPrecise() const { return static_cast<float>(tickTime_ / 1000000.0f); }
+
+ float getDeltaTime() const { return tickDtFloat_; }
+ long getDeltaTimeMicroseconds() const { return tickDt_; }
+
+ unsigned long long getRealMicroseconds() const;
+
+ private:
+ Clock(const Clock& instance);
+
+ Ogre::Timer* timer_;
+ unsigned long long storedTime_;
+ unsigned long long tickTime_;
+ long tickDt_;
+ float tickDtFloat_;
+ unsigned long lastTimersTime_;
+ };
+}
+
+#endif /* _Clock_H__ */
Modified: code/branches/core5/src/libraries/util/UtilPrereqs.h
===================================================================
--- code/branches/core5/src/libraries/util/UtilPrereqs.h 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/libraries/util/UtilPrereqs.h 2009-10-02 06:36:25 UTC (rev 5855)
@@ -62,6 +62,7 @@
namespace orxonox
{
+ class Clock;
class Exception;
class ExprParser;
class IntVector2;
Modified: code/branches/core5/src/orxonox/gamestates/GSClient.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSClient.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSClient.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -28,8 +28,8 @@
#include "GSClient.h"
+#include "util/Clock.h"
#include "util/Exception.h"
-#include "core/Clock.h"
#include "core/CommandLine.h"
#include "core/Game.h"
#include "core/GameMode.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSDedicated.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSDedicated.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSDedicated.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -32,9 +32,9 @@
#include <iostream>
#include <boost/bind.hpp>
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Sleep.h"
-#include "core/Clock.h"
#include "core/CommandLine.h"
#include "core/CommandExecutor.h"
#include "core/Game.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSDedicatedClient.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -32,10 +32,10 @@
#include <iostream>
#include <boost/bind.hpp>
+#include "util/Clock.h"
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/Sleep.h"
-#include "core/Clock.h"
#include "core/CommandLine.h"
#include "core/CommandExecutor.h"
#include "core/Game.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSGraphics.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSGraphics.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -34,8 +34,8 @@
#include "GSGraphics.h"
+#include "util/Clock.h"
#include "util/Convert.h"
-#include "core/Clock.h"
#include "core/CommandExecutor.h"
#include "core/ConsoleCommand.h"
#include "core/Game.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSLevel.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSLevel.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -31,10 +31,10 @@
#include <OgreCompositorManager.h>
+#include "util/Clock.h"
#include "core/input/InputManager.h"
#include "core/input/InputState.h"
#include "core/input/KeyBinder.h"
-#include "core/Clock.h"
#include "core/ConsoleCommand.h"
#include "core/ConfigValueIncludes.h"
#include "core/CoreIncludes.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSMainMenu.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -30,10 +30,10 @@
#include <OgreSceneManager.h>
+#include "util/Clock.h"
#include "core/input/InputManager.h"
#include "core/input/InputState.h"
#include "core/Game.h"
-#include "core/Clock.h"
#include "core/ConsoleCommand.h"
#include "core/GraphicsManager.h"
#include "core/GUIManager.h"
Modified: code/branches/core5/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/core5/src/orxonox/gamestates/GSRoot.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/gamestates/GSRoot.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -28,7 +28,7 @@
#include "GSRoot.h"
-#include "core/Clock.h"
+#include "util/Clock.h"
#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GameMode.h"
Modified: code/branches/core5/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/core5/src/orxonox/overlays/InGameConsole.cc 2009-10-01 15:19:27 UTC (rev 5854)
+++ code/branches/core5/src/orxonox/overlays/InGameConsole.cc 2009-10-02 06:36:25 UTC (rev 5855)
@@ -40,10 +40,10 @@
#include <OgreFontManager.h>
#include <OgreFont.h>
+#include "util/Clock.h"
+#include "util/Convert.h"
#include "util/Math.h"
-#include "util/Convert.h"
#include "util/UTFStringConversions.h"
-#include "core/Clock.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/ConsoleCommand.h"
More information about the Orxonox-commit
mailing list