From b6b96c5f11f52b12954ac170b9496330668ced1e Mon Sep 17 00:00:00 2001
From: verysecrethero <hnorthh@gmail.com>
Date: Wed, 10 Feb 2016 11:51:58 +0100
Subject: [PATCH] Added DoubleJumpHexagon entity. Spawned DoubleJumpHexagon  as
 the player doublejumps. Fixed DoubleJumping bug where you couldnt doublejump
 on rocks (where velocity wasnt 0.0)

---
 include/Game/Systems/PlayerMovementSystem.h   |  3 ++
 resources/DefaultInput.ini                    |  3 ++
 .../Schema/Entities/DoubleJumpHexagon.xml     | 30 +++++++++++++++++++
 src/Game/Systems/PlayerMovementSystem.cpp     |  8 ++++-
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 resources/Schema/Entities/DoubleJumpHexagon.xml

diff --git a/include/Game/Systems/PlayerMovementSystem.h b/include/Game/Systems/PlayerMovementSystem.h
index 34862e90..a0194545 100644
--- a/include/Game/Systems/PlayerMovementSystem.h
+++ b/include/Game/Systems/PlayerMovementSystem.h
@@ -5,6 +5,9 @@
 #include "Input/FirstPersonInputController.h"
 #include <imgui/imgui.h>
 
+#include "Core/EntityFile.h"
+#include "Core/EntityFileParser.h"
+
 class PlayerMovementSystem : public ImpureSystem, PureSystem
 {
 public:
diff --git a/resources/DefaultInput.ini b/resources/DefaultInput.ini
index 589dfb3f..eb5b7658 100644
--- a/resources/DefaultInput.ini
+++ b/resources/DefaultInput.ini
@@ -2,6 +2,9 @@
 Sensitivity=0.5
 InvertPitch=false
 
+[KeyBoard]
+DoubleTapToDash=true
+
 [Bindings]
 MouseLeft=PrimaryFire
 MouseX=Yaw
diff --git a/resources/Schema/Entities/DoubleJumpHexagon.xml b/resources/Schema/Entities/DoubleJumpHexagon.xml
new file mode 100644
index 00000000..bbc41119
--- /dev/null
+++ b/resources/Schema/Entities/DoubleJumpHexagon.xml
@@ -0,0 +1,30 @@
+<?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:Model>
+      <Resource>Models/JumpEffectHexagon.mesh</Resource>
+      <Color A="0.576470613" B="0.635294139" G="0.788235307" R="0.854901969"/>
+      <Transparent>true</Transparent>
+    </c:Model>
+    <c:Transform>
+      <Position X="0.600000024" Y="0.800000012" Z="0"/>
+      <Scale X="0.50000012" Y="0.50000019" Z="0.50000014"/>
+    </c:Transform>
+    <c:Lifetime>
+      <Lifetime>1.5</Lifetime>
+    </c:Lifetime>
+    <c:ExplosionEffect>
+      <ColorByDistance>true</ColorByDistance>
+      <Velocity X="0" Y="-7.76300049" Z="0"/>
+      <ExplosionOrigin X="0" Y="2.67900002" Z="0"/>
+      <ExponentialAccelaration>true</ExponentialAccelaration>
+      <ExplosionDuration>3</ExplosionDuration>
+      <EndColor A="0" B="0" G="0" R="1"/>
+      <Randomness>true</Randomness>
+    </c:ExplosionEffect>
+  </Components>
+
+  <Children/>
+
+</Entity>
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index 52890c3a..6b26db1c 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -90,9 +90,15 @@ void PlayerMovementSystem::Update(double dt)
             //you cant jump and dash at the same time - since there is no friction in the air and we would thus dash much further in the air
             if (!controller->PlayerIsDashing() && controller->Jumping() && !controller->Crouching() && (isOnGround || !controller->DoubleJumping())) {
                 (bool)cPhysics["IsOnGround"] = false;
-                if (velocity.y == 0.f) {
+                if (isOnGround) {
                     controller->SetDoubleJumping(false);
                 } else {
+                    //put a hexagon at the players feet
+                    auto hexagonEffect = ResourceManager::Load<EntityFile>("Schema/Entities/DoubleJumpHexagon.xml");
+                    EntityFileParser parser(hexagonEffect);
+                    EntityID hexagonEffectID = parser.MergeEntities(m_World);
+                    EntityWrapper hexagonEW = EntityWrapper(m_World, hexagonEffectID);
+                    hexagonEW["Transform"]["Position"] = (glm::vec3)player["Transform"]["Position"];
                     controller->SetDoubleJumping(true);
                 }
                 velocity.y = 4.f;