Changeset 10341 for code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h

Timestamp:

Apr 2, 2015, 4:08:52 PM (10 years ago)

Author:

meggiman

Message:

Started implementing GravityBombField

File:

• code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h (modified) (2 diffs)

code/branches/weaponFS15/src/modules/weapons/projectiles/GravityBomb.h

@@ -48 +48 @@
 #include "worldentities/MovableEntity.h"
 #include "core/CoreIncludes.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
+#include "../../../orxonox/worldentities/WorldEntity.h"
+#include "GravityBombField.h"
 
 namespace orxonox
 {
-
-        class ConeCollisionShape;
 
         class _WeaponsExport GravityBomb : public BasicProjectile , public MovableEntity, public RadarViewable
@@ -62 +63 @@
 
                         virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+                        void detonate();
 
                 private:
-                static const float FUEL_START;
-                static const float FORCE_SPHERE_START_RADIUS;
-                static const float FORCE_SPHERE_START_STRENGTH;
+                static const float INITIAL_VELOCITY;
+                static const float SLOW_DOWN_RATIO;
 
-                float fuel_;
-                float lifetime_;
-                float forceSphereRadius_;
-                float forceStrength_;
-
+                float velocityAtLastTick_; //Used to check wether the Object is already accelarating in the oposite direction to detect the time to detonate it.
 
         };