Changeset 10629 for code/trunk/src/modules/weapons/projectiles

Timestamp:

Oct 10, 2015, 4:34:26 PM (9 years ago)

Author:

fvultier

Message:

Merged towerdefenseFabien branch back to trunk. The towerdefense Minigame is now a plugin.

Location:

code/trunk/src/modules/weapons/projectiles

Files:

• BillboardProjectile.cc (modified) (1 diff)
• BillboardProjectile.h (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)
• IceGunProjectile.cc (added)
• IceGunProjectile.h (added)
• Projectile.cc (modified) (4 diffs)
• Projectile.h (modified) (2 diffs)
• SplitGunProjectile.cc (added)
• SplitGunProjectile.h (added)

code/trunk/src/modules/weapons/projectiles/BillboardProjectile.cc

@@ -88 +88 @@
     /**
     @brief
+        Get the material of the BillboardProjectile.
+    @return
+        The material name.
+    */
+    const std::string& BillboardProjectile::getMaterial()
+    {
+        return this->billboard_.getMaterial();
+    }
+
+    /**
+    @brief
         Is called when the visibility of the BillboardProjectile has changed.
     */

code/trunk/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -60 +60 @@
             virtual void setColour(const ColourValue& colour);
             virtual void setMaterial(const std::string& material);
+            virtual const std::string& getMaterial();
             virtual void changedVisibility();
 

code/trunk/src/modules/weapons/projectiles/CMakeLists.txt

@@ -5 +5 @@
   Projectile.cc
   LightningGunProjectile.cc
+  SplitGunProjectile.cc
+  IceGunProjectile.cc
   Rocket.cc
   RocketOld.cc

code/trunk/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);
+        }        
+    }
 }

code/trunk/src/modules/weapons/projectiles/Projectile.h

@@ -39 +39 @@
 #include "tools/Timer.h"
 #include "worldentities/MovableEntity.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
 
 #include "BasicProjectile.h"
@@ -66 +67 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
 
+        protected:
+            virtual void setCollisionShapeRadius(float radius);
+
         private:
             float lifetime_; //!< The time the projectile exists.
             Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
+            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.            
     };
 }