From a5266d3e5da1d9ee9f873124674c68843a407ac0 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 11 Feb 2023 17:26:49 +0100 Subject: Context is now used in sim systems --- sim/src/FloatingMovement.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'sim/src/FloatingMovement.cpp') diff --git a/sim/src/FloatingMovement.cpp b/sim/src/FloatingMovement.cpp index e1794d5..da6cd20 100644 --- a/sim/src/FloatingMovement.cpp +++ b/sim/src/FloatingMovement.cpp @@ -1,8 +1,6 @@ #include -#include -#include - +#include #include @@ -13,21 +11,21 @@ namespace sim void -FloatingMovement::update(entt::registry& registry, entt::dispatcher&, const float dt) +FloatingMovement::update(engine::Context& ctx) { - auto view = registry.view(); + auto view = ctx.registry.view(); for (auto&& [entity, transform, movement, ai] : view.each()) { const auto offset = ai.destination - transform.position; const auto at_destination = offset.magnitude() > movement.destination_boundary; const auto acceleration = at_destination ? - offset.normalized().scale(movement.acceleration * dt) : - offset.normalized().scale(-1 * movement.deceleration * dt); + offset.normalized().scale(movement.acceleration * ctx.clock.dt) : + offset.normalized().scale(-1 * movement.deceleration * ctx.clock.dt); movement.speed.x += acceleration.x; movement.speed.y += acceleration.y; if (movement.speed.magnitude() > movement.max_speed) movement.speed = movement.speed.normalized().scale(movement.max_speed); - const auto speed = movement.speed.scale(dt); + const auto speed = movement.speed.scale(ctx.clock.dt); transform.position.x += speed.x; transform.position.y += speed.y; transform.angle = speed.angle(); -- cgit v1.1