[Orxonox-commit 622] r3154 - in branches/pch/src: core core/input network network/packet orxonox orxonox/gamestates orxonox/objects orxonox/objects/weaponsystem/projectiles orxonox/objects/worldentities orxonox/overlays orxonox/overlays/map
rgrieder at orxonox.net
rgrieder at orxonox.net
Sat Jun 13 16:30:38 CEST 2009
Author: rgrieder
Date: 2009-06-13 16:30:37 +0200 (Sat, 13 Jun 2009)
New Revision: 3154
Modified:
branches/pch/src/core/ArgumentCompletionFunctions.cc
branches/pch/src/core/ArgumentCompletionListElement.h
branches/pch/src/core/BaseObject.cc
branches/pch/src/core/BaseObject.h
branches/pch/src/core/ClassFactory.h
branches/pch/src/core/ClassTreeMask.cc
branches/pch/src/core/ClassTreeMask.h
branches/pch/src/core/CommandEvaluation.cc
branches/pch/src/core/CommandExecutor.cc
branches/pch/src/core/CommandExecutor.h
branches/pch/src/core/CommandLine.cc
branches/pch/src/core/CommandLine.h
branches/pch/src/core/ConfigFileManager.cc
branches/pch/src/core/ConfigFileManager.h
branches/pch/src/core/ConfigValueContainer.cc
branches/pch/src/core/ConfigValueContainer.h
branches/pch/src/core/ConsoleCommand.h
branches/pch/src/core/ConsoleCommandCompilation.cc
branches/pch/src/core/ConsoleCommandCompilation.h
branches/pch/src/core/CorePrereqs.h
branches/pch/src/core/Event.cc
branches/pch/src/core/Event.h
branches/pch/src/core/Executor.cc
branches/pch/src/core/Executor.h
branches/pch/src/core/Factory.cc
branches/pch/src/core/Functor.h
branches/pch/src/core/Game.cc
branches/pch/src/core/Game.h
branches/pch/src/core/GameState.cc
branches/pch/src/core/GameState.h
branches/pch/src/core/IRC.cc
branches/pch/src/core/IRC.h
branches/pch/src/core/Identifier.cc
branches/pch/src/core/Identifier.h
branches/pch/src/core/Iterator.h
branches/pch/src/core/Language.cc
branches/pch/src/core/Loader.cc
branches/pch/src/core/Loader.h
branches/pch/src/core/LuaBind.cc
branches/pch/src/core/LuaBind.h
branches/pch/src/core/MetaObjectList.cc
branches/pch/src/core/Namespace.cc
branches/pch/src/core/Namespace.h
branches/pch/src/core/ObjectListBase.cc
branches/pch/src/core/ObjectListBase.h
branches/pch/src/core/ObjectListIterator.h
branches/pch/src/core/OrxonoxClass.cc
branches/pch/src/core/OrxonoxClass.h
branches/pch/src/core/Shell.cc
branches/pch/src/core/Shell.h
branches/pch/src/core/Super.h
branches/pch/src/core/TclBind.cc
branches/pch/src/core/TclBind.h
branches/pch/src/core/TclThreadManager.cc
branches/pch/src/core/TclThreadManager.h
branches/pch/src/core/Template.cc
branches/pch/src/core/Template.h
branches/pch/src/core/XMLFile.h
branches/pch/src/core/XMLPort.cc
branches/pch/src/core/XMLPort.h
branches/pch/src/core/input/InputManager.cc
branches/pch/src/network/GamestateClient.cc
branches/pch/src/network/NetworkFunction.h
branches/pch/src/network/Server.cc
branches/pch/src/network/packet/Gamestate.cc
branches/pch/src/orxonox/CameraManager.cc
branches/pch/src/orxonox/gamestates/GSLevel.cc
branches/pch/src/orxonox/objects/Radar.cc
branches/pch/src/orxonox/objects/Radar.h
branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc
branches/pch/src/orxonox/objects/worldentities/Camera.cc
branches/pch/src/orxonox/overlays/OverlayGroup.cc
branches/pch/src/orxonox/overlays/map/Map.cc
branches/pch/src/orxonox/overlays/map/Map.h
Log:
Tried to reduce dependencies in the core. There wasn't much to achieve though...
Modified: branches/pch/src/core/ArgumentCompletionFunctions.cc
===================================================================
--- branches/pch/src/core/ArgumentCompletionFunctions.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ArgumentCompletionFunctions.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,17 +28,15 @@
#include "ArgumentCompletionFunctions.h"
-#include <iostream>
#include <map>
#include <boost/version.hpp>
#include <boost/filesystem.hpp>
-#include "CoreIncludes.h"
+#include "util/Convert.h"
+#include "util/String.h"
#include "Identifier.h"
#include "ConfigValueContainer.h"
#include "TclThreadManager.h"
-#include "util/Convert.h"
-#include "util/String.h"
// Boost 1.36 has some issues with deprecated functions that have been omitted
#if (BOOST_VERSION == 103600)
Modified: branches/pch/src/core/ArgumentCompletionListElement.h
===================================================================
--- branches/pch/src/core/ArgumentCompletionListElement.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ArgumentCompletionListElement.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,10 +31,9 @@
#include "CorePrereqs.h"
-#include <string>
#include <list>
+#include <string>
-
namespace orxonox
{
const int ACL_MODE_NORMAL = 1;
Modified: branches/pch/src/core/BaseObject.cc
===================================================================
--- branches/pch/src/core/BaseObject.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/BaseObject.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -35,15 +35,16 @@
#include <tinyxml/tinyxml.h>
+#include "util/String.h"
#include "CoreIncludes.h"
+#include "Event.h"
#include "EventIncludes.h"
#include "Functor.h"
-#include "XMLPort.h"
+#include "Iterator.h"
+#include "Template.h"
#include "XMLFile.h"
#include "XMLNameListener.h"
-#include "Template.h"
-#include "util/String.h"
-#include "util/mbool.h"
+#include "XMLPort.h"
namespace orxonox
{
Modified: branches/pch/src/core/BaseObject.h
===================================================================
--- branches/pch/src/core/BaseObject.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/BaseObject.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -43,16 +43,16 @@
this->functorGetMainState_ = createFunctor(&classname::getfunction)->setObject(this); \
}
+
+#include "CorePrereqs.h"
+
#include <map>
#include <list>
-#include "CorePrereqs.h"
-
+#include "util/mbool.h"
+#include "OrxonoxClass.h"
#include "Super.h"
-#include "OrxonoxClass.h"
#include "XMLIncludes.h"
-#include "Event.h"
-#include "util/mbool.h"
namespace orxonox
{
Modified: branches/pch/src/core/ClassFactory.h
===================================================================
--- branches/pch/src/core/ClassFactory.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ClassFactory.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -40,9 +40,9 @@
#include <string>
+#include "util/Debug.h"
#include "Factory.h"
#include "Identifier.h"
-#include "util/Debug.h"
namespace orxonox
{
Modified: branches/pch/src/core/ClassTreeMask.cc
===================================================================
--- branches/pch/src/core/ClassTreeMask.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ClassTreeMask.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,7 +33,6 @@
#include "ClassTreeMask.h"
#include "Identifier.h"
-#include "BaseObject.h"
namespace orxonox
{
Modified: branches/pch/src/core/ClassTreeMask.h
===================================================================
--- branches/pch/src/core/ClassTreeMask.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ClassTreeMask.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -74,9 +74,8 @@
#include <list>
#include <stack>
-
-#include "Iterator.h"
#include "BaseObject.h"
+#include "Iterator.h"
namespace orxonox
{
Modified: branches/pch/src/core/CommandEvaluation.cc
===================================================================
--- branches/pch/src/core/CommandEvaluation.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CommandEvaluation.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,10 +27,11 @@
*/
#include "CommandEvaluation.h"
+
+#include "util/Debug.h"
+#include "util/String.h"
#include "ConsoleCommand.h"
#include "Identifier.h"
-#include "util/Debug.h"
-#include "util/String.h"
namespace orxonox
{
Modified: branches/pch/src/core/CommandExecutor.cc
===================================================================
--- branches/pch/src/core/CommandExecutor.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CommandExecutor.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,9 +27,10 @@
*/
#include "CommandExecutor.h"
+
+#include "util/Debug.h"
+#include "util/String.h"
#include "ConsoleCommand.h"
-#include "util/String.h"
-#include "util/Debug.h"
#include "Identifier.h"
#include "Language.h"
#include "TclBind.h"
Modified: branches/pch/src/core/CommandExecutor.h
===================================================================
--- branches/pch/src/core/CommandExecutor.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CommandExecutor.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,6 +33,9 @@
#include <map>
#include <set>
+#include <string>
+
+#include "util/MultiType.h"
#include "CommandEvaluation.h"
// tolua_begin
Modified: branches/pch/src/core/CommandLine.cc
===================================================================
--- branches/pch/src/core/CommandLine.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CommandLine.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,6 +30,8 @@
#include <boost/filesystem.hpp>
+#include "util/Convert.h"
+#include "util/Debug.h"
#include "util/Exception.h"
#include "util/String.h"
#include "util/SubString.h"
Modified: branches/pch/src/core/CommandLine.h
===================================================================
--- branches/pch/src/core/CommandLine.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CommandLine.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,9 +30,8 @@
#define _CommandLine_H__
#include "CorePrereqs.h"
+
#include <map>
-#include "util/Convert.h"
-#include "util/Debug.h"
#include "util/OrxAssert.h"
#include "util/MultiType.h"
Modified: branches/pch/src/core/ConfigFileManager.cc
===================================================================
--- branches/pch/src/core/ConfigFileManager.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConfigFileManager.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,10 +28,10 @@
#include "ConfigFileManager.h"
-#include <cassert>
#include <boost/filesystem.hpp>
#include "util/Convert.h"
+#include "util/Math.h"
#include "util/String.h"
#include "ConsoleCommand.h"
#include "ConfigValueContainer.h"
Modified: branches/pch/src/core/ConfigFileManager.h
===================================================================
--- branches/pch/src/core/ConfigFileManager.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConfigFileManager.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,12 +31,11 @@
#include "CorePrereqs.h"
-#include <iostream>
+#include <cassert>
#include <string>
#include <list>
#include <map>
-#include "util/Math.h"
#include "util/OrxEnum.h"
namespace orxonox
Modified: branches/pch/src/core/ConfigValueContainer.cc
===================================================================
--- branches/pch/src/core/ConfigValueContainer.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConfigValueContainer.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,15 +33,10 @@
#include "ConfigValueContainer.h"
-#include <fstream>
-
-#include "util/SubString.h"
#include "util/Convert.h"
+#include "util/SubString.h"
#include "Language.h"
-#include "Identifier.h"
-
-
namespace orxonox
{
const unsigned int MAX_VECTOR_INDEX = 255; // to avoid up to 4*10^9 vector entries in the config file after accidentally using a wrong argument
Modified: branches/pch/src/core/ConfigValueContainer.h
===================================================================
--- branches/pch/src/core/ConfigValueContainer.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConfigValueContainer.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -48,7 +48,6 @@
#include <string>
#include <vector>
-#include "util/Math.h"
#include "util/MultiType.h"
#include "ConfigFileManager.h"
#include "Identifier.h"
Modified: branches/pch/src/core/ConsoleCommand.h
===================================================================
--- branches/pch/src/core/ConsoleCommand.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConsoleCommand.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,10 +31,10 @@
#include "CorePrereqs.h"
+#include "ArgumentCompletionFunctions.h"
+#include "CommandExecutor.h"
#include "Executor.h"
#include "Identifier.h"
-#include "CommandExecutor.h"
-#include "ArgumentCompletionFunctions.h"
#define SetConsoleCommand(classname, function, bCreateShortcut) \
Modified: branches/pch/src/core/ConsoleCommandCompilation.cc
===================================================================
--- branches/pch/src/core/ConsoleCommandCompilation.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConsoleCommandCompilation.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,9 +27,14 @@
*/
#include "ConsoleCommandCompilation.h"
-#include "ConsoleCommand.h"
+
+#include <fstream>
+#include <set>
+#include <string>
+
#include "util/Debug.h"
#include "util/ExprParser.h"
+#include "ConsoleCommand.h"
namespace orxonox
{
Modified: branches/pch/src/core/ConsoleCommandCompilation.h
===================================================================
--- branches/pch/src/core/ConsoleCommandCompilation.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ConsoleCommandCompilation.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,8 +31,6 @@
#include "CorePrereqs.h"
-#include <string>
-
namespace orxonox
{
_CoreExport void source(const std::string& filename);
Modified: branches/pch/src/core/CorePrereqs.h
===================================================================
--- branches/pch/src/core/CorePrereqs.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/CorePrereqs.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,8 +36,6 @@
#include "OrxonoxConfig.h"
-#include <string>
-
//-----------------------------------------------------------------------
// Shared library settings
//-----------------------------------------------------------------------
@@ -189,4 +187,11 @@
class SimpleInputState;
}
+// CppTcl
+namespace Tcl
+{
+ class interpreter;
+ class object;
+}
+
#endif /* _CorePrereqs_H__ */
Modified: branches/pch/src/core/Event.cc
===================================================================
--- branches/pch/src/core/Event.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Event.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,6 +27,7 @@
*/
#include "Event.h"
+
#include "BaseObject.h"
#include "Executor.h"
Modified: branches/pch/src/core/Event.h
===================================================================
--- branches/pch/src/core/Event.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Event.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,6 +30,7 @@
#define _Event_H__
#include "CorePrereqs.h"
+#include <string>
namespace orxonox
{
Modified: branches/pch/src/core/Executor.cc
===================================================================
--- branches/pch/src/core/Executor.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Executor.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,7 +28,7 @@
*/
#include "Executor.h"
-#include "util/Math.h"
+
#include "util/Convert.h"
#include "Language.h"
Modified: branches/pch/src/core/Executor.h
===================================================================
--- branches/pch/src/core/Executor.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Executor.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,11 +32,11 @@
#include "CorePrereqs.h"
+#include "util/Debug.h"
+#include "util/Math.h"
+#include "util/String.h"
#include "util/SubString.h"
-#include "util/String.h"
-#include "util/Math.h"
#include "Functor.h"
-#include "util/Debug.h"
#define EXECUTOR_PARSE_FUNCTORCALL(mode) EXECUTOR_PARSE_FUNCTORCALL##mode
Modified: branches/pch/src/core/Factory.cc
===================================================================
--- branches/pch/src/core/Factory.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Factory.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,9 +32,10 @@
*/
#include "Factory.h"
+
+#include "util/Debug.h"
#include "Identifier.h"
#include "BaseObject.h"
-#include "util/Debug.h"
namespace orxonox
{
Modified: branches/pch/src/core/Functor.h
===================================================================
--- branches/pch/src/core/Functor.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Functor.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,11 +32,10 @@
#include "CorePrereqs.h"
+#include "util/Debug.h"
#include "util/MultiType.h"
#include "util/String.h"
-#include "util/Debug.h"
-
namespace orxonox
{
const unsigned int MAX_FUNCTOR_ARGUMENTS = 5;
Modified: branches/pch/src/core/Game.cc
===================================================================
--- branches/pch/src/core/Game.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Game.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -35,7 +35,6 @@
#include "Game.h"
#include <exception>
-#include <cassert>
#include <boost/weak_ptr.hpp>
#include "util/Debug.h"
Modified: branches/pch/src/core/Game.h
===================================================================
--- branches/pch/src/core/Game.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Game.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,11 +36,13 @@
#define _Game_H__
#include "CorePrereqs.h"
+
#include <cassert>
#include <list>
#include <map>
#include <vector>
#include <boost/shared_ptr.hpp>
+
#include "OrxonoxClass.h"
/**
Modified: branches/pch/src/core/GameState.cc
===================================================================
--- branches/pch/src/core/GameState.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/GameState.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,10 +33,10 @@
*/
#include "GameState.h"
+
#include "util/Debug.h"
#include "util/Exception.h"
#include "util/OrxAssert.h"
-#include "Clock.h"
namespace orxonox
{
Modified: branches/pch/src/core/GameState.h
===================================================================
--- branches/pch/src/core/GameState.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/GameState.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -37,9 +37,8 @@
#include "CorePrereqs.h"
-#include <string>
#include <map>
-#include "CorePrereqs.h"
+#include <string>
namespace orxonox
{
Modified: branches/pch/src/core/IRC.cc
===================================================================
--- branches/pch/src/core/IRC.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/IRC.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,13 +28,13 @@
#include "IRC.h"
-#include <boost/thread/thread.hpp>
+#include <cpptcl/cpptcl.h>
+
+#include "util/Convert.h"
#include "ConsoleCommand.h"
+#include "CoreIncludes.h"
#include "TclThreadManager.h"
-#include "CoreIncludes.h"
-#include "util/Convert.h"
-
namespace orxonox
{
static const unsigned int IRC_TCL_THREADID = 1421421421;
Modified: branches/pch/src/core/IRC.h
===================================================================
--- branches/pch/src/core/IRC.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/IRC.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,8 +30,6 @@
#define _IRC_H__
#include "CorePrereqs.h"
-
-#include <cpptcl/cpptcl.h>
#include "OrxonoxClass.h"
namespace orxonox
Modified: branches/pch/src/core/Identifier.cc
===================================================================
--- branches/pch/src/core/Identifier.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Identifier.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -35,10 +35,10 @@
#include <ostream>
-#include "Factory.h"
+#include "util/String.h"
#include "ConfigValueContainer.h"
#include "ConsoleCommand.h"
-#include "CommandExecutor.h"
+#include "Factory.h"
#include "XMLPort.h"
namespace orxonox
Modified: branches/pch/src/core/Identifier.h
===================================================================
--- branches/pch/src/core/Identifier.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Identifier.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -54,21 +54,17 @@
#include "CorePrereqs.h"
-#include <set>
+#include <cassert>
#include <map>
-#include <vector>
+#include <set>
#include <string>
-#include <utility>
#include <typeinfo>
-#include <cstdlib>
-#include <cassert>
+#include "util/Debug.h"
#include "MetaObjectList.h"
-#include "Iterator.h"
+#include "ObjectList.h"
+#include "ObjectListBase.h"
#include "Super.h"
-#include "Functor.h"
-#include "util/Debug.h"
-#include "util/String.h"
namespace orxonox
{
Modified: branches/pch/src/core/Iterator.h
===================================================================
--- branches/pch/src/core/Iterator.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Iterator.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -46,9 +46,8 @@
#include "CorePrereqs.h"
+#include "Identifier.h"
#include "ObjectListBase.h"
-#include "ObjectListIterator.h"
-#include "OrxonoxClass.h"
namespace orxonox
{
@@ -304,7 +303,4 @@
typedef Iterator<OrxonoxClass> BaseIterator;
}
-// Include ObjectList.h so the user only has to include one file: Iterator.h
-#include "ObjectList.h"
-
#endif /* _Iterator_H__ */
Modified: branches/pch/src/core/Language.cc
===================================================================
--- branches/pch/src/core/Language.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Language.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,8 +36,8 @@
#include <fstream>
#include <boost/filesystem.hpp>
+#include "util/Debug.h"
#include "Core.h"
-#include "util/Debug.h"
namespace orxonox
{
Modified: branches/pch/src/core/Loader.cc
===================================================================
--- branches/pch/src/core/Loader.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Loader.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,17 +31,15 @@
#include <tinyxml/ticpp.h>
#include <boost/filesystem.hpp>
-#include "XMLFile.h"
+#include "util/Debug.h"
+#include "util/Exception.h"
#include "BaseObject.h"
-#include "Identifier.h"
+#include "Core.h"
#include "Iterator.h"
#include "ObjectList.h"
-#include "CoreIncludes.h"
#include "LuaBind.h"
#include "Namespace.h"
-#include "util/Debug.h"
-#include "util/Exception.h"
-#include "Core.h"
+#include "XMLFile.h"
namespace orxonox
{
Modified: branches/pch/src/core/Loader.h
===================================================================
--- branches/pch/src/core/Loader.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Loader.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,7 +32,6 @@
#include "CorePrereqs.h"
#include <vector>
-
#include "ClassTreeMask.h"
namespace orxonox
Modified: branches/pch/src/core/LuaBind.cc
===================================================================
--- branches/pch/src/core/LuaBind.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/LuaBind.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,16 +30,14 @@
#include <fstream>
#include <map>
-
extern "C" {
-#include <lua.h>
#include <lualib.h>
}
#include <tolua/tolua++.h>
#include <boost/filesystem.hpp>
-#include "util/String.h"
#include "util/Debug.h"
+#include "util/String.h"
#include "ToluaBindCore.h"
#include "Core.h"
@@ -71,7 +69,7 @@
isRunning_ = false;
}
- void LuaBind::luaPrint(std::string str)
+ void LuaBind::luaPrint(const std::string& str)
{
output_ += str;
// COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
@@ -83,7 +81,7 @@
@param filename The filename of the file
@param luaTags if true, the loaded file gets stripped off luaTags
*/
- void LuaBind::loadFile(std::string filename, bool luaTags)
+ void LuaBind::loadFile(const std::string& filename, bool luaTags)
{
boost::filesystem::path filepath(filename);
@@ -116,7 +114,7 @@
COUT(5) << "ParsedSourceCode: " << luaSource_ << std::endl;
}
- void LuaBind::loadString(std::string code)
+ void LuaBind::loadString(const std::string& code)
{
luaSource_ = code;
output_ = "";
Modified: branches/pch/src/core/LuaBind.h
===================================================================
--- branches/pch/src/core/LuaBind.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/LuaBind.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -37,14 +37,12 @@
#include "CorePrereqs.h"
+#include <cassert>
+#include <string>
extern "C" {
#include <lua.h>
}
-#include <cassert>
-#include <list>
-#include <string>
-
// tolua_begin
namespace orxonox
{
@@ -63,19 +61,19 @@
inline static LuaBind& getInstance() { assert(singletonRef_s); return *LuaBind::singletonRef_s; } // tolua_export
- void loadFile(std::string filename, bool luaTags);
- void loadString(std::string code);
+ void loadFile(const std::string& filename, bool luaTags);
+ void loadString(const std::string& code);
//void init(lua_State *state_);
//void xmlToLua();
void run();
- void luaPrint(std::string str); // tolua_export
+ void luaPrint(const std::string& str); // tolua_export
#if LUA_VERSION_NUM != 501
static const char * lua_Chunkreader(lua_State *L, void *data, size_t *size);
#endif
inline lua_State* getLuaState() { return luaState_; };
- inline std::string getLuaOutput() { return output_; };
+ inline const std::string& getLuaOutput() { return output_; };
//inline std::string* getFileString() { return &fileString_; };
inline void clearLuaOutput() { output_ = ""; }
Modified: branches/pch/src/core/MetaObjectList.cc
===================================================================
--- branches/pch/src/core/MetaObjectList.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/MetaObjectList.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,9 +32,10 @@
*/
#include "MetaObjectList.h"
+
+#include "util/Debug.h"
+#include "Identifier.h"
#include "ObjectListBase.h"
-#include "Identifier.h"
-#include "util/Debug.h"
namespace orxonox
{
Modified: branches/pch/src/core/Namespace.cc
===================================================================
--- branches/pch/src/core/Namespace.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Namespace.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,6 +27,9 @@
*/
#include "Namespace.h"
+
+#include <set>
+
#include "NamespaceNode.h"
#include "CoreIncludes.h"
#include "XMLPort.h"
Modified: branches/pch/src/core/Namespace.h
===================================================================
--- branches/pch/src/core/Namespace.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Namespace.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,8 +31,8 @@
#include "CorePrereqs.h"
-#include <map>
-
+#include <set>
+#include <string>
#include "XMLIncludes.h"
#include "BaseObject.h"
Modified: branches/pch/src/core/ObjectListBase.cc
===================================================================
--- branches/pch/src/core/ObjectListBase.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ObjectListBase.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -34,13 +34,12 @@
Newly created objects are added through the RegisterObject-macro in its constructor.
*/
-#include <set>
-
-#include "CorePrereqs.h"
-
#include "ObjectListBase.h"
+
+#include <set>
#include "Identifier.h"
#include "Iterator.h"
+#include "ObjectListIterator.h"
namespace orxonox
{
Modified: branches/pch/src/core/ObjectListBase.h
===================================================================
--- branches/pch/src/core/ObjectListBase.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ObjectListBase.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -37,10 +37,11 @@
#ifndef _ObjectListBase_H__
#define _ObjectListBase_H__
+#include "CorePrereqs.h"
+
#include <vector>
+#include "OrxonoxClass.h"
-#include "CorePrereqs.h"
-
namespace orxonox
{
// ###############################
@@ -138,9 +139,9 @@
inline Identifier* getIdentifier() const { return this->identifier_; }
private:
- Identifier* identifier_; //!< The Iterator owning this list
- ObjectListBaseElement* first_; //!< The first element in the list
- ObjectListBaseElement* last_; //!< The last element in the list
+ Identifier* identifier_; //!< The Iterator owning this list
+ ObjectListBaseElement* first_; //!< The first element in the list
+ ObjectListBaseElement* last_; //!< The last element in the list
std::vector<void*> iterators_; //!< A list of Iterators pointing on an element in this list
std::vector<void*> objectListIterators_; //!< A list of ObjectListIterators pointing on an element in this list
};
Modified: branches/pch/src/core/ObjectListIterator.h
===================================================================
--- branches/pch/src/core/ObjectListIterator.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/ObjectListIterator.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,7 +27,7 @@
*/
/**
- @file Iterator.h
+ @file
@brief Definition and implementation of the Iterator class.
The ObjectListIterator of a given class allows to iterate through the
@@ -46,7 +46,8 @@
#define _ObjectListIterator_H__
#include "CorePrereqs.h"
-#include "ObjectListBase.h"
+#include "Identifier.h"
+#include "ObjectList.h"
namespace orxonox
{
@@ -229,7 +230,4 @@
};
}
-// Include ObjectList.h so the user only has to include one file: Iterator.h
-#include "ObjectList.h"
-
#endif /* _ObjectListIterator_H__ */
Modified: branches/pch/src/core/OrxonoxClass.cc
===================================================================
--- branches/pch/src/core/OrxonoxClass.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/OrxonoxClass.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,6 +32,7 @@
*/
#include "OrxonoxClass.h"
+
#include "MetaObjectList.h"
#include "Identifier.h"
Modified: branches/pch/src/core/OrxonoxClass.h
===================================================================
--- branches/pch/src/core/OrxonoxClass.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/OrxonoxClass.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -38,9 +38,7 @@
#define _OrxonoxClass_H__
#include "CorePrereqs.h"
-
#include <set>
-#include <string>
namespace orxonox
{
Modified: branches/pch/src/core/Shell.cc
===================================================================
--- branches/pch/src/core/Shell.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Shell.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,12 +27,13 @@
*/
#include "Shell.h"
+
+#include "util/OutputHandler.h"
#include "CommandExecutor.h"
#include "CoreIncludes.h"
#include "ConfigValueIncludes.h"
#include "Core.h"
#include "ConsoleCommand.h"
-#include "util/OutputHandler.h"
#define SHELL_UPDATE_LISTENERS(function) \
for (std::list<ShellListener*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ) \
Modified: branches/pch/src/core/Shell.h
===================================================================
--- branches/pch/src/core/Shell.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Shell.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,7 +31,9 @@
#include "CorePrereqs.h"
+#include <cassert>
#include <list>
+#include <string>
#include <vector>
#include "OrxonoxClass.h"
Modified: branches/pch/src/core/Super.h
===================================================================
--- branches/pch/src/core/Super.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Super.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -66,8 +66,6 @@
#ifndef _Super_H__
#define _Super_H__
-#include <iostream>
-
#include "CorePrereqs.h"
#include "util/Debug.h"
Modified: branches/pch/src/core/TclBind.cc
===================================================================
--- branches/pch/src/core/TclBind.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/TclBind.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,13 +28,15 @@
#include "TclBind.h"
-#include <iostream>
+#include <exception>
#include <string>
+#include <cpptcl/cpptcl.h>
+
+#include "util/Debug.h"
+#include "util/String.h"
+#include "CommandExecutor.h"
#include "ConsoleCommand.h"
-#include "CommandExecutor.h"
#include "TclThreadManager.h"
-#include "util/Debug.h"
-#include "util/String.h"
namespace orxonox
{
Modified: branches/pch/src/core/TclBind.h
===================================================================
--- branches/pch/src/core/TclBind.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/TclBind.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,7 +31,8 @@
#include "CorePrereqs.h"
-#include <cpptcl/cpptcl.h>
+#include <cassert>
+#include <string>
namespace orxonox
{
Modified: branches/pch/src/core/TclThreadManager.cc
===================================================================
--- branches/pch/src/core/TclThreadManager.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/TclThreadManager.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,21 +28,18 @@
#include "TclThreadManager.h"
-#include <iostream>
-#include <string>
-#include <boost/thread/thread.hpp>
#include <boost/bind.hpp>
#include <OgreTimer.h>
+#include <cpptcl/cpptcl.h>
+#include "util/Convert.h"
+#include "util/Debug.h"
#include "Clock.h"
-#include "CoreIncludes.h"
-#include "ConsoleCommand.h"
#include "CommandExecutor.h"
+#include "ConsoleCommand.h"
+#include "CoreIncludes.h"
#include "TclBind.h"
-#include "util/Debug.h"
-#include "util/Convert.h"
-
namespace orxonox
{
const unsigned int TCLTHREADMANAGER_MAX_QUEUE_LENGTH = 100;
Modified: branches/pch/src/core/TclThreadManager.h
===================================================================
--- branches/pch/src/core/TclThreadManager.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/TclThreadManager.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -31,15 +31,13 @@
#include "CorePrereqs.h"
-#include <queue>
-#include <map>
#include <list>
-
-#include <boost/thread/mutex.hpp>
+#include <map>
+#include <string>
#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
-#include <cpptcl/cpptcl.h>
#include "core/OrxonoxClass.h"
namespace orxonox
Modified: branches/pch/src/core/Template.cc
===================================================================
--- branches/pch/src/core/Template.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Template.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -28,20 +28,22 @@
#include "Template.h"
+#include <tinyxml/tinyxml.h>
#include <tinyxml/ticpp.h>
+#include "util/Debug.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "util/Debug.h"
namespace orxonox
{
CreateFactory(Template);
- Template::Template(BaseObject* creator) : BaseObject(creator), xmlelement_("")
+ Template::Template(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(Template);
+ this->xmlelement_ = new TiXmlElement("");
this->bIsLink_ = false;
this->bLoadDefaults_ = true;
this->bIsReturningXMLElement_ = false;
@@ -51,6 +53,7 @@
Template::~Template()
{
Template::getTemplateMap().erase(this->getName());
+ delete this->xmlelement_;
}
void Template::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -89,6 +92,11 @@
}
}
+ void Template::setXMLElement(const TiXmlElement& xmlelement)
+ {
+ *this->xmlelement_ = xmlelement;
+ }
+
const TiXmlElement& Template::getXMLElement() const
{
if (this->bIsLink_)
@@ -114,7 +122,7 @@
}
}
- return this->xmlelement_;
+ return *this->xmlelement_;
}
void Template::setBaseclass(const std::string& baseclass)
Modified: branches/pch/src/core/Template.h
===================================================================
--- branches/pch/src/core/Template.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/Template.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -29,11 +29,10 @@
#ifndef _Template_H__
#define _Template_H__
-#include <map>
-
#include "CorePrereqs.h"
-#include <tinyxml/tinyxml.h>
+#include <map>
+#include <string>
#include "BaseObject.h"
namespace orxonox
@@ -57,8 +56,7 @@
inline bool getLoadDefaults() const
{ return this->bLoadDefaults_; }
- inline void setXMLElement(const TiXmlElement& xmlelement)
- { this->xmlelement_ = xmlelement; }
+ void setXMLElement(const TiXmlElement& xmlelement);
const TiXmlElement& getXMLElement() const;
void setBaseclass(const std::string& baseclass);
@@ -74,7 +72,7 @@
static void apply(const std::string& name, BaseObject* object);
private:
- TiXmlElement xmlelement_;
+ TiXmlElement* xmlelement_;
std::string link_;
std::string baseclass_;
Identifier* baseclassIdentifier_;
Modified: branches/pch/src/core/XMLFile.h
===================================================================
--- branches/pch/src/core/XMLFile.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/XMLFile.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -32,7 +32,6 @@
#include "CorePrereqs.h"
#include <string>
-
#include "ClassTreeMask.h"
namespace orxonox
Modified: branches/pch/src/core/XMLPort.cc
===================================================================
--- branches/pch/src/core/XMLPort.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/XMLPort.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -27,10 +27,9 @@
*/
#include "XMLPort.h"
-#include "Language.h"
+
#include "Loader.h"
#include "Namespace.h"
-#include "CoreIncludes.h"
namespace orxonox
{
@@ -39,6 +38,6 @@
// ################################
bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
{
- return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
+ return ((!this->bApplyLoaderMask_) || identifier->isA(ClassIdentifier<Namespace>::getIdentifier()) || Loader::currentMask_s.isIncluded(identifier));
}
}
Modified: branches/pch/src/core/XMLPort.h
===================================================================
--- branches/pch/src/core/XMLPort.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/XMLPort.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -43,15 +43,17 @@
#include "CorePrereqs.h"
#include <cassert>
+#include <string>
#include <tinyxml/ticpp.h>
+
#include "util/Debug.h"
#include "util/Exception.h"
+#include "util/MultiType.h"
#include "util/OrxAssert.h"
-#include "util/MultiType.h"
-#include "XMLIncludes.h"
+#include "Identifier.h"
#include "Executor.h"
-#include "CoreIncludes.h"
#include "BaseObject.h"
+#include "XMLIncludes.h"
// ------------
// XMLPortParam
@@ -176,7 +178,7 @@
@brief This is the generic XMLPort param macro, which is used by all six specialized macros above.
*/
#define XMLPortParamGeneric(containername, classname, objectclass, object, paramname, loadexecutor, saveexecutor, xmlelement, mode) \
- orxonox::XMLPortClassParamContainer<objectclass>* containername = (orxonox::XMLPortClassParamContainer<objectclass>*)(ClassIdentifier<classname>::getIdentifier()->getXMLPortParamContainer(paramname)); \
+ orxonox::XMLPortClassParamContainer<objectclass>* containername = static_cast<orxonox::XMLPortClassParamContainer<objectclass>*>(ClassIdentifier<classname>::getIdentifier()->getXMLPortParamContainer(paramname)); \
if (!containername) \
{ \
containername = new orxonox::XMLPortClassParamContainer<objectclass>(std::string(paramname), ClassIdentifier<classname>::getIdentifier(), loadexecutor, saveexecutor); \
@@ -545,10 +547,10 @@
{
for (ticpp::Iterator<ticpp::Element> child = xmlsubelement->FirstChildElement(false); child != child.end(); child++)
{
- Identifier* identifier = ClassByString(child->Value());
+ Identifier* identifier = Factory::getIdentifier(child->Value());
if (identifier)
{
- if (identifier->isA(Class(O)))
+ if (identifier->isA(ClassIdentifier<O>::getIdentifier()))
{
if (identifier->isLoadable())
{
@@ -606,7 +608,7 @@
}
else
{
- COUT(2) << object->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << Class(O)->getName() << "'." << std::endl;
+ COUT(2) << object->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << ClassIdentifier<O>::getIdentifier()->getName() << "'." << std::endl;
}
}
else
@@ -626,7 +628,7 @@
catch (ticpp::Exception& ex)
{
COUT(1) << std::endl;
- COUT(1) << "An error occurred in XMLPort.h while loading a '" << Class(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << object->getName() << ") in " << object->getFilename() << ":" << std::endl;
+ COUT(1) << "An error occurred in XMLPort.h while loading a '" << ClassIdentifier<O>::getIdentifier()->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << object->getName() << ") in " << object->getFilename() << ":" << std::endl;
COUT(1) << ex.what() << std::endl;
}
}
Modified: branches/pch/src/core/input/InputManager.cc
===================================================================
--- branches/pch/src/core/input/InputManager.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/core/input/InputManager.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -40,6 +40,7 @@
#include <ois/OISException.h>
#include <ois/OISInputManager.h>
+#include "util/Convert.h"
#include "util/Exception.h"
#include "util/Debug.h"
#include "core/Clock.h"
@@ -47,6 +48,7 @@
#include "core/ConfigValueIncludes.h"
#include "core/ConsoleCommand.h"
#include "core/CommandLine.h"
+#include "core/ObjectList.h"
#include "InputBuffer.h"
#include "KeyDetector.h"
Modified: branches/pch/src/network/GamestateClient.cc
===================================================================
--- branches/pch/src/network/GamestateClient.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/network/GamestateClient.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,7 +33,7 @@
#include "core/CoreIncludes.h"
#include "core/BaseObject.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "synchronisable/Synchronisable.h"
#include "synchronisable/NetworkCallbackManager.h"
#include "packet/Acknowledgement.h"
Modified: branches/pch/src/network/NetworkFunction.h
===================================================================
--- branches/pch/src/network/NetworkFunction.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/network/NetworkFunction.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,6 +36,7 @@
#include <map>
#include <cassert>
#include "util/MultiType.h"
+#include "core/Functor.h"
#include "synchronisable/Synchronisable.h"
#include "OrxonoxConfig.h"
#include "FunctionCallManager.h"
Modified: branches/pch/src/network/Server.cc
===================================================================
--- branches/pch/src/network/Server.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/network/Server.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -53,7 +53,7 @@
#include "core/Clock.h"
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "packet/Chat.h"
#include "packet/Packet.h"
#include "packet/Welcome.h"
Modified: branches/pch/src/network/packet/Gamestate.cc
===================================================================
--- branches/pch/src/network/packet/Gamestate.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/network/packet/Gamestate.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -35,7 +35,7 @@
#include "../TrafficControl.h"
#include "core/GameMode.h"
#include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
Modified: branches/pch/src/orxonox/CameraManager.cc
===================================================================
--- branches/pch/src/orxonox/CameraManager.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/CameraManager.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,7 +33,7 @@
#include "util/String.h"
#include "core/GameMode.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "tools/Shader.h"
#include "objects/worldentities/Camera.h"
#include "objects/Scene.h"
Modified: branches/pch/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/gamestates/GSLevel.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -147,14 +147,14 @@
{
if (show)
{
- GUIManager::getInstancePtr()->showGUI("inGameTest");
- GUIManager::getInstancePtr()->executeCode("showCursor()");
+ GUIManager::getInstance().showGUI("inGameTest");
+ GUIManager::getInstance().executeCode("showCursor()");
InputManager::getInstance().requestEnterState("guiMouseOnly");
}
else
{
- GUIManager::getInstancePtr()->executeCode("hideGUI(\"inGameTest\")");
- GUIManager::getInstancePtr()->executeCode("hideCursor()");
+ GUIManager::getInstance().executeCode("hideGUI(\"inGameTest\")");
+ GUIManager::getInstance().executeCode("hideCursor()");
InputManager::getInstance().requestLeaveState("guiMouseOnly");
}
}
Modified: branches/pch/src/orxonox/objects/Radar.cc
===================================================================
--- branches/pch/src/orxonox/objects/Radar.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/objects/Radar.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,7 +36,7 @@
#include <cassert>
#include "core/CoreIncludes.h"
#include "core/ConsoleCommand.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "RadarListener.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Radar.h
===================================================================
--- branches/pch/src/orxonox/objects/Radar.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/objects/Radar.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -38,7 +38,7 @@
#include <map>
#include <string>
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "core/OrxonoxClass.h"
#include "objects/Tickable.h"
#include "RadarViewable.h"
Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/Projectile.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -33,7 +33,7 @@
#include "core/CoreIncludes.h"
#include "core/Executor.h"
#include "core/ConfigValueIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "tools/ParticleInterface.h"
#include "objects/worldentities/Model.h"
Modified: branches/pch/src/orxonox/objects/worldentities/Camera.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Camera.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/objects/worldentities/Camera.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,6 +36,7 @@
#include <OgreSceneNode.h>
#include "util/Exception.h"
+#include "util/String.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "objects/Scene.h"
Modified: branches/pch/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/overlays/OverlayGroup.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -36,7 +36,7 @@
#include "util/Debug.h"
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "core/XMLPort.h"
#include "OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/overlays/map/Map.cc
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/overlays/map/Map.cc 2009-06-13 14:30:37 UTC (rev 3154)
@@ -30,6 +30,7 @@
#include <OgreBorderPanelOverlayElement.h>
#include <OgreCamera.h>
+#include <OgreEntity.h>
#include <OgreHardwarePixelBuffer.h>
#include <OgreMaterialManager.h>
#include <OgreMovablePlane.h>
@@ -49,7 +50,7 @@
#include "core/ConsoleCommand.h"
#include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
#include "objects/RadarViewable.h"
@@ -264,7 +265,7 @@
}*/
}
- Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, std::string matName)
+ Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, const std::string& matName)
{
Ogre::TexturePtr rttTex = Ogre::TextureManager::getSingleton().createManual(matName+"_tex", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 512, 512, 0, Ogre::PF_R8G8B8, Ogre::TU_RENDERTARGET);
Modified: branches/pch/src/orxonox/overlays/map/Map.h
===================================================================
--- branches/pch/src/orxonox/overlays/map/Map.h 2009-06-13 14:12:45 UTC (rev 3153)
+++ branches/pch/src/orxonox/overlays/map/Map.h 2009-06-13 14:30:37 UTC (rev 3154)
@@ -29,7 +29,6 @@
#include "OrxonoxPrereqs.h"
-#include <string>
#include <OgreMaterial.h>
#include "util/UtilPrereqs.h"
@@ -49,7 +48,7 @@
virtual void tick(float dt);
virtual void changedOwner();
- static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, std::string matName);
+ static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, const std::string& matName);
static void openMap();
More information about the Orxonox-commit
mailing list