Changeset 10629 for code/trunk/src/modules/weapons/projectiles/Projectile.h

Timestamp:

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

Author:

fvultier

Message:

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

File:

• code/trunk/src/modules/weapons/projectiles/Projectile.h (modified) (2 diffs)

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