Changeset 10336 for code/branches

Timestamp:

Mar 26, 2015, 4:14:43 PM (10 years ago)

Author:

meggiman

Message:

Started implementing GravityBomb.cc

Location:

code/branches/weaponFS15/src/modules/weapons

Files:

• WeaponsPrereqs.h (modified) (1 diff)
• projectiles/CMakeLists.txt (modified) (1 diff)
• projectiles/GravityBomb.cc (added)
• projectiles/GravityBomb.h (modified) (2 diffs)

code/branches/weaponFS15/src/modules/weapons/WeaponsPrereqs.h

@@ -83 +83 @@
     class Rocket;
     class SimpleRocket;
+    class GravityBomb;
 
     // weaponmodes

code/branches/weaponFS15/src/modules/weapons/projectiles/CMakeLists.txt

@@ -7 +7 @@
   Rocket.cc
   SimpleRocket.cc
+  GravityBomb.cc
 )

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

@@ -44 +44 @@
 #include "graphics/ParticleSpawner.h"
 #include "interfaces/RadarViewable.h"
-
+#include "objects/ForceField.h"
 #include "BasicProjectile.h"
+#include "worldentities/MovableEntity.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -52 +54 @@
         class ConeCollisionShape;
 
-        class _WeaponsExport GravityBomb : public BasicProjectile , public RadarViewable, public MovableEntity
+        class _WeaponsExport GravityBomb : public BasicProjectile , public MovableEntity, public RadarViewable
         {
                 public:
                         GravityBomb(Context* context);
+                        virtual ~GravityBomb();
+                        virtual void tick(float dt);
+
+                        virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
                 private:
+                static const float FUEL_START;
+                static const float FORCE_SPHERE_START_RADIUS;
+                static const float FORCE_SPHERE_START_STRENGTH;
+
+                float fuel_;
                 float lifetime_;
+                float forceSphereRadius_;
+                float forceStrength_;
 
-        }
+
+        };
 }
 #endif /* GravityBOMB_H_ */