Context Navigation

weapons

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

Files:

-                      r9667
+                      r10629
     /**
     @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.
     */

r9667	r10629
60	60	virtual void setColour(const ColourValue& colour);
61	61	virtual void setMaterial(const std::string& material);
	62	virtual const std::string& getMaterial();
62	63	virtual void changedVisibility();
63	64

-                      r10287
+                      r10629
 #include "core/command/Executor.h"
-#include "objects/collisionshapes/SphereCollisionShape.h"
 #include "worldentities/pawns/Pawn.h"
 …
             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)));
 …
         SetConfigValue(lifetime_, 4.0f).description("The time in seconds a projectile stays alive");
+    }
     void Projectile::tick(float dt)
 …
+    }
+    void Projectile::setCollisionShapeRadius(float radius)
+    {
+        if (collisionShape_ != NULL && radius > 0)
+        {
+            collisionShape_->setRadius(radius);
+        }
+    }
+}

-                      r10216
+                      r10629
 #include "tools/Timer.h"
 #include "worldentities/MovableEntity.h"
+#include "objects/collisionshapes/SphereCollisionShape.h"
 #include "BasicProjectile.h"
 …
             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.
     };
+}

Note: See TracChangeset for help on using the changeset viewer.