Changeset 12273 for code/branches/Boxhead_FS19/src/modules/weapons/projectiles

Timestamp:

Apr 4, 2019, 3:51:04 PM (6 years ago)

Author:

cwaupoti

Message:

comment

Location:

code/branches/Boxhead_FS19/src/modules/weapons/projectiles

Files:

• CMakeLists.txt (modified) (1 diff)
• HoverGunProjectile.cc (modified) (2 diffs)
• HoverGunProjectile.h (modified) (3 diffs)

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

@@ -15 +15 @@
   MineProjectile.cc
   WagnisProjectile.cc
+  HoverGunProjectile.cc
 )

code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Joel Smely
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
 
 /**
-    @file Projectile.h
-    @brief Implementation of the Projectile class.
+    @file HoverGunProjectile.h
+    @brief Implementation of the HoverGunProjectile class.
 */
 
 #include "HoverGunProjectile.h"
 
-#include "core/config/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
 #include "core/command/Executor.h"
-
-#include "worldentities/pawns/Pawn.h"
+#include "util/Convert.h"
 
 namespace orxonox
@@ -45 +42 @@
     RegisterClass(HoverGunProjectile);
 
-    HoverGunProjectile::HoverGunProjectile(Context* context) : MovableEntity(context), BasicProjectile()
+    HoverGunProjectile::HoverGunProjectile(Context* context) : BillboardProjectile(context)
     {
         RegisterObject(HoverGunProjectile);
 
-        this->setConfigValues();
+        this->textureIndex_ = 1;
+        this->setMass(0.1f);
+        this->setCollisionType(CollisionType::Dynamic);
+        this->maxTextureIndex_ = 8;
+        this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&HoverGunProjectile::changeTexture, this)));
 
-        // Get notification about collisions
-        if (GameMode::isMaster())
-        {
-            this->setMass(0.1f);
-            this->enableCollisionCallback();
-            this->setCollisionResponse(false);
-            this->setCollisionType(CollisionType::Dynamic);
-
-            // Create a sphere collision shape and attach it to the projectile.
-            collisionShape_ = new SphereCollisionShape(this->getContext());
-            setCollisionShapeRadius(8.0f);
-            this->attachCollisionShape(collisionShape_);
-
-            this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&BasicProjectile::destroyObject, this)));
-        }
+        registerVariables();
     }
 
-    HoverGunProjectile::~HoverGunProjectile()
+    void HoverGunProjectile::registerVariables()
     {
+        registerVariable(this->materialBase_);
     }
 
-    void HoverGunProjectile::setConfigValues()
+    /**
+    @brief
+        Set the material.
+    @param material
+        The name of the material. Material names with 1 to 8 appended must exist.
+    */
+    void HoverGunProjectile::setMaterial(const std::string& material)
     {
-        SetConfigValue(lifetime_, 4.0f).description("The time in seconds a projectile stays alive");
+        this->materialBase_ = material;
+
+        BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
     }
 
-    void HoverGunProjectile::tick(float dt)
+    /**
+    @brief
+        Change the texture.
+    */
+    void HoverGunProjectile::changeTexture()
     {
-        SUPER(Projectile, tick, dt);
+        this->textureIndex_++;
+        if (this->textureIndex_ > this->maxTextureIndex_)
+            this->textureIndex_ = 1;
 
-        if (!this->isActive())
-            return;
-
-        this->destroyCheck();
-    }
-
-    bool HoverGunProjectile::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint)
-    {
-        return this->processCollision(otherObject, contactPoint, cs);
-    }
-
-    void HoverGunProjectile::setCollisionShapeRadius(float radius)
-    {
-        if (collisionShape_ != nullptr && radius > 0)
-        {
-            collisionShape_->setRadius(radius);
-        }        
+        this->setMaterial(this->materialBase_);
     }
 }

code/branches/Boxhead_FS19/src/modules/weapons/projectiles/HoverGunProjectile.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Joel Smely
  *   Co-authors:
- *      simonmie
+ *      ...
  *
  */
 
 /**
-    @file Projectile.h
-    @brief Definition of the Projectile class.
+    @file HoverGunProjectile.h
+    @brief Definition of the HoverGunProjectile class.
 */
 
@@ -37 +37 @@
 #include "weapons/WeaponsPrereqs.h"
 
+#include <string>
 #include "tools/Timer.h"
-#include "worldentities/MovableEntity.h"
-#include "objects/collisionshapes/SphereCollisionShape.h"
-
-#include "BasicProjectile.h"
+#include "BillboardProjectile.h"
 
 namespace orxonox
@@ -48 +46 @@
     /**
     @brief
-        Represents all 'standard' projectiles.
-
+        The HoverGunProjectile is a projectile that is represented by a looped series of billboards.
+        
     @author
-        Fabian 'x3n' Landau
-    @author
-        Simon Miescher
+        Joel Smely
     @ingroup WeaponsProjectiles
     */
-    class _WeaponsExport HoverGunProjectile : public MovableEntity, public BasicProjectile
+    class _WeaponsExport HoverGunProjectile : public BillboardProjectile
     {
         public:
             HoverGunProjectile(Context* context);
-            virtual ~HoverGunProjectile();
+            virtual ~HoverGunProjectile() {}
 
-            void setConfigValues();
-
-            virtual void tick(float dt) override;
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
-
-        protected:
-            virtual void setCollisionShapeRadius(float radius);
-            float lifetime_; //!< The time the projectile exists.
+            virtual void setMaterial(const std::string& material) override;
 
         private:
-            Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
-            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.
+            void registerVariables();
+            void changeTexture();
+            
+            unsigned int textureIndex_; //!< The current index of the texture. (i.e. the index of the currently displayed texture)
+            unsigned int maxTextureIndex_; //!< The maximal index.
+            Timer textureTimer_; //!< A timer that loops and changes textures each time it expires.
+            std::string materialBase_; //!< The base name of the material.
     };
 }
 
-#endif /* _Projectile_H__ */
+#endif /* _HoverGunProjectile_H__ */