[Orxonox-commit 642] r3174 - branches/pch/src/orxonox/objects
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Jun 15 09:59:28 CEST 2009
Author: rgrieder
Date: 2009-06-15 09:59:28 +0200 (Mon, 15 Jun 2009)
New Revision: 3174
Modified:
branches/pch/src/orxonox/objects/EventDispatcher.cc
branches/pch/src/orxonox/objects/EventDispatcher.h
branches/pch/src/orxonox/objects/EventListener.cc
branches/pch/src/orxonox/objects/EventListener.h
branches/pch/src/orxonox/objects/EventTarget.cc
branches/pch/src/orxonox/objects/EventTarget.h
branches/pch/src/orxonox/objects/GametypeMessageListener.cc
branches/pch/src/orxonox/objects/GametypeMessageListener.h
branches/pch/src/orxonox/objects/GlobalShader.cc
branches/pch/src/orxonox/objects/Level.cc
branches/pch/src/orxonox/objects/Level.h
branches/pch/src/orxonox/objects/Radar.cc
branches/pch/src/orxonox/objects/Radar.h
branches/pch/src/orxonox/objects/RadarViewable.cc
branches/pch/src/orxonox/objects/RadarViewable.h
branches/pch/src/orxonox/objects/Scene.cc
branches/pch/src/orxonox/objects/Scene.h
branches/pch/src/orxonox/objects/Script.cc
branches/pch/src/orxonox/objects/Script.h
branches/pch/src/orxonox/objects/Teamcolourable.h
branches/pch/src/orxonox/objects/Tickable.cc
Log:
Cleanup in orxonox/objects (non recursive).
Modified: branches/pch/src/orxonox/objects/EventDispatcher.cc
===================================================================
--- branches/pch/src/orxonox/objects/EventDispatcher.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventDispatcher.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -31,7 +31,6 @@
#include "core/CoreIncludes.h"
#include "core/EventIncludes.h"
#include "core/XMLPort.h"
-#include "core/EventIncludes.h"
#include "EventTarget.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/EventDispatcher.h
===================================================================
--- branches/pch/src/orxonox/objects/EventDispatcher.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventDispatcher.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -30,6 +30,8 @@
#define _EventDispatcher_H__
#include "OrxonoxPrereqs.h"
+
+#include <list>
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/EventListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/EventListener.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventListener.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -29,7 +29,7 @@
#include "EventListener.h"
#include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
+#include "core/ObjectList.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/EventListener.h
===================================================================
--- branches/pch/src/orxonox/objects/EventListener.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventListener.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -30,6 +30,8 @@
#define _EventListener_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
#include "core/BaseObject.h"
#include "core/XMLNameListener.h"
Modified: branches/pch/src/orxonox/objects/EventTarget.cc
===================================================================
--- branches/pch/src/orxonox/objects/EventTarget.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventTarget.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -29,7 +29,7 @@
#include "EventTarget.h"
#include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
+#include "core/ObjectList.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/EventTarget.h
===================================================================
--- branches/pch/src/orxonox/objects/EventTarget.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/EventTarget.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -30,6 +30,7 @@
#define _EventTarget_H__
#include "OrxonoxPrereqs.h"
+
#include "core/BaseObject.h"
#include "core/XMLNameListener.h"
Modified: branches/pch/src/orxonox/objects/GametypeMessageListener.cc
===================================================================
--- branches/pch/src/orxonox/objects/GametypeMessageListener.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/GametypeMessageListener.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -27,7 +27,6 @@
*/
#include "GametypeMessageListener.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/GametypeMessageListener.h
===================================================================
--- branches/pch/src/orxonox/objects/GametypeMessageListener.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/GametypeMessageListener.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -30,7 +30,6 @@
#define _GametypeMessageListener_H__
#include "OrxonoxPrereqs.h"
-
#include "core/OrxonoxClass.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/GlobalShader.cc
===================================================================
--- branches/pch/src/orxonox/objects/GlobalShader.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/GlobalShader.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -28,10 +28,10 @@
#include "GlobalShader.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
-#include "util/Exception.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/Level.cc
===================================================================
--- branches/pch/src/orxonox/objects/Level.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Level.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -28,21 +28,20 @@
#include "Level.h"
+#include "util/Math.h"
+#include "core/Core.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "core/Loader.h"
-#include "core/XMLFile.h"
#include "core/Template.h"
-#include "core/Core.h"
+#include "core/XMLFile.h"
+#include "core/XMLPort.h"
-#include "LevelManager.h"
#include "objects/infos/PlayerInfo.h"
#include "objects/gametypes/Gametype.h"
#include "overlays/OverlayGroup.h"
#include "sound/SoundBase.h"
+#include "LevelManager.h"
-#include "util/Math.h"
-
namespace orxonox
{
CreateFactory(Level);
Modified: branches/pch/src/orxonox/objects/Level.h
===================================================================
--- branches/pch/src/orxonox/objects/Level.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Level.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -31,8 +31,10 @@
#include "OrxonoxPrereqs.h"
+#include <list>
+#include <string>
+#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "core/BaseObject.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/Radar.cc
===================================================================
--- branches/pch/src/orxonox/objects/Radar.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Radar.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -27,14 +27,15 @@
*/
/**
- @file
- @brief
+ at file
+ at brief
*/
#include "Radar.h"
-#include <cfloat>
+
#include <cassert>
-#include "core/CoreIncludes.h"
+
+//#include "util/Math.h"
#include "core/ConsoleCommand.h"
#include "core/ObjectList.h"
#include "RadarListener.h"
Modified: branches/pch/src/orxonox/objects/Radar.h
===================================================================
--- branches/pch/src/orxonox/objects/Radar.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Radar.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -27,8 +27,8 @@
*/
/**
- @file
- @brief
+ at file
+ at brief
*/
#ifndef _Radar_H__
@@ -38,8 +38,8 @@
#include <map>
#include <string>
-#include "core/ObjectList.h"
-#include "core/OrxonoxClass.h"
+
+#include "core/ObjectListIterator.h"
#include "objects/Tickable.h"
#include "RadarViewable.h"
Modified: branches/pch/src/orxonox/objects/RadarViewable.cc
===================================================================
--- branches/pch/src/orxonox/objects/RadarViewable.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/RadarViewable.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -31,12 +31,11 @@
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
#include <OgreEntity.h>
-#include <OgreManualObject.h>
#include "util/Debug.h"
#include "util/String.h"
#include "core/CoreIncludes.h"
-#include "orxonox/tools/DynamicLines.h"
+#include "tools/DynamicLines.h"
#include "objects/worldentities/WorldEntity.h"
#include "objects/Radar.h"
#include "overlays/map/Map.h"
Modified: branches/pch/src/orxonox/objects/RadarViewable.h
===================================================================
--- branches/pch/src/orxonox/objects/RadarViewable.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/RadarViewable.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -33,6 +33,7 @@
#include <string>
#include <cassert>
+#include <OgrePrerequisites.h>
#include "util/Math.h"
#include "util/Debug.h"
Modified: branches/pch/src/orxonox/objects/Scene.cc
===================================================================
--- branches/pch/src/orxonox/objects/Scene.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Scene.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -30,6 +30,7 @@
#include "Scene.h"
#include <OgreRoot.h>
+#include <OgreSceneManager.h>
#include <OgreSceneManagerEnumerator.h>
#include <OgreSceneNode.h>
@@ -57,16 +58,9 @@
if (GameMode::showsGraphics())
{
- if (Ogre::Root::getSingletonPtr())
- {
- this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
- this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
- }
- else
- {
- this->sceneManager_ = 0;
- this->rootSceneNode_ = 0;
- }
+ assert(Ogre::Root::getSingletonPtr())
+ this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
+ this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
}
else
{
@@ -93,14 +87,10 @@
{
if (this->isInitialized())
{
- if (Ogre::Root::getSingletonPtr())
- {
+ if (GameMode::showsGraphics())
Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
- }
- else if (!GameMode::showsGraphics())
- {
+ else
delete this->sceneManager_;
- }
this->setPhysicalWorld(false);
}
Modified: branches/pch/src/orxonox/objects/Scene.h
===================================================================
--- branches/pch/src/orxonox/objects/Scene.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Scene.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -32,9 +32,14 @@
#include "OrxonoxPrereqs.h"
+#include <list>
+#include <set>
+#include <string>
+#include <OgrePrerequisites.h>
+
+#include "util/Math.h"
+#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
-#include "core/BaseObject.h"
-#include "util/Math.h"
#include "objects/Tickable.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Script.cc
===================================================================
--- branches/pch/src/orxonox/objects/Script.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Script.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -28,9 +28,9 @@
#include "Script.h"
+#include <tinyxml/ticpp.h>
#include "util/Debug.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "core/LuaBind.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Script.h
===================================================================
--- branches/pch/src/orxonox/objects/Script.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Script.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Teamcolourable.h
===================================================================
--- branches/pch/src/orxonox/objects/Teamcolourable.h 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Teamcolourable.h 2009-06-15 07:59:28 UTC (rev 3174)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include "util/Math.h"
+#include "util/UtilPrereqs.h"
#include "core/OrxonoxClass.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Tickable.cc
===================================================================
--- branches/pch/src/orxonox/objects/Tickable.cc 2009-06-15 07:01:15 UTC (rev 3173)
+++ branches/pch/src/orxonox/objects/Tickable.cc 2009-06-15 07:59:28 UTC (rev 3174)
@@ -28,7 +28,6 @@
#include "Tickable.h"
#include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list