Changeset 5693 for code/trunk/src/orxonox/objects/weaponsystem

Timestamp:

Aug 29, 2009, 10:19:38 PM (15 years ago)

Author:

landauf

Message:

merged libraries branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/MuzzleFlash.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h (copied) (copied from code/branches/libraries/src/orxonox/objects/weaponsystem/WeaponsystemPrereqs.h)
• src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/FusionMunition.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/LaserMunition.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/Projectile.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponsystem/CMakeLists.txt

@@ -8 +8 @@
   WeaponSystem.cc
   DefaultWeaponmodeLink.cc
+)
+
+SET_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
   MuzzleFlash.cc
 )
@@ -14 +17 @@
 ADD_SUBDIRECTORY(projectiles)
 ADD_SUBDIRECTORY(weaponmodes)
+
+ORXONOX_ADD_LIBRARY(weaponsystem
+  MODULE
+  DEFINE_SYMBOL
+    "WEAPONSYSTEM_SHARED_BUILD"
+  LINK_LIBRARIES
+    orxonox
+  SOURCE_FILES ${WEAPONSYSTEM_SRC_FILES}
+)

code/trunk/src/orxonox/objects/weaponsystem/MuzzleFlash.h

@@ -30 +30 @@
 #define _MuzzleFlash_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport MuzzleFlash : public Billboard
+    class _WeaponsystemExport MuzzleFlash : public Billboard
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/munitions/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
   ReplenishingMunition.cc
   LaserMunition.cc

code/trunk/src/orxonox/objects/weaponsystem/munitions/FusionMunition.h

@@ -30 +30 @@
 #define _FusionMunition_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/Munition.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport FusionMunition : public Munition
+    class _WeaponsystemExport FusionMunition : public Munition
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/munitions/LaserMunition.h

@@ -30 +30 @@
 #define _LaserMunition_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "ReplenishingMunition.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport LaserMunition : public ReplenishingMunition
+    class _WeaponsystemExport LaserMunition : public ReplenishingMunition
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h

@@ -30 +30 @@
 #define _ReplenishingMunition_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport ReplenishingMunition : public Munition
+    class _WeaponsystemExport ReplenishingMunition : public Munition
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h

@@ -30 +30 @@
 #define _BillboardProjectile_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "util/Math.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport BillboardProjectile : public Projectile
+    class _WeaponsystemExport BillboardProjectile : public Projectile
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/projectiles/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
   BillboardProjectile.cc
   ParticleProjectile.cc

code/trunk/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h

@@ -30 +30 @@
 #define _LightningGunProjectile_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport LightningGunProjectile : public BillboardProjectile
+    class _WeaponsystemExport LightningGunProjectile : public BillboardProjectile
     {
         public:
             LightningGunProjectile(BaseObject* creator);
             virtual ~LightningGunProjectile() {}
-            
+
             virtual void setMaterial(const std::string& material);
 
         protected:
-            void changeTexture();        
+            void changeTexture();
             unsigned int textureIndex_;
             unsigned int maxTextureIndex_;

code/trunk/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h

@@ -30 +30 @@
 #define _ParticleProjectile_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "BillboardProjectile.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport ParticleProjectile : public BillboardProjectile
+    class _WeaponsystemExport ParticleProjectile : public BillboardProjectile
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/projectiles/Projectile.h

@@ -30 +30 @@
 #define _Projectile_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "tools/Timer.h"
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport Projectile : public MovableEntity, public PawnListener
+    class _WeaponsystemExport Projectile : public MovableEntity, public PawnListener
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/CMakeLists.txt

@@ -1 @@
-ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+ADD_SOURCE_FILES(WEAPONSYSTEM_SRC_FILES
   EnergyDrink.cc
   FusionFire.cc

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

@@ -30 +30 @@
 #define _EnergyDrink_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport EnergyDrink : public WeaponMode
+    class _WeaponsystemExport EnergyDrink : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.h

@@ -30 +30 @@
 #define _FusionFire_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport FusionFire : public WeaponMode
+    class _WeaponsystemExport FusionFire : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h

@@ -30 +30 @@
 #define _HsW01_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 
 #include "tools/Timer.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport HsW01 : public WeaponMode
+    class _WeaponsystemExport HsW01 : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.h

@@ -30 +30 @@
 #define _LaserFire_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport LaserFire : public WeaponMode
+    class _WeaponsystemExport LaserFire : public WeaponMode
     {
         public:

code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.h

@@ -30 +30 @@
 #define _LightningGun_H__
 
-#include "OrxonoxPrereqs.h"
+#include "objects/weaponsystem/WeaponsystemPrereqs.h"
 #include "objects/weaponsystem/WeaponMode.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport LightningGun : public WeaponMode
+    class _WeaponsystemExport LightningGun : public WeaponMode
     {
         public: