From 373bb33cf0f58934d55db75f950b2addcf5ce907 Mon Sep 17 00:00:00 2001
From: sippeangelo <holmberg.simon@gmail.com>
Date: Sun, 24 Jan 2016 15:20:34 +0100
Subject: [PATCH] Player jumping taking air acceleration into account

---
 resources/Schema/Entities/Player.xml      |  9 +++--
 src/Engine/Collision/CollisionSystem.cpp  |  2 +-
 src/Game/Systems/PlayerMovementSystem.cpp | 42 ++++++++++++++---------
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/resources/Schema/Entities/Player.xml b/resources/Schema/Entities/Player.xml
index 58550357..00d2e295 100644
--- a/resources/Schema/Entities/Player.xml
+++ b/resources/Schema/Entities/Player.xml
@@ -6,12 +6,13 @@
       <Origin X="0" Y="0.772000015" Z="0"/>
       <Size X="1" Y="1.60000002" Z="1"/>
     </c:AABB>
+    <c:Collidable/>
     <c:Model/>
     <c:Physics>
-      <Gravity>false</Gravity>
+      <Velocity X="8.33307467e-09" Y="0" Z="9.82836834e-09"/>
     </c:Physics>
     <c:Player>
-      <MovementSpeed>7</MovementSpeed>
+      <MovementSpeed>5</MovementSpeed>
     </c:Player>
     <c:Team>
       <Team>
@@ -19,7 +20,8 @@
       </Team>
     </c:Team>
     <c:Transform>
-      <Position X="0" Y="0" Z="7.38143063"/>
+      <Position X="2.84928203" Y="0.0264999866" Z="7.31610918"/>
+      <Orientation X="0" Y="2.14675093" Z="0"/>
     </c:Transform>
   </Components>
 
@@ -29,6 +31,7 @@
         <c:Camera/>
         <c:Transform>
           <Position X="0" Y="1.37700009" Z="0"/>
+          <Orientation X="0.921535373" Y="0" Z="0"/>
         </c:Transform>
       </Components>
       <Children>
diff --git a/src/Engine/Collision/CollisionSystem.cpp b/src/Engine/Collision/CollisionSystem.cpp
index 0c77c306..ba841e36 100644
--- a/src/Engine/Collision/CollisionSystem.cpp
+++ b/src/Engine/Collision/CollisionSystem.cpp
@@ -31,7 +31,7 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
         }
         if (Collision::AABBVsAABB(boxA, boxB, resolutionVector)) {
             (glm::vec3&)cTransform["Position"] += resolutionVector;
-            cPhysics["Velocity"] = glm::vec3(0, 0, 0);
+            ((glm::vec3&)cPhysics["Velocity"]).y = 0.f;
         }
     }
 
diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp
index ae54d684..5c75a673 100644
--- a/src/Game/Systems/PlayerMovementSystem.cpp
+++ b/src/Game/Systems/PlayerMovementSystem.cpp
@@ -48,8 +48,12 @@ void PlayerMovementSystem::Update(double dt)
             }
             glm::vec3& velocity = cPhysics["Velocity"];
             ImGui::Text("velocity: (%f, %f, %f)", velocity.x, velocity.y, velocity.z);
-            ImGui::Text("wishDirection: (%f, %f, %f)", wishDirection.x, wishDirection.y, wishDirection.z);
-            float currentSpeedProj = glm::dot(velocity, wishDirection);
+            glm::vec3 groundVelocity(0.f, 0.f, 0.f);
+            groundVelocity.x = glm::dot(velocity, glm::vec3(1.f, 0.f, 0.f));
+            groundVelocity.z = glm::dot(velocity, glm::vec3(0.f, 0.f, 1.f));
+            ImGui::Text("groundVelocity: (%f, %f, %f) |%f|", groundVelocity.x, groundVelocity.y, groundVelocity.z, glm::length(wishDirection));
+            ImGui::Text("wishDirection: (%f, %f, %f) |%f|", wishDirection.x, wishDirection.y, wishDirection.z, glm::length(wishDirection));
+            float currentSpeedProj = glm::dot(groundVelocity, wishDirection);
             float addSpeed = wishSpeed - currentSpeedProj;
             ImGui::Text("currentSpeedProj: %f", currentSpeedProj);
             ImGui::Text("wishSpeed: %f", wishSpeed);
@@ -58,20 +62,20 @@ void PlayerMovementSystem::Update(double dt)
             if (addSpeed > 0) {
                 static float accel = 15.f;
                 ImGui::InputFloat("accel", &accel);
-                float actualAccel = accel;
-                static float surfaceFriction = 1.f;
+                static float airAccel = 0.5f;
+                ImGui::InputFloat("airAccel", &airAccel);
+                float actualAccel = (velocity.y != 0) ? airAccel : accel;
+                static float surfaceFriction = 5.f;
                 ImGui::InputFloat("surfaceFriction", &surfaceFriction);
                 float accelerationSpeed = actualAccel * (float)dt * wishSpeed * surfaceFriction;
                 accelerationSpeed = glm::min(accelerationSpeed, addSpeed);
                 velocity += accelerationSpeed * wishDirection;
                 ImGui::Text("velocity: (%f, %f, %f) |%f|", velocity.x, velocity.y, velocity.z, glm::length(velocity));
             }
-            //pos += controller->Movement() * glm::inverse(glm::quat(ori)) * speed * (float)dt;
 
-            //glm::vec3& velocity = player["Physics"]["Velocity"];
-            //if (controller->Jumping() && !controller->Crouching() && velocity.y == 0.f) {
-            //    velocity.y += 4.f;
-            //}
+            if (controller->Jumping() && !controller->Crouching() && velocity.y == 0.f) {
+                velocity.y += 4.f;
+            }
 
             //if (player.HasComponent("AABB")) {
             //    glm::vec3& size = player["AABB"]["Size"];
@@ -93,20 +97,26 @@ void PlayerMovementSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapp
     if (!entity.HasComponent("Physics")) {
         return;
     }
-    ComponentWrapper& cPhysics = entity["Physics"];
 
+    ComponentWrapper& cPhysics = entity["Physics"];
     glm::vec3& velocity = cPhysics["Velocity"];
-    if (cPhysics["Gravity"]) {
-        velocity.y -= 9.82f * (float)dt;
-    }
 
     // Ground friction
     float speed = glm::length(velocity);
-        static float groundFriction = 7.f;
+    static float groundFriction = 7.f;
     ImGui::InputFloat("groundFriction", &groundFriction);
+    static float airFriction = 0.f;
+    ImGui::InputFloat("airFriction", &airFriction);
+    float friction = (velocity.y != 0) ? airFriction : groundFriction;
     if (speed > 0) {
-        float drop = speed * groundFriction * (float)dt;
-        velocity *= glm::max(speed - drop, 0.f) / speed;
+        float drop = speed * friction * (float)dt;
+        float multiplier = glm::max(speed - drop, 0.f) / speed;
+        velocity.x *= multiplier;
+        velocity.z *= multiplier;
+    }
+
+    if (cPhysics["Gravity"]) {
+        velocity.y -= 9.82f * (float)dt;
     }
 
     glm::vec3& position = cTransform["Position"];