Changeset 3185 for code/branches/pch/src/orxonox/objects/weaponsystem/projectiles

Timestamp:

Jun 16, 2009, 12:35:20 PM (16 years ago)

Author:

rgrieder

Message:

Cleanup in the weapon system.

Location:

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles

Files:

• BillboardProjectile.cc (modified) (1 diff)
• BillboardProjectile.h (modified) (1 diff)
• LightningGunProjectile.cc (modified) (1 diff)
• LightningGunProjectile.h (modified) (1 diff)
• ParticleProjectile.cc (modified) (1 diff)
• ParticleProjectile.h (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• Projectile.h (modified) (1 diff)

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc

@@ -30 +30 @@
 
 #include <OgreBillboardSet.h>
-
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
 #include "objects/Scene.h"
 

code/branches/pch/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/branches/pch/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

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.h

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

code/branches/pch/src/orxonox/objects/weaponsystem/projectiles/ParticleProjectile.cc

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

code/branches/pch/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/branches/pch/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/ObjectList.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/branches/pch/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