Changeset 341 for code/branches/FICN/src/orxonox

Timestamp:

Nov 28, 2007, 9:54:59 PM (17 years ago)

Author:

rgrieder

Message:

• removed folder src/class_hierarchy
• removed a few unnec. files in src/
• added a few files in src/orxonox to make weapon system and hud work
• restructured all CMLs
• adjusted all the #include directives (only one include directory now: src)
• moved ENET library linkage to CML in src/orxonox

Location:

code/branches/FICN/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• Flocking.h (deleted)
• core/CMakeLists.txt (modified) (1 diff)
• hud/CMakeLists.txt (modified) (1 diff)
• hud/hud_overlay.h (modified) (1 diff)
• hud/test_overlay.h (modified) (1 diff)
• inertial_node.h (deleted)
• objects/BaseObject.h (modified) (1 diff)
• objects/CMakeFiles (deleted)
• objects/CMakeLists.txt (modified) (1 diff)
• ogre_control.h (deleted)
• orxonox.cc (modified) (1 diff)
• orxonox.h (deleted)
• orxonox_prerequisites.h (deleted)
• orxonox_scene.h (deleted)
• orxonox_ship.h (deleted)
• run_manager.h (deleted)
• weapon/CMakeLists.txt (modified) (2 diffs)
• weapon/ammunition_dump.cc (modified) (1 diff)
• weapon/ammunition_dump.h (modified) (1 diff)
• weapon/barrel_gun.cc (modified) (1 diff)
• weapon/barrel_gun.h (modified) (1 diff)
• weapon/base_weapon.cc (modified) (1 diff)
• weapon/base_weapon.h (modified) (1 diff)
• weapon/bullet.h (modified) (1 diff)
• weapon/bullet_manager.h (modified) (1 diff)
• weapon/weapon_station.h (modified) (1 diff)

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES orxonox.cc spaceship_steering.cc)
+SET( ORXONOX_SRC_FILES
+        orxonox.cc
+        spaceship_steering.cc
+)
 
-ADD_EXECUTABLE(../../bin/main ${SRC_FILES})
+ADD_EXECUTABLE(../../bin/main ${ORXONOX_SRC_FILES})
 
-TARGET_LINK_LIBRARIES(../../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} loader )
-
-INCLUDE_DIRECTORIES(..)
 
 ADD_SUBDIRECTORY(core)
+ADD_SUBDIRECTORY(hud)
 ADD_SUBDIRECTORY(objects)
-ADD_SUBDIRECTORY(hud)
 ADD_SUBDIRECTORY(weapon)
+
+
+TARGET_LINK_LIBRARIES( ../../bin/main
+        ${OGRE_LIBRARIES}
+        ${OIS_LIBRARIES}
+        ${ENet_LIBRARY}
+        loader
+        network
+        core
+        hud
+        objects
+        weapon
+)

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES IdentifierList.cc Identifier.cc MetaObjectList.cc Factory.cc OrxonoxClass.cc)
+SET( CORE_SRC_FILES
+        Factory.cc
+        IdentifierList.cc
+        Identifier.cc
+        MetaObjectList.cc
+        OrxonoxClass.cc
+)
 
-ADD_LIBRARY(core ${SRC_FILES})
+ADD_LIBRARY(core ${CORE_SRC_FILES})

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES hud_overlay.cc test_overlay.cc)
+SET( HUD_SRC_FILES
+        hud_overlay.cc
+        test_overlay.cc
+)
 
-ADD_LIBRARY(objects ${SRC_FILES})
+LINK_DIRECTORIES(.)
+
+ADD_LIBRARY(hud ${HUD_SRC_FILES})

code/branches/FICN/src/orxonox/hud/hud_overlay.h

@@ -33 +33 @@
 #include "OgrePrerequisites.h"
 
-#include "../orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/hud/test_overlay.h

@@ -33 +33 @@
 #include "OgrePrerequisites.h"
 
-#include "../orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

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

@@ -2 +2 @@
 #define _BaseObject_H__
 
-#include "../core/IdentifierIncludes.h"
+#include "orxonox/core/IdentifierIncludes.h"
 
 namespace orxonox

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES BaseObject.cc test1.cc test2.cc test3.cc)
+SET( OBJECTS_SRC_FILES
+        BaseObject.cc
+        test1.cc
+        test2.cc
+        test3.cc
+)
 
-ADD_LIBRARY(objects ${SRC_FILES})
+ADD_LIBRARY(objects ${OBJECTS_SRC_FILES})

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

@@ -42 +42 @@
 #include "loader/LevelLoader.h"
 
-#include "orxonox.h"
-
-#include "Flocking.h"
-
 #include "spaceship_steering.h"
 SpaceshipSteering* steering;
-
 
 

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

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-# create a few variables to simplify life
-SET( WEAPON_SRC
+SET( WEAPON_SRC_FILES
         ammunition_dump.cc
         barrel_gun.cc
@@ -11 +10 @@
 )
 
-INCLUDE_DIRECTORIES(..)
-
-ADD_LIBRARY(weapon ${WEAPON_SRC})
+ADD_LIBRARY(weapon ${WEAPON_SRC_FILES})

code/branches/FICN/src/orxonox/weapon/ammunition_dump.cc

@@ -26 +26 @@
  */
 
-#include "run_manager.h"
+#include "orxonox/run_manager.h"
 
 #include "ammunition_dump.h"

code/branches/FICN/src/orxonox/weapon/ammunition_dump.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/weapon/barrel_gun.cc

@@ -33 +33 @@
 #include "OgreSceneManager.h"
 
+#include "orxonox/inertial_node.h"
+
 #include "bullet.h"
 #include "bullet_manager.h"
-#include "inertial_node.h"
 #include "ammunition_dump.h"
 #include "base_weapon.h"

code/branches/FICN/src/orxonox/weapon/barrel_gun.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/weapon/base_weapon.cc

@@ -33 +33 @@
 #include "OgreSceneManager.h"
 
+#include "orxonox/inertial_node.h"
+#include "orxonox/run_manager.h"
+
 #include "bullet.h"
 #include "bullet_manager.h"
-#include "inertial_node.h"
 #include "ammunition_dump.h"
-#include "run_manager.h"
 
 #include "base_weapon.h"

code/branches/FICN/src/orxonox/weapon/base_weapon.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/weapon/bullet.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/weapon/bullet_manager.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"
 
 

code/branches/FICN/src/orxonox/weapon/weapon_station.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 
-#include "orxonox_prerequisites.h"
+#include "orxonox/orxonox_prerequisites.h"