Changeset 8632

Timestamp:

May 27, 2011, 11:35:05 PM (14 years ago)

Author:

dafrick

Message:

Moving space bounaries into modules/objects

Location:

code/branches/presentation/src

Files:

• modules/objects/CMakeLists.txt (modified) (1 diff)
• modules/objects/ObjectsPrereqs.h (modified) (1 diff)
• modules/objects/SpaceBoundaries.cc (moved) (moved from code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.cc) (1 diff)
• modules/objects/SpaceBoundaries.h (moved) (moved from code/branches/presentation/src/orxonox/worldentities/SpaceBoundaries.h) (2 diffs)
• orxonox/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/presentation/src/modules/objects/CMakeLists.txt

@@ -4 +4 @@
   Planet.cc
   Script.cc
+  SpaceBoundaries.cc
 )
 

code/branches/presentation/src/modules/objects/ObjectsPrereqs.h

@@ -72 +72 @@
     class Planet;
     class Script;
+    class SpaceBoundaries;
 
     // collisionshapes

code/branches/presentation/src/modules/objects/SpaceBoundaries.cc

@@ -29 +29 @@
 #include "SpaceBoundaries.h"
 
-#include "worldentities/MobileEntity.h"
-#include "worldentities/ControllableEntity.h"
+#include <OgreBillboardSet.h>
+
+#include "core/CoreIncludes.h"
 #include "core/ObjectListIterator.h"
 #include "core/XMLPort.h"
+
+#include "graphics/Billboard.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/WorldEntity.h"
 #include "worldentities/pawns/Pawn.h"
-#include "infos/PlayerInfo.h"
-#include "interfaces/RadarViewable.h"
-#include "graphics/Billboard.h"
-#include <OgreBillboardSet.h>
-
 
 namespace orxonox

code/branches/presentation/src/modules/objects/SpaceBoundaries.h

@@ -30 +30 @@
 #define _SpaceBoundaries_H__
 
-
-#include "core/CoreIncludes.h"
-#include "core/WeakPtr.h"
-#include "tools/interfaces/Tickable.h"
-#include "interfaces/RadarViewable.h"
-#include "worldentities/StaticEntity.h"
-#include "worldentities/WorldEntity.h"
+#include "objects/ObjectsPrereqs.h"
 
 #include <string>
 #include <list>
 #include <vector>
+
+#include "core/CoreIncludes.h"
+#include "core/WeakPtr.h"
+
+#include "tools/interfaces/Tickable.h"
+#include "worldentities/StaticEntity.h"
 
 namespace orxonox
@@ -74 +74 @@
 */
 
-    class _OrxonoxExport SpaceBoundaries : public StaticEntity, public Tickable
+    class _ObjectsExport SpaceBoundaries : public StaticEntity, public Tickable
     {
         public:

code/branches/presentation/src/orxonox/worldentities/CMakeLists.txt

@@ -12 +12 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  SpaceBoundaries.cc
 )