Changeset 3174

Timestamp:

Jun 15, 2009, 9:59:28 AM (15 years ago)

Author:

rgrieder

Message:

Cleanup in orxonox/objects (non recursive).

Location:

code/branches/pch/src/orxonox/objects

Files:

• EventDispatcher.cc (modified) (1 diff)
• EventDispatcher.h (modified) (1 diff)
• EventListener.cc (modified) (1 diff)
• EventListener.h (modified) (1 diff)
• EventTarget.cc (modified) (1 diff)
• EventTarget.h (modified) (1 diff)
• GametypeMessageListener.cc (modified) (1 diff)
• GametypeMessageListener.h (modified) (1 diff)
• GlobalShader.cc (modified) (1 diff)
• Level.cc (modified) (1 diff)
• Level.h (modified) (1 diff)
• Radar.cc (modified) (1 diff)
• Radar.h (modified) (2 diffs)
• RadarViewable.cc (modified) (1 diff)
• RadarViewable.h (modified) (1 diff)
• Scene.cc (modified) (3 diffs)
• Scene.h (modified) (1 diff)
• Script.cc (modified) (1 diff)
• Script.h (modified) (1 diff)
• Teamcolourable.h (modified) (1 diff)
• Tickable.cc (modified) (1 diff)

code/branches/pch/src/orxonox/objects/EventDispatcher.cc

@@ -32 +32 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
-#include "core/EventIncludes.h"
 #include "EventTarget.h"
 

code/branches/pch/src/orxonox/objects/EventDispatcher.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <list>
 #include "core/BaseObject.h"
 

code/branches/pch/src/orxonox/objects/EventListener.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
+#include "core/ObjectList.h"
 #include "core/XMLPort.h"
 

code/branches/pch/src/orxonox/objects/EventListener.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
 #include "core/BaseObject.h"
 #include "core/XMLNameListener.h"

code/branches/pch/src/orxonox/objects/EventTarget.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
+#include "core/ObjectList.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/EventTarget.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
 #include "core/BaseObject.h"
 #include "core/XMLNameListener.h"

code/branches/pch/src/orxonox/objects/GametypeMessageListener.cc

@@ -28 +28 @@
 
 #include "GametypeMessageListener.h"
-
 #include "core/CoreIncludes.h"
 

code/branches/pch/src/orxonox/objects/GametypeMessageListener.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "core/OrxonoxClass.h"
 

code/branches/pch/src/orxonox/objects/GlobalShader.cc

@@ -29 +29 @@
 #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

code/branches/pch/src/orxonox/objects/Level.cc

@@ -29 +29 @@
 #include "Level.h"
 
+#include "util/Math.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
+#include "core/Loader.h"
+#include "core/Template.h"
+#include "core/XMLFile.h"
 #include "core/XMLPort.h"
-#include "core/Loader.h"
-#include "core/XMLFile.h"
-#include "core/Template.h"
-#include "core/Core.h"
 
-#include "LevelManager.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
 #include "overlays/OverlayGroup.h"
 #include "sound/SoundBase.h"
-
-#include "util/Math.h"
+#include "LevelManager.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/Level.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <list>
+#include <string>
+#include "core/BaseObject.h"
 #include "network/synchronisable/Synchronisable.h"
-#include "core/BaseObject.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/objects/Radar.cc

@@ -28 +28 @@
 
 /**
-    @file
-    @brief
+@file
+@brief
 */
 
 #include "Radar.h"
-#include <cfloat>
+
 #include <cassert>
-#include "core/CoreIncludes.h"
+
+//#include "util/Math.h"
 #include "core/ConsoleCommand.h"
 #include "core/ObjectList.h"

code/branches/pch/src/orxonox/objects/Radar.h

@@ -28 +28 @@
 
 /**
-    @file
-    @brief
+@file
+@brief
 */
 
@@ -39 +39 @@
 #include <map>
 #include <string>
-#include "core/ObjectList.h"
-#include "core/OrxonoxClass.h"
+
+#include "core/ObjectListIterator.h"
 #include "objects/Tickable.h"
 #include "RadarViewable.h"

code/branches/pch/src/orxonox/objects/RadarViewable.cc

@@ -32 +32 @@
 #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"

code/branches/pch/src/orxonox/objects/RadarViewable.h

@@ -34 +34 @@
 #include <string>
 #include <cassert>
+#include <OgrePrerequisites.h>
 
 #include "util/Math.h"

code/branches/pch/src/orxonox/objects/Scene.cc

@@ -31 +31 @@
 
 #include <OgreRoot.h>
+#include <OgreSceneManager.h>
 #include <OgreSceneManagerEnumerator.h>
 #include <OgreSceneNode.h>
@@ -58 +59 @@
         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
@@ -94 +88 @@
         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);

code/branches/pch/src/orxonox/objects/Scene.h

@@ -33 +33 @@
 #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"
 

code/branches/pch/src/orxonox/objects/Script.cc

@@ -29 +29 @@
 #include "Script.h"
 
+#include <tinyxml/ticpp.h>
 #include "util/Debug.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 #include "core/LuaBind.h"
 

code/branches/pch/src/orxonox/objects/Script.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "core/BaseObject.h"
 

code/branches/pch/src/orxonox/objects/Teamcolourable.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "util/Math.h"
+#include "util/UtilPrereqs.h"
 #include "core/OrxonoxClass.h"
 

code/branches/pch/src/orxonox/objects/Tickable.cc

@@ -29 +29 @@
 #include "Tickable.h"
 #include "core/CoreIncludes.h"
-#include "core/ConsoleCommand.h"
 
 namespace orxonox