diff --git a/assets/voxygen/i18n/en/gameinput.ron b/assets/voxygen/i18n/en/gameinput.ron index ab2605acb3..316b489ace 100644 --- a/assets/voxygen/i18n/en/gameinput.ron +++ b/assets/voxygen/i18n/en/gameinput.ron @@ -21,6 +21,7 @@ "gameinput.help": "Toggle Help Window", "gameinput.toggleinterface": "Toggle Interface", "gameinput.toggledebug": "Toggle FPS and Debug Info", + "gameinput.toggle_egui_debug": "Toggle EGUI Debug Info", "gameinput.togglechat": "Toggle Chat", "gameinput.screenshot": "Take Screenshot", "gameinput.toggleingameui": "Toggle Nametags", diff --git a/voxygen/src/controller.rs b/voxygen/src/controller.rs index b9eec9aa82..b64860e9e0 100644 --- a/voxygen/src/controller.rs +++ b/voxygen/src/controller.rs @@ -150,6 +150,10 @@ impl From<&crate::settings::GamepadSettings> for ControllerSettings { map.entry(settings.game_buttons.toggle_debug) .or_default() .push(GameInput::ToggleDebug); + #[cfg(feature = "egui-ui")] + map.entry(settings.game_buttons.toggle_debug) + .or_default() + .push(GameInput::ToggleEguiDebug); map.entry(settings.game_buttons.toggle_chat) .or_default() .push(GameInput::ToggleChat); diff --git a/voxygen/src/game_input.rs b/voxygen/src/game_input.rs index db75015f1b..6756330cd7 100644 --- a/voxygen/src/game_input.rs +++ b/voxygen/src/game_input.rs @@ -106,6 +106,9 @@ pub enum GameInput { Help, #[strum(serialize = "gameinput.toggledebug")] ToggleDebug, + #[cfg(feature = "egui-ui")] + #[strum(serialize = "gameinput.toggle_egui_debug")] + ToggleEguiDebug, #[strum(serialize = "gameinput.togglechat")] ToggleChat, #[strum(serialize = "gameinput.fullscreen")] diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 92fa442b93..342c94023c 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -3656,6 +3656,12 @@ impl Hud { self.show.debug = global_state.settings.interface.toggle_debug; true }, + #[cfg(feature = "egui-ui")] + GameInput::ToggleEguiDebug if state => { + global_state.settings.interface.toggle_egui_debug = + !global_state.settings.interface.toggle_egui_debug; + true + }, GameInput::ToggleChat if state => { global_state.settings.interface.toggle_chat = !global_state.settings.interface.toggle_chat; diff --git a/voxygen/src/settings/control.rs b/voxygen/src/settings/control.rs index 213a82f1f3..faa53ba8f1 100644 --- a/voxygen/src/settings/control.rs +++ b/voxygen/src/settings/control.rs @@ -144,6 +144,8 @@ impl ControlSettings { GameInput::Help => KeyMouse::Key(VirtualKeyCode::F1), GameInput::ToggleInterface => KeyMouse::Key(VirtualKeyCode::F2), GameInput::ToggleDebug => KeyMouse::Key(VirtualKeyCode::F3), + #[cfg(feature = "egui-ui")] + GameInput::ToggleEguiDebug => KeyMouse::Key(VirtualKeyCode::F7), GameInput::ToggleChat => KeyMouse::Key(VirtualKeyCode::F5), GameInput::Fullscreen => KeyMouse::Key(VirtualKeyCode::F11), GameInput::Screenshot => KeyMouse::Key(VirtualKeyCode::F4), diff --git a/voxygen/src/settings/gamepad.rs b/voxygen/src/settings/gamepad.rs index 1fe8b25739..4cc7d0e78d 100644 --- a/voxygen/src/settings/gamepad.rs +++ b/voxygen/src/settings/gamepad.rs @@ -77,6 +77,8 @@ pub mod con_settings { pub help: Button, pub toggle_interface: Button, pub toggle_debug: Button, + #[cfg(feature = "egui-ui")] + pub toggle_egui_debug: Button, pub toggle_chat: Button, pub fullscreen: Button, pub screenshot: Button, @@ -168,6 +170,8 @@ pub mod con_settings { help: Button::Simple(GilButton::Unknown), toggle_interface: Button::Simple(GilButton::Unknown), toggle_debug: Button::Simple(GilButton::Unknown), + #[cfg(feature = "egui-ui")] + toggle_egui_debug: Button::Simple(GilButton::Unknown), toggle_chat: Button::Simple(GilButton::Unknown), fullscreen: Button::Simple(GilButton::Unknown), screenshot: Button::Simple(GilButton::Unknown),