Changeset 2030 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 28, 2008, 8:44:52 PM (16 years ago)

Author:

rgrieder

Message:

• Moved SignalHandler from orxonox to util
• Moved CameraHandler from orxonox/objects to orxonox
• updated msvc files

Location:

code/branches/objecthierarchy/src/orxonox

Files:

• CMakeLists.txt (modified) (2 diffs)
• CameraHandler.cc (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.cc) (1 prop)
• CameraHandler.h (moved) (moved from code/branches/objecthierarchy/src/orxonox/objects/CameraHandler.h) (1 prop)
• Main.cc (modified) (1 diff)
• gamestates/GSLevel.cc (modified) (1 diff)
• objects/worldentities/Camera.cc (modified) (1 diff)

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

@@ -1 +1 @@
 SET( ORXONOX_SRC_FILES
+  CameraHandler.cc
   GraphicsEngine.cc
   LevelManager.cc
   Main.cc
   Settings.cc
-  SignalHandler.cc
 
   gamestates/GSClient.cc
@@ -44 +44 @@
   tools/WindowEventListener.cc
 
-  objects/CameraHandler.cc
   objects/Radar.cc
   objects/RadarListener.cc

code/branches/objecthierarchy/src/orxonox/Main.cc

@@ -40 +40 @@
 #include "util/OrxonoxPlatform.h"
 #include "util/Debug.h"
+#include "util/SignalHandler.h"
 #include "core/ConfigFileManager.h"
-#include "SignalHandler.h"
 
 #include "gamestates/GSRoot.h"

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -41 +41 @@
 #include "core/Core.h"
 //#include "objects/Backlight.h"
-#include "objects/CameraHandler.h"
 #include "objects/Tickable.h"
 #include "objects/Radar.h"
 //#include "tools/ParticleInterface.h"
+#include "CameraHandler.h"
 #include "LevelManager.h"
 #include "Settings.h"

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

@@ -41 +41 @@
 #include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
-#include "objects/CameraHandler.h"
+#include "CameraHandler.h"
 
 namespace orxonox