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

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

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: