Changed CapturePointSystem in light of new enums in the components and a teamcomponent. Half the tests are currently working

2016-01-19 15:31:15 +01:00
parent 4c1a49a8a4
commit f197993beb
17 changed files with 190 additions and 189 deletions
@@ -0,0 +1,47 @@
+#ifndef CapturePointSystem_h__
+#define CapturePointSystem_h__
+
+#include <GLFW/glfw3.h>
+#include <glm/common.hpp>
+
+#include "Common.h"
+#include "Core/System.h"
+#include "Engine/Collision/ETrigger.h"
+#include "Core/ECaptured.h"
+#include "Core/EWin.h"
+
+#include <tuple>
+#include <vector>
+
+class CapturePointSystem : public PureSystem
+{
+public:
+    //WARNING: on new map, destroy all info in the vectors, as well as reset all variables (just make new?)
+    CapturePointSystem(EventBroker* eventBroker);
+
+    //updatecomponent
+    virtual void UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& capturePoint, double dt) override;
+
+private:
+    //methods which will take care of specific events
+    EventRelay<CapturePointSystem, Events::TriggerTouch> m_ETriggerTouch;
+    bool CapturePointSystem::OnTriggerTouch(const Events::TriggerTouch& e);
+    EventRelay<CapturePointSystem, Events::TriggerLeave> m_ETriggerLeave;
+    bool CapturePointSystem::OnTriggerLeave(const Events::TriggerLeave& e);
+
+    bool m_WinnerWasFound = false;
+    //need to track these variables for the captureSystem to work as per design!
+    const int m_NotACapturePoint = 999;
+    int m_Team1NextPossibleCapturePoint = m_NotACapturePoint;
+    int m_Team2NextPossibleCapturePoint = m_NotACapturePoint;
+    int m_Team1HomeCapturePoint = m_NotACapturePoint;
+    int m_Team2HomeCapturePoint = m_NotACapturePoint;
+
+    const double m_CaptureTimeToTakeOver = 15.0;
+
+    //vectors which will keep track of enter/leave changes
+    std::vector<std::tuple<EntityID, EntityID>> m_ETriggerTouchVector;
+    std::vector<std::tuple<EntityID, EntityID>> m_ETriggerLeaveVector;
+};
+
+#endif