Changeset 733 for code/branches/FICN/src

Timestamp:

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

Author:

rgrieder

Message:

• moved BaseObject to core

Location:

code/branches/FICN/src

Files:

• loader/LevelLoader.cc (modified) (1 diff)
• network/GameStateClient.h (modified) (1 diff)
• orxonox/CMakeLists.txt (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/core/BaseObject.cc (added)
• orxonox/core/BaseObject.h (added)
• orxonox/core/CMakeLists.txt (modified) (1 diff)
• orxonox/core/Factory.cc (modified) (1 diff)
• orxonox/objects/Ambient.h (modified) (1 diff)
• orxonox/objects/BaseObject.cc (deleted)
• orxonox/objects/BaseObject.h (deleted)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/Camera.h (modified) (1 diff)
• orxonox/objects/Skybox.h (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (1 diff)
• orxonox/objects/weapon_system/AmmunitionDump.h (modified) (1 diff)
• orxonox/objects/weapon_system/BulletManager.h (modified) (1 diff)
• tinyxml/TinyXMLPrereqs.h (added)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -34 +34 @@
 
 #include "audio/AudioManager.h"
-#include "orxonox/objects/BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 #include "orxonox/Orxonox.h"
 

code/branches/FICN/src/network/GameStateClient.h

@@ -16 +16 @@
 #include "Synchronisable.h"
 #include "orxonox/core/CoreIncludes.h"
-#include "orxonox/objects/BaseObject.h"
+#include "orxonox/core/BaseObject.h"
 #include "GameStateManager.h"
 

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

@@ -18 +18 @@
 IF(WIN32)
   SET( OBJECTS_SRC_FILES
-    objects/BaseObject.cc
     objects/WorldEntity.cc
     objects/test1.cc

code/branches/FICN/src/orxonox/OrxonoxPrereqs.h

@@ -62 +62 @@
 class InputManager;
 class SpaceShipSteering;
-
-// TinyXML
-class TiXmlString;
-class TiXmlOutStream;
-class TiXmlNode;
-class TiXmlHandle;
-class TiXmlDocument;
-class TiXmlElement;
-class TiXmlComment;
-class TiXmlUnknown;
-class TiXmlAttribute;
-class TiXmlText;
-class TiXmlDeclaration;
-class TiXmlParsingData;
 
 namespace orxonox {

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

@@ -2 +2 @@
 
 SET( CORE_SRC_FILES
+  BaseObject.cc
   Factory.cc
   IdentifierList.cc

code/branches/FICN/src/orxonox/core/Factory.cc

@@ -33 +33 @@
 #include "Identifier.h"
 #include "Debug.h"
-#include "../objects/BaseObject.h"
+#include "BaseObject.h"
 #include "Factory.h"
 

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"