Changeset 733 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 30, 2007, 10:17:38 PM (17 years ago)

Author:

rgrieder

Message:

• moved BaseObject to core

Location:

code/branches/FICN/src/orxonox/objects

Files:

• Ambient.h (modified) (1 diff)
• BaseObject.cc (deleted)
• BaseObject.h (deleted)
• CMakeLists.txt (modified) (1 diff)
• Camera.h (modified) (1 diff)
• Skybox.h (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)
• weapon_system/AmmunitionDump.h (modified) (1 diff)
• weapon_system/BulletManager.h (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/Ambient.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/CMakeLists.txt

@@ -3 +3 @@
 SET( OBJECTS_SRC_FILES
   Ambient.cc
-  BaseObject.cc
   BillboardSet.cc
   Camera.cc

code/branches/FICN/src/orxonox/objects/Camera.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/objects/Skybox.h

@@ -4 +4 @@
 #include "../OrxonoxPrereqs.h"
 
-#include "BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 
 class TiXmlElement; // Forward declaration

code/branches/FICN/src/orxonox/objects/WorldEntity.h

@@ -11 +11 @@
 #include "tinyxml/tinyxml.h"
 #include "../core/CoreIncludes.h"
-#include "BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 #include "Tickable.h"
 #include "Mesh.h"

code/branches/FICN/src/orxonox/objects/weapon_system/AmmunitionDump.h

@@ -38 +38 @@
 #include "network/Synchronisable.h"
 //#include "../core/CoreIncludes.h"
-#include "../BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 
 

code/branches/FICN/src/orxonox/objects/weapon_system/BulletManager.h

@@ -39 +39 @@
 #include "tinyxml/tinyxml.h"
 #include "../../core/CoreIncludes.h"
-#include "../BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 #include "../Tickable.h"