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/TurretControl.cpp | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'sim/src/TurretControl.cpp') diff --git a/sim/src/TurretControl.cpp b/sim/src/TurretControl.cpp index bfac27f..fa42bf5 100644 --- a/sim/src/TurretControl.cpp +++ b/sim/src/TurretControl.cpp @@ -1,8 +1,6 @@ #include -#include -#include - +#include #include #include #include @@ -19,33 +17,33 @@ bool consume(float& dt, double& target); void -TurretControl::update(entt::registry& registry, entt::dispatcher& dispatcher, const float dt) +TurretControl::update(engine::Context& ctx) { - auto view = registry.view(); + auto view = ctx.registry.view(); for (auto&& [entity, control, def] : view.each()) { - if (!registry.valid(control.owner)) { - registry.destroy(entity); + if (!ctx.registry.valid(control.owner)) { + ctx.registry.destroy(entity); continue; } - if (!registry.all_of(control.owner)) + if (!ctx.registry.all_of(control.owner)) continue; - const auto& [state, transform] = registry.get(control.owner); - if (!registry.valid(state.target)) + const auto& [state, transform] = ctx.registry.get(control.owner); + if (!ctx.registry.valid(state.target)) continue; - const auto& target = registry.get(state.target); + const auto& target = ctx.registry.get(state.target); const auto distance = transform.position.distance(target.position); if (distance > def.effective_range()) continue; - auto remaining_dt = dt; + auto remaining_dt = ctx.clock.dt; while (remaining_dt > 0.0) { if (control.rounds < 1 && consume(remaining_dt, control.reload)) control.rounds = def.rounds; if (control.rounds > 0 && consume(remaining_dt, control.delay)) { - auto& target_points = registry.get(state.target); + auto& target_points = ctx.registry.get(state.target); auto damage = def.effective_damage(distance); if (damage > 0.0) { damage = target_points.deal(damage); - dispatcher.trigger(Hit{damage, control.owner, state.target}); + ctx.dispatcher.trigger(Hit{damage, control.owner, state.target}); } control.delay = def.rate_of_fire; if (--control.rounds < 1) -- cgit v1.1