Skip to content

feat!: give InputCollector access to World. #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zicklag merged 2 commits into from
Jan 12, 2026
Merged

feat!: give InputCollector access to World. #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ff57bf
feat: give InputCollector access to World
TekhnaeRaav Jan 12, 2026
3480baa
fix: fix clippy lints.
zicklag Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions framework_crates/bones_framework/src/input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
//! Input resources.

use bones_lib::ecs::World;
use bones_schema::HasSchema;

use self::prelude::{GamepadInputs, KeyboardInputs, MouseInputs};

pub mod gamepad;
pub mod gilrs;
pub mod keyboard;
Expand Down Expand Up @@ -49,13 +48,7 @@ pub trait InputCollector<'a, ControlMapping: HasSchema, ControlSource, Control>:
/// Update the internal state with new inputs. This must be called every render frame with the
/// input events. This updates which buttons are pressed, but does not compute what buttons were "just_pressed".
/// use [`InputCollector::update_just_pressed`] to do this.
fn apply_inputs(
&mut self,
mapping: &ControlMapping,
mouse: &MouseInputs,
keyboard: &KeyboardInputs,
gamepad: &GamepadInputs,
);
fn apply_inputs(&mut self, world: &World);

/// Indicate input for this frame has been consumed. An implementation of [`InputCollector`] that is
/// used with a fixed simulation step may track what keys are currently pressed, and what keys were "just pressed",
Expand Down
16 changes: 1 addition & 15 deletions framework_crates/bones_framework/src/networking.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,11 +705,6 @@ where
}
}

/// Helper for accessing nested associated types on [`NetworkInputConfig`].
#[allow(type_alias_bounds)]
type ControlMapping<'a, C: NetworkInputConfig<'a>> =
<C::PlayerControls as PlayerControls<'a, C::Control>>::ControlMapping;

impl<InputTypes> SessionRunner for GgrsSessionRunner<'static, InputTypes>
where
InputTypes: NetworkInputConfig<'static> + 'static,
Expand All @@ -724,19 +719,10 @@ where
let mut skip_frames: u32 = 0;

{
let mouse = world.resource::<MouseInputs>();
let keyboard = world.resource::<KeyboardInputs>();
let gamepad = world.resource::<GamepadInputs>();

let player_inputs = world.resource::<InputTypes::PlayerControls>();

// Collect inputs and update controls
self.input_collector.apply_inputs(
&world.resource::<ControlMapping<InputTypes>>(),
&mouse,
&keyboard,
&gamepad,
);
self.input_collector.apply_inputs(world);
self.input_collector.update_just_pressed();

// save local players dense input for use with ggrs
Expand Down