Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add hotkey to toggle Egui Debug

Browse Source
This commit is contained in:
juliancoffee 2021-08-06 22:22:05 +03:00
parent abf5a7e136
commit 16c72b8667
6 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
assets/voxygen/i18n/en/gameinput.ron
View File

@ -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",

4
voxygen/src/controller.rs
View File

@ -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);

3
voxygen/src/game_input.rs
View File

@ -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")]

6
voxygen/src/hud/mod.rs
View File

@ -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;

2
voxygen/src/settings/control.rs
View File

@ -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),

4
voxygen/src/settings/gamepad.rs
View File

@ -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),