diff options
Diffstat (limited to 'src/crepe/system')
| -rw-r--r-- | src/crepe/system/AISystem.cpp | 4 | ||||
| -rw-r--r-- | src/crepe/system/PhysicsSystem.cpp | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/crepe/system/AISystem.cpp b/src/crepe/system/AISystem.cpp index 6578ecb..e9d8fa7 100644 --- a/src/crepe/system/AISystem.cpp +++ b/src/crepe/system/AISystem.cpp @@ -16,7 +16,7 @@ void AISystem::update() { LoopTimerManager & loop_timer = mediator.loop_timer; RefVector<AI> ai_components = mgr.get_components_by_type<AI>(); - duration_t dt = loop_timer.get_scaled_fixed_delta_time(); + float dt = loop_timer.get_scaled_fixed_delta_time(); // Loop through all AI components for (AI & ai : ai_components) { @@ -43,7 +43,7 @@ void AISystem::update() { // Calculate the acceleration (using the above calculated force) vec2 acceleration = force / rigidbody.data.mass; // Finally, update Rigidbody's velocity - rigidbody.data.linear_velocity += acceleration * duration<float>(dt).count(); + rigidbody.data.linear_velocity += acceleration * dt; } } diff --git a/src/crepe/system/PhysicsSystem.cpp b/src/crepe/system/PhysicsSystem.cpp index a1d35bb..ca10b25 100644 --- a/src/crepe/system/PhysicsSystem.cpp +++ b/src/crepe/system/PhysicsSystem.cpp @@ -11,7 +11,6 @@ #include "PhysicsSystem.h" using namespace crepe; -using namespace std::chrono; void PhysicsSystem::update() { @@ -19,9 +18,7 @@ void PhysicsSystem::update() { ComponentManager & mgr = mediator.component_manager; LoopTimerManager & loop_timer = mediator.loop_timer; RefVector<Rigidbody> rigidbodies = mgr.get_components_by_type<Rigidbody>(); - - duration_t delta_time = loop_timer.get_scaled_fixed_delta_time(); - float dt = duration<float>(delta_time).count(); + float dt = loop_timer.get_scaled_fixed_delta_time(); float gravity = Config::get_instance().physics.gravity; for (Rigidbody & rigidbody : rigidbodies) { @@ -42,7 +39,7 @@ void PhysicsSystem::update() { throw std::runtime_error("Config Gravity must be greater than 0"); } - if (rigidbody.data.gravity_scale > 0) { + if (rigidbody.data.gravity_scale > 0 && !rigidbody.data.constraints.y) { rigidbody.data.linear_velocity.y += (rigidbody.data.mass * rigidbody.data.gravity_scale * gravity * dt); @@ -54,13 +51,15 @@ void PhysicsSystem::update() { } // Add coefficient movement horizontal - if (rigidbody.data.linear_velocity_coefficient.x > 0) { + if (rigidbody.data.linear_velocity_coefficient.x > 0 + && !rigidbody.data.constraints.x) { rigidbody.data.linear_velocity.x *= std::pow(rigidbody.data.linear_velocity_coefficient.x, dt); } // Add coefficient movement horizontal - if (rigidbody.data.linear_velocity_coefficient.y > 0) { + if (rigidbody.data.linear_velocity_coefficient.y > 0 + && !rigidbody.data.constraints.y) { rigidbody.data.linear_velocity.y *= std::pow(rigidbody.data.linear_velocity_coefficient.y, dt); } |