Changeset 10341 for code/branches

Timestamp:

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

Author:

meggiman

Message:

Started implementing GravityBombField

Location:

code/branches/weaponFS15/src/modules

Files:

• objects/ForceField.h (modified) (1 diff)
• weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• weapons/projectiles/GravityBomb.cc (modified) (2 diffs)
• weapons/projectiles/GravityBomb.h (modified) (2 diffs)
• weapons/projectiles/GravityBombField.cc (added)
• weapons/projectiles/GravityBombField.h (added)

code/branches/weaponFS15/src/modules/objects/ForceField.h

@@ -160 +160 @@
             const std::string& getMode(void); //!< Get the mode of the ForceField.
 
+            static const std::string modeTube_s;
+                        static const std::string modeSphere_s;
+                        static const std::string modeInvertedSphere_s;
+                        static const std::string modeNewtonianGravity_s;
+
+                        static const std::string modeHomogen_s;
+
         private:
             //! Strings to represent the modes.
-            static const std::string modeTube_s;
-            static const std::string modeSphere_s;
-            static const std::string modeInvertedSphere_s;
-            static const std::string modeNewtonianGravity_s;
 
-            static const std::string modeHomogen_s;
 
             float velocity_; //!< The velocity of the ForceField.

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

@@ -8 +8 @@
   SimpleRocket.cc
   GravityBomb.cc
+  GravityBombField.cc
 )

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

@@ -11 +11 @@
         RegisterClass(GravityBomb);
 
-        const float GravityBomb::FUEL_START = 10;
-        const float GravityBomb::FORCE_SPHERE_START_RADIUS = 30;
-        const float GravityBomb::FORCE_SPHERE_START_STRENGTH = 100;
+        const float GravityBomb::INITIAL_VELOCITY = 20;
+        const float GravityBomb::SLOW_DOWN_RATIO = 2;
 
         GravityBomb::GravityBomb(Context* context):
-                        BasicProjectile(),
-                        MovableEntity(context),
-                        RadarViewable(this,static_cast<WorldEntity*>(this))
+                                BasicProjectile(),
+                                MovableEntity(context),
+                                RadarViewable(this,static_cast<WorldEntity*>(this))
                 {
                         RegisterObject(GravityBomb);
-                        this->lifetime_=FUEL_START;
-                        this->forceSphereRadius_= FORCE_SPHERE_START_RADIUS;
-                        this->forceStrength_ = FORCE_SPHERE_START_STRENGTH;
 
-                        ForceField* field = new ForceField(context);
-                        field->setMode("sphere");
-                        field->setDiameter(this->forceSphereRadius_);
-                        field->setVelocity(this->forceStrength_);
-                        this->attach(field);
+                        this->setMass(15.0);
+                        if (GameMode::isMaster())
+                        {
+                                //Define movement of the bomb
+                                this->setVelocity(this->getOrientation()*WorldEntity::FRONT*INITIAL_VELOCITY);
+                                this->velocityAtLastTick_=INITIAL_VELOCITY;
+                                this->setAcceleration(this->getOrientation()*WorldEntity::BACK*SLOW_DOWN_RATIO);
+                                this->setCollisionType(WorldEntity::Dynamic);
+                                this->enableCollisionCallback();
 
+                                //Add Collision Shape
+                                SphereCollisionShape* collisionShape = new SphereCollisionShape(context);
+                                collisionShape->setRadius(5.0);
+                                this->attachCollisionShape(collisionShape);
+
+                                //Create Bomb Model
+
+
+                        }
                 }
 
@@ -37 +46 @@
         void GravityBomb::tick(float dt)
         {
-
+                        if(velocityAtLastTick_ < this->getVelocity().length())
+                        {
+                                setVelocity(Vector3::ZERO);
+                                setAcceleration(Vector3::ZERO);
+                                velocityAtLastTick_=0;
+                                detonate();
+                        }
+                        velocityAtLastTick_=getVelocity().length();
         }
 
         bool GravityBomb::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
         {
+                detonate();
+                processCollision(otherObject, contactPoint,cs);
                 return true;
+        }
+
+        void GravityBomb::detonate()
+        {
+                GravityBombField* field = new GravityBombField(this->getContext());
         }
 }

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.
 
         };