Changeset 748 for code/branches

Timestamp:

Dec 31, 2007, 4:53:44 AM (17 years ago)

Author:

landauf

Message:

• moved BillboardSet, Light, Mesh and Timer to the new util folder
• changed CML files (I hope I did it correctly for both operating systems)

Location:

code/branches/FICN/src

Files:

• orxonox/CMakeLists.txt (modified) (4 diffs)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/objects/CMakeLists.txt (modified) (1 diff)
• orxonox/tools/BillboardSet.cc (moved) (moved from code/branches/FICN/src/orxonox/objects/BillboardSet.cc)
• orxonox/tools/BillboardSet.h (moved) (moved from code/branches/FICN/src/orxonox/objects/BillboardSet.h)
• orxonox/tools/Light.cc (moved) (moved from code/branches/FICN/src/orxonox/objects/Light.cc)
• orxonox/tools/Light.h (moved) (moved from code/branches/FICN/src/orxonox/objects/Light.h)
• orxonox/tools/Mesh.cc (moved) (moved from code/branches/FICN/src/orxonox/objects/Mesh.cc)
• orxonox/tools/Mesh.h (moved) (moved from code/branches/FICN/src/orxonox/objects/Mesh.h)
• orxonox/tools/Timer.h (moved) (moved from code/branches/FICN/src/orxonox/objects/Timer.h)
• util/tinyxml/CMakeLists.txt (deleted)

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

@@ -5 +5 @@
 IF(NOT WIN32)
   ADD_SUBDIRECTORY(objects)
+  ADD_SUBDIRECTORY(tools)
 ENDIF(NOT WIN32)
 ADD_SUBDIRECTORY(particle)
@@ -17 +18 @@
 
 IF(WIN32)
+  INCLUDE_DIRECTORIES(tools)
+
   SET( OBJECTS_SRC_FILES
     objects/WorldEntity.cc
@@ -28 +31 @@
     objects/Fighter.cc
     objects/Model.cc
-    objects/Mesh.cc
-    objects/Light.cc
     objects/SpaceShip.cc
     objects/NPC.cc
-    objects/BillboardSet.cc
     objects/Projectile.cc
     objects/weapon_system/AmmunitionDump.cc
@@ -41 +41 @@
     objects/weapon_system/WeaponStation.cc
     objects/Explosion.cc
+    tools/BillboardSet.cc
+    tools/Light.cc
+    tools/Mesh.cc
   )
 ELSE(WIN32)
   SET(LINK_OBJECTS_LIBRARY objects)
+  SET(LINK_OBJECTS_LIBRARY tools)
 ENDIF(WIN32)
 

code/branches/FICN/src/orxonox/Orxonox.cc

@@ -64 +64 @@
 // objects
 #include "objects/Tickable.h"
-#include "objects/Timer.h"
+#include "tools/Timer.h"
 #include "objects/NPC.h"
 #include "core/ArgReader.h"

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

@@ -1 +1 @@
 PROJECT(Orxonox)
+
+INCLUDE_DIRECTORIES(../tools)
 
 SET( OBJECTS_SRC_FILES