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

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/weapon

Files:

• CMakeLists.txt (modified) (2 diffs)
• ammunition_dump.cc (modified) (1 diff)
• ammunition_dump.h (modified) (1 diff)
• barrel_gun.cc (modified) (1 diff)
• barrel_gun.h (modified) (1 diff)
• base_weapon.cc (modified) (1 diff)
• base_weapon.h (modified) (1 diff)
• bullet.h (modified) (1 diff)
• bullet_manager.h (modified) (1 diff)
• weapon_station.h (modified) (1 diff)

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"