Changeset 10606 for code/branches/towerdefenseFabien/src/modules/weapons/projectiles/Projectile.cc

Timestamp:

Oct 2, 2015, 10:46:40 PM (9 years ago)

Author:

fvultier

Message:

The most expensive tower fires now a new weapon: The Ice gun; a weapon that slows down a hit SpaceShip. This weapon may be used outside the tower defense minigame.

File:

• code/branches/towerdefenseFabien/src/modules/weapons/projectiles/Projectile.cc (modified) (4 diffs)

code/branches/towerdefenseFabien/src/modules/weapons/projectiles/Projectile.cc

@@ -39 +39 @@
 #include "core/command/Executor.h"
 
-#include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"
 
@@ -60 +59 @@
             this->setCollisionType(Dynamic);
 
-            SphereCollisionShape* shape = new SphereCollisionShape(this->getContext());
-            shape->setRadius(20.0f);
-            this->attachCollisionShape(shape);
+            // Create a sphere collision shape and attach it to the projectile.
+            collisionShape_ = new SphereCollisionShape(this->getContext());
+            setCollisionShapeRadius(20.0f);
+            this->attachCollisionShape(collisionShape_);
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
@@ -76 +76 @@
         SetConfigValue(lifetime_, 4.0f).description("The time in seconds a projectile stays alive");
     }
-
 
     void Projectile::tick(float dt)
@@ -93 +92 @@
     }
 
+    void Projectile::setCollisionShapeRadius(float radius)
+    {
+        if (collisionShape_ != NULL && radius > 0)
+        {
+            collisionShape_->setRadius(radius);
+        }        
+    }
 }