WIP multi-weapon behaviours

include/Engine/Core/EntityWrapper.h

@@ -29,6 +29,7 @@ struct EntityWrapper
     EntityWrapper Parent();
     EntityWrapper FirstChildByName(const std::string& name);
     EntityWrapper FirstParentWithComponent(const std::string& componentType);
+    std::vector<EntityWrapper> ChildrenWithComponent(const std::string& componentType);
     bool IsChildOf(EntityWrapper potentialParent);
     bool Valid() const;
 
@@ -39,6 +40,7 @@ struct EntityWrapper
 
 private:
     EntityWrapper firstChildByNameRecursive(const std::string& name, EntityID parent);
+    void childrenWithComponentRecursive(const std::string& componentType, EntityWrapper& entity, std::vector<EntityWrapper>& childrenWithComponent);
 };
 
 namespace std

include/Game/Systems/Weapon/AssaultWeaponBehaviour.h

@@ -1,13 +1,14 @@
+#ifndef AssaultWeaponBehaviour_h__
+#define AssaultWeaponBehaviour_h__
+
 #include "Sound/EPlaySoundOnEntity.h"
 #include "Collision/Collision.h"
-#include "Rendering/AnimationSystem.h"
 #include "Core/ConfigFile.h"
 #include "WeaponBehaviour.h"
 #include "../SpawnerSystem.h"
 #include "Core/EPlayerDamage.h"
 #include "Core/EShoot.h"
 
-
 class AssaultWeaponBehaviour : public WeaponBehaviour
 {
 public:
@@ -22,16 +23,13 @@ public:
 private:
     EntityWrapper m_FirstPersonModel;
     EntityWrapper m_ThirdPersonModel;
+
     // State
     bool m_Firing = false;
     bool m_Reloading = false;
     double m_ReloadTimer = 0.0;
-    EntityWrapper m_FirstPersonReloadImpersonator;
-    EntityWrapper m_ThirdPersonReloadImpersonator;
     double m_TimeSinceLastFire = 0.0;
-
-    EventRelay<WeaponBehaviour, Events::AnimationComplete> m_EAnimationComplete;
-    bool OnAnimationComplete(Events::AnimationComplete& e);
+    EntityWrapper m_FirstPersonReloadImpostor;
 
     bool hasAmmo();
     void fireRound();
@@ -47,3 +45,5 @@ private:
     bool shoot(double damage);
     void showHitMarker();
 };
+
+#endif

include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

@@ -0,0 +1,16 @@
+#include "WeaponBehaviour.h"
+
+class DefenderWeaponBehaviour : public WeaponBehaviour
+{
+public:
+    DefenderWeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper weaponEntity);
+
+    virtual void Fire() override;
+    //virtual void CeaseFire() override;
+    //virtual void Reload() override;
+
+    //virtual void Update(double dt) override;
+
+private:
+    double m_TimeSinceLastFire = 0.0;
+};

include/Game/Systems/Weapon/WeaponBehaviour.h

@@ -8,17 +8,21 @@
 
 class WeaponBehaviour : public System
 {
+    friend class WeaponSystem;
+
 public:
-    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player)
+    WeaponBehaviour(SystemParams systemParams, IRenderer* renderer, Octree<EntityAABB>* collisionOctree, EntityWrapper player, EntityWrapper firstPersonWeapon, EntityWrapper thirdPersonWeapon)
         : System(systemParams)
         , m_Renderer(renderer)
         , m_CollisionOctree(collisionOctree)
         , m_Player(player)
+        , m_FirstPerson(firstPersonWeapon)
+        , m_ThirdPerson(thirdPersonWeapon)
     { }
     virtual ~WeaponBehaviour() = default;
 
     WeaponBehaviour(const WeaponBehaviour&) = delete;
-    WeaponBehaviour& operator=(const WeaponBehaviour &) = delete;
+    WeaponBehaviour& operator=(const WeaponBehaviour&) = delete;
 
     virtual void Fire() = 0;
     virtual void CeaseFire() { }
@@ -29,6 +33,8 @@ protected:
     IRenderer* m_Renderer;
     Octree<EntityAABB>* m_CollisionOctree;
     EntityWrapper m_Player;
+    EntityWrapper m_FirstPerson;
+    EntityWrapper m_ThirdPerson;
 };
 
 #endif