Changeset 2027

Timestamp:

Oct 28, 2008, 5:41:28 PM (16 years ago)

Author:

landauf

Message:

no codechanges, just moved some files

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (3 diffs)
• objects/CameraHandler.cc (modified) (1 diff)
• objects/worldentities/Backlight.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Backlight.cc) (1 prop)
• objects/worldentities/Backlight.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Backlight.h) (1 prop)
• objects/worldentities/Camera.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Camera.cc) (1 prop)
• objects/worldentities/Camera.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Camera.h) (1 prop)
• objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• objects/worldentities/ParticleSpawner.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/ParticleSpawner.cc) (1 prop)
• objects/worldentities/ParticleSpawner.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/ParticleSpawner.h) (1 prop)
• objects/worldentities/triggers (added)
• objects/worldentities/triggers/DistanceTrigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.cc) (1 prop)
• objects/worldentities/triggers/DistanceTrigger.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/DistanceTrigger.h) (1 prop)
• objects/worldentities/triggers/Trigger.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Trigger.cc) (1 prop)
• objects/worldentities/triggers/Trigger.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/Trigger.h) (1 diff, 1 prop)

code/branches/objecthierarchy/src/orxonox/CMakeLists.txt

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
   GraphicsEngine.cc
+  LevelManager.cc
   Main.cc
   Settings.cc
@@ -43 +44 @@
   tools/WindowEventListener.cc
 
-  LevelManager.cc
+  objects/CameraHandler.cc
+  objects/Radar.cc
+  objects/RadarListener.cc
+  objects/RadarViewable.cc
+  objects/Tickable.cc
+  objects/Test.cc
+  objects/Script.cc
 
   objects/Scene.cc
@@ -50 +57 @@
   objects/worldentities/MovableEntity.cc
   objects/worldentities/ControllableEntity.cc
+  objects/worldentities/Model.cc
+  objects/worldentities/Camera.cc
+  objects/worldentities/SpawnPoint.cc
+#  objects/worldentities/Backlight.cc
+#  objects/worldentities/ParticleSpawner.cc
 
-  objects/worldentities/Model.cc
-
-#  objects/Backlight.cc
-  objects/Camera.cc
-  objects/CameraHandler.cc
-#  objects/ParticleSpawner.cc
-  objects/Radar.cc
-  objects/RadarListener.cc
-  objects/RadarViewable.cc
-  objects/Tickable.cc
-  objects/Test.cc
-  objects/Script.cc
-  objects/Trigger.cc
-  objects/DistanceTrigger.cc
-
-  objects/worldentities/SpawnPoint.cc
+  objects/worldentities/triggers/Trigger.cc
+  objects/worldentities/triggers/DistanceTrigger.cc
 
   objects/worldentities/pawns/Spectator.cc

code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc

@@ -32 +32 @@
 
 #include "core/Core.h"
-#include "Camera.h"
+#include "objects/worldentities/Camera.h"
 
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -36 +36 @@
 
 #include "objects/infos/PlayerInfo.h"
-#include "objects/Camera.h"
+#include "objects/worldentities/Camera.h"
 #include "overlays/OverlayGroup.h"
 

code/branches/objecthierarchy/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -35 +35 @@
 #include "OrxonoxPrereqs.h"
 
-#include "worldentities/PositionableEntity.h"
+#include "objects/worldentities/PositionableEntity.h"
 #include "tools/BillboardSet.h"