DoubleJumping now in InputController instead.

Merge remote-tracking branch 'origin/master' into DoubleJump
Merge pull request #73 from teamfisk/CapturePointFixBranch
2016-02-02 15:10:11 +01:00 · 2016-02-02 14:22:00 +01:00 · 2016-02-02 13:22:03 +01:00 · 2016-02-02 11:37:22 +01:00 · 2016-01-29 10:12:49 +01:00
11 changed files with 222 additions and 16 deletions
@@ -9,9 +9,9 @@
 class CollidableOctreeSystem : public ImpureSystem, public PureSystem
 {
 public:
-    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree)
+    CollidableOctreeSystem(World* world, EventBroker* eventBroker, Octree<EntityAABB>* octree, const std::string& componentType)
        : System(world, eventBroker)
-        , PureSystem("Collidable")
+        , PureSystem(componentType)
        , m_Octree(octree)
    { }

@@ -149,7 +149,7 @@ template<typename T>
 template<typename Box>
 void Octree<T>::ObjectsInSameRegion(const Box& box, std::vector<T>& outObjects)
 {
-    //static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
+    static_assert(std::is_base_of<AABB, Box>::value, "template argument type Box in Octree<T>::ObjectsInSameRegion must be a subclass of AABB.");
    falsifyObjectChecks();
    m_Root->ObjectsInSameRegion(box, outObjects);
 }
@@ -15,7 +15,11 @@ public:
    virtual const glm::vec3 Rotation() const { return m_Rotation; }
    virtual bool Jumping() const { return m_Jumping; }
    virtual bool Crouching() const { return m_Crouching; }
-    
+    virtual bool DoubleJumping() const { return m_DoubleJumping; }
+    virtual void SetDoubleJumping(bool isDoubleJumping) {
+        m_DoubleJumping = isDoubleJumping;
+    }
+
    void LockMouse();
    void UnlockMouse();
    virtual bool OnCommand(const Events::InputCommand& e) override;
@@ -27,8 +31,9 @@ protected:
    glm::vec3 m_Rotation;
    glm::vec3 m_Movement;
    bool m_Jumping = false;
+    bool m_DoubleJumping = false;
    bool m_Crouching = false;
-    
+
    EventRelay<EventContext, Events::LockMouse> m_ELockMouse;
    bool OnLockMouse(const Events::LockMouse& e);
    EventRelay<EventContext, Events::UnlockMouse> m_EUnlockMouse;
@@ -36,7 +41,7 @@ protected:
 };

 template <typename EventContext>
-FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID) 
+FirstPersonInputController<EventContext>::FirstPersonInputController(EventBroker* eventBroker, int playerID)
    : InputController(eventBroker)
    , m_PlayerID(playerID)
 {
@@ -113,14 +118,14 @@ bool FirstPersonInputController<EventContext>::OnCommand(const Events::InputComm
 template <typename EventContext>
 bool FirstPersonInputController<EventContext>::OnUnlockMouse(const Events::UnlockMouse& e)
 {
-    m_MouseLocked = false; 
+    m_MouseLocked = false;
    return true;
 }

 template <typename EventContext>
 bool FirstPersonInputController<EventContext>::OnLockMouse(const Events::LockMouse& e)
 {
-    m_MouseLocked = true; 
+    m_MouseLocked = true;
    return true;
 }

@@ -51,6 +51,7 @@ private:
 	GUI::Frame* m_FrameStack;
    World* m_World;
    Octree<EntityAABB>* m_OctreeCollision;
+    Octree<EntityAABB>* m_OctreeTrigger;
    Octree<EntityAABB>* m_OctreeFrustrumCulling;
    SystemPipeline* m_SystemPipeline;
    RenderFrame* m_RenderFrame;
@@ -6,7 +6,7 @@

 	<xs:element name="CapturePoint">
 		<xs:annotation>
-			<xs:documentation>A Capture Point. Add a Team Component to specify who currently owns it</xs:documentation>
+			<xs:documentation>A Capture Point. Make sure to update the HomePoint,CapturePointNumber,Team for each</xs:documentation>
 		</xs:annotation>
 		<xs:complexType>
 			<xs:all>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:AABB/>
+    <c:CapturePoint/>
+    <c:Model>
+      <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+    </c:Model>
+    <c:Team/>
+    <c:Transform/>
+    <c:Trigger/>
+  </Components>
+
+  <Children/>
+
+</Entity>
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0.340887427" Y="0" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <HomePointForTeam>
+            <Red/>
+          </HomePointForTeam>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Color A="1" B="0" G="0.200000003" R="1"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="6.60000038" Y="0" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <CapturePointNumber>1</CapturePointNumber>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Color A="1" B="1" G="1" R="0"/>
+        </c:Model>
+        <c:Team/>
+        <c:Transform>
+          <Position X="4.46673203" Y="0" Z="3.50259304"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <CapturePointNumber>2</CapturePointNumber>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="3.00000024" Y="0" Z="0.113596022"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <CapturePointNumber>3</CapturePointNumber>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="1.75382805" Y="0" Z="0.0895374417"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:CapturePoint>
+          <HomePointForTeam>
+            <Blue/>
+          </HomePointForTeam>
+          <CapturePointNumber>4</CapturePointNumber>
+        </c:CapturePoint>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitSphere.mesh</Resource>
+          <Color A="1" B="1" G="0.200000003" R="0"/>
+        </c:Model>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="0.56674248" Y="0" Z="0"/>
+        </c:Transform>
+        <c:Trigger/>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Health/>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Player/>
+        <c:Team>
+          <Team>
+            <Blue/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="4.29100037" Y="-0.08556436" Z="1.29717529"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:AABB/>
+        <c:Health/>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\Core\UnitCube.mesh</Resource>
+        </c:Model>
+        <c:Player/>
+        <c:Team>
+          <Team>
+            <Red/>
+          </Team>
+        </c:Team>
+        <c:Transform>
+          <Position X="5.43557501" Y="0.888866663" Z="1.55849135"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+    <Entity>
+      <Components>
+        <c:Model>
+          <Resource>C:\Users\123456\Workspace\TacticalZ\assets\Models\DummyScene.mesh</Resource>
+        </c:Model>
+        <c:Transform>
+          <Position X="-0.600000024" Y="0" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children/>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -76,18 +76,18 @@ bool TriggerSystem::throwLeaveIfWasInTrigger(std::unordered_set<EntityWrapper>&

 bool TriggerSystem::OnTouch(const Events::TriggerTouch &event)
 {
-    LOG_INFO("Player entity %i touched trigger entity %i.", event.Entity, event.Trigger);
+    LOG_INFO("Player entity %i touched trigger entity %i.", event.Entity.ID, event.Trigger.ID);
    return true;
 }

 bool TriggerSystem::OnEnter(const Events::TriggerEnter &event)
 {
-    LOG_INFO("Player entity %i entered trigger entity %i.", event.Entity, event.Trigger);
+    LOG_INFO("Player entity %i entered trigger entity %i.", event.Entity.ID, event.Trigger.ID);
    return true;
 }

 bool TriggerSystem::OnLeave(const Events::TriggerLeave &event)
 {
-    LOG_INFO("Player entity %i left trigger entity %i.", event.Entity, event.Trigger);
+    LOG_INFO("Player entity %i left trigger entity %i.", event.Entity.ID, event.Trigger.ID);
    return true;
 }
@@ -74,6 +74,7 @@ Game::Game(int argc, char* argv[])

    // Create Octrees
    m_OctreeCollision = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
+    m_OctreeTrigger = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
    m_OctreeFrustrumCulling = new Octree<EntityAABB>(AABB(glm::vec3(-100), glm::vec3(100)), 4);
    // Create system pipeline
    m_SystemPipeline = new SystemPipeline(m_World, m_EventBroker);
@@ -92,14 +93,15 @@ Game::Game(int argc, char* argv[])
    m_SystemPipeline->AddSystem<CapturePointSystem>(updateOrderLevel);
    // Populate Octree with collidables
    ++updateOrderLevel;
-    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision);
+    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeCollision, "Collidable");
+    m_SystemPipeline->AddSystem<CollidableOctreeSystem>(updateOrderLevel, m_OctreeTrigger, "Player");
    m_SystemPipeline->AddSystem<PlayerHUD>(updateOrderLevel);
    m_SystemPipeline->AddSystem<AnimationSystem>(updateOrderLevel);

    // Collision and TriggerSystem should update after player.
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<CollisionSystem>(updateOrderLevel, m_OctreeCollision);
-    m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeCollision);
+    m_SystemPipeline->AddSystem<TriggerSystem>(updateOrderLevel, m_OctreeTrigger);
    ++updateOrderLevel;
    m_SystemPipeline->AddSystem<RenderSystem>(updateOrderLevel, m_Renderer, m_RenderFrame);
    ++updateOrderLevel;
@@ -123,6 +125,7 @@ Game::~Game()
    delete m_SoundSystem;
    delete m_OctreeFrustrumCulling;
    delete m_OctreeCollision;
+    delete m_OctreeTrigger;
    delete m_World;
    delete m_FrameStack;
    delete m_InputProxy;
@@ -66,7 +66,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
    nextPossibleCapturePoint["Blue"] = -1;
    for (int i = 0; i < m_NumberOfCapturePoints; i++)
    {
-        if (m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
+        if (!m_CapturePointNumberToEntityMap[i].HasComponent("Team")) {
            continue;
        }
        ComponentWrapper& capturePointOwnedBy = m_CapturePointNumberToEntityMap[i]["Team"];
@@ -119,6 +119,7 @@ void CapturePointSystem::UpdateComponent(EntityWrapper& capturePointEntity, Comp
        if (std::get<1>(triggerTouched) == capturePointEntity) {
            //some player has touched this - lets figure out: what team, health
            EntityWrapper player = std::get<0>(triggerTouched);
+            //check if its really a player that has triggered the touch
            if (!player.HasComponent("Player")) {
                //if a non-player has entered the capturePoint, just erase that event and continue
                m_ETriggerTouchVector.erase(m_ETriggerTouchVector.begin() + i - 1);
@@ -76,7 +76,13 @@ void PlayerMovementSystem::Update(double dt)
                ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
            }

-            if (controller->Jumping() && !controller->Crouching() && velocity.y == 0.f) {
+            if (controller->Jumping() && !controller->Crouching() && (velocity.y == 0.f || !controller->DoubleJumping())) {
+                if (velocity.y == 0.f) {
+                    controller->SetDoubleJumping(false);
+                }
+                else {
+                    controller->SetDoubleJumping(true);
+                }
                velocity.y += 4.f;
            }
Author	SHA1	Message	Date
verysecrethero	45a92b362f	DoubleJumping now in InputController instead.	2016-02-02 15:10:11 +01:00
verysecrethero	2085d9ec9e	Merge remote-tracking branch 'origin/master' into DoubleJump	2016-02-02 14:22:00 +01:00
Jace	0e5f6da9a9	Merge pull request #73 from teamfisk/CapturePointFixBranch Several changes/fixes based on the latest broken refactoring in master	2016-02-02 13:22:03 +01:00
verysecrethero	42b52a6766	Several changes/fixes based on the latest broken refactoring. Fixed Simon's mistake in CapturePointLogic. William fixed so TriggerSystem works again with CapturePoints.	2016-02-02 11:37:22 +01:00
verysecrethero	0c97ce7a4a	You can now DoubleJump!	2016-01-29 10:12:49 +01:00