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

Timestamp:

Jun 20, 2009, 9:20:47 AM (16 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/Munition.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/Munition.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/MuzzleFlash.cc (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/MuzzleFlash.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/Weapon.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/WeaponMode.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/WeaponPack.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/WeaponPack.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/WeaponSet.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/WeaponSystem.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/FusionMunition.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/LaserMunition.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/munitions/ReplenishingMunition.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/Projectile.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/projectiles/Projectile.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.cc (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (modified) (2 diffs)
• src/orxonox/objects/weaponsystem/weaponmodes/FusionFire.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/HsW01.h (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/LaserFire.cc (modified) (1 diff)
• src/orxonox/objects/weaponsystem/weaponmodes/LightningGun.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponsystem/DefaultWeaponmodeLink.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-
 #include "WeaponSystem.h"
 

code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

@@ -29 +29 @@
 
 #include "Munition.h"
-
 #include "core/CoreIncludes.h"
 

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

@@ -34 +34 @@
 
 #include <map>
-
 #include "core/BaseObject.h"
 #include "tools/Timer.h"

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

@@ -30 +30 @@
 #include "MuzzleFlash.h"
 
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-#include "util/Math.h"
+#include "core/Executor.h"
 
 namespace orxonox
@@ -42 +40 @@
     {
         RegisterObject(MuzzleFlash);
-        this->setScale(0.1);
+        this->setScale(0.1f);
         
         this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/worldentities/Billboard.h"
-#include "tools/Timer.h"
-
 
 namespace orxonox

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

@@ -32 +32 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <map>
+#include "tools/Timer.h"
 #include "objects/worldentities/StaticEntity.h"
-
-#include "tools/Timer.h"
 
 namespace orxonox

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

@@ -32 +32 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "util/Math.h"
 #include "core/BaseObject.h"
-
+#include "core/Identifier.h"
 #include "tools/Timer.h"
-#include "core/Identifier.h"
-#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/weaponsystem/WeaponPack.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/worldentities/pawns/Pawn.h"
 
 #include "Weapon.h"
-#include "WeaponSlot.h"
 #include "WeaponSystem.h"
 #include "DefaultWeaponmodeLink.h"

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

@@ -34 +34 @@
 
 #include <set>
-
 #include "core/BaseObject.h"
 

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

@@ -34 +34 @@
 
 #include <map>
-
 #include "core/BaseObject.h"
 

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

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
+#include <map>
 #include <set>
-#include <map>
 #include <vector>
-
 #include "core/BaseObject.h"
 

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

@@ -28 +28 @@
 
 #include "FusionMunition.h"
-
 #include "core/CoreIncludes.h"
 

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

@@ -28 +28 @@
 
 #include "LaserMunition.h"
-
 #include "core/CoreIncludes.h"
 

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

@@ -28 +28 @@
 
 #include "ReplenishingMunition.h"
-
 #include "core/CoreIncludes.h"
 

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/weaponsystem/Munition.h"
-#include "tools/Timer.h"
 
 namespace orxonox

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

@@ -29 +29 @@
 #include "BillboardProjectile.h"
 
-#include <OgreBillboardSet.h>
-
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
 #include "objects/Scene.h"
 
@@ -46 +44 @@
         {
             assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
-            this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(0.5, 0.5, 0.7, 0.8), 1);
+            this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(0.5f, 0.5f, 0.7f, 0.8f), 1);
             this->attachOgreObject(this->billboard_.getBillboardSet());
         }

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "util/Math.h"
+#include "tools/BillboardSet.h"
 #include "Projectile.h"
-#include "tools/BillboardSet.h"
-#include "util/Math.h"
 
 namespace orxonox

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

@@ -29 +29 @@
 #include "LightningGunProjectile.h"
 
-#include <OgreBillboardSet.h>
-
-#include "core/GameMode.h"
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "objects/Scene.h"
-#include "util/Convert.h"
 
 namespace orxonox
@@ -46 +42 @@
         this->textureIndex_ = 1;
         this->maxTextureIndex_ = 8;
-        this->textureTimer_.setTimer(0.01, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
+        this->textureTimer_.setTimer(0.01f, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
         
         registerVariables();

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include <string>
 #include "tools/Timer.h"
-
 #include "BillboardProjectile.h"
 

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

@@ -29 +29 @@
 #include "ParticleProjectile.h"
 
-#include <OgreParticleSystem.h>
 #include <OgreParticleEmitter.h>
-
-#include "core/GameMode.h"
+#include "tools/ParticleInterface.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
 #include "objects/Scene.h"
 

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
 #include "BillboardProjectile.h"
-#include "tools/ParticleInterface.h"
-#include "util/Math.h"
 
 namespace orxonox

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

@@ -29 +29 @@
 #include "Projectile.h"
 
-#include <OgreBillboard.h>
-
 #include "core/CoreIncludes.h"
+#include "core/ConfigValueIncludes.h"
 #include "core/Executor.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/Iterator.h"
-#include "tools/ParticleInterface.h"
-
-#include "objects/worldentities/Model.h"
+#include "core/GameMode.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
+#include "objects/worldentities/pawns/Pawn.h"
 #include "objects/worldentities/ParticleSpawner.h"
-#include "objects/collisionshapes/SphereCollisionShape.h"
-#include "core/GameMode.h"
 
 namespace orxonox

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

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
+#include "tools/Timer.h"
+#include "interfaces/PawnListener.h"
 #include "objects/worldentities/MovableEntity.h"
-#include "objects/worldentities/pawns/Pawn.h"
-#include "tools/Timer.h"
 
 namespace orxonox

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 #include "objects/worldentities/Model.h"
+
+#include "objects/weaponsystem/projectiles/Projectile.h"
 #include "objects/weaponsystem/MuzzleFlash.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
@@ -69 +70 @@
     {
         this->material_ = material;
-    }
-
-    std::string& EnergyDrink::getMaterial()
-    {
-        return this->material_;
     }
 

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -47 +49 @@
         private:
             void setMaterial(const std::string& material);
-            std::string& getMaterial();
+            inline const std::string& getMaterial()
+                { return this->material_; }
             void setDelay(float d);
             float getDelay() const;

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

@@ -29 +29 @@
 #include "FusionFire.h"
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/BillboardProjectile.h"

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "core/XMLPort.h"
-#include "objects/weaponsystem/projectiles/ParticleProjectile.h"
 #include "objects/worldentities/Model.h"
+
+#include "objects/weaponsystem/projectiles/Projectile.h"
 #include "objects/weaponsystem/MuzzleFlash.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox

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

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"
-
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"

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

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-
-#include "objects/worldentities/Billboard.h"
-
+#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
 #include "objects/weaponsystem/Weapon.h"
 #include "objects/weaponsystem/WeaponPack.h"
 #include "objects/weaponsystem/WeaponSystem.h"
-
-#include "objects/weaponsystem/projectiles/LightningGunProjectile.h"
-
-#include "util/Math.h"
 
 namespace orxonox