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

Timestamp:

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

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• 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)

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