From b2358a1854fad1b28d928cd0782977332c7bf9e4 Mon Sep 17 00:00:00 2001 From: William Moberg Date: Mon, 18 Jan 2016 18:16:24 +0100 Subject: [PATCH] Added bool in Physics to toggle gravity for entities. --- resources/Schema/Components/Physics.xml | 1 + resources/Schema/Components/Physics.xsd | 1 + src/Game/Systems/PlayerMovementSystem.cpp | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/Schema/Components/Physics.xml b/resources/Schema/Components/Physics.xml index 7dce027c..9d1638fb 100644 --- a/resources/Schema/Components/Physics.xml +++ b/resources/Schema/Components/Physics.xml @@ -1,4 +1,5 @@ + true diff --git a/resources/Schema/Components/Physics.xsd b/resources/Schema/Components/Physics.xsd index 001dd2c8..cc5e24bb 100644 --- a/resources/Schema/Components/Physics.xsd +++ b/resources/Schema/Components/Physics.xsd @@ -10,6 +10,7 @@ + diff --git a/src/Game/Systems/PlayerMovementSystem.cpp b/src/Game/Systems/PlayerMovementSystem.cpp index 536624b3..57eef38d 100644 --- a/src/Game/Systems/PlayerMovementSystem.cpp +++ b/src/Game/Systems/PlayerMovementSystem.cpp @@ -9,7 +9,9 @@ void PlayerMovementSystem::UpdateComponent(World* world, EntityWrapper& entity, ComponentWrapper& cPhysics = entity["Physics"]; glm::vec3& velocity = cPhysics["Velocity"]; - velocity.y -= 9.82 * dt; + if (cPhysics["Gravity"]) { + velocity.y -= 9.82 * dt; + } glm::vec3& position = cTransform["Position"]; position += velocity * (float)dt;