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

Rename attack, block to main, alt

Browse Source
This commit is contained in:
timokoesters 2019-08-27 13:15:26 +02:00
parent 838eab8637
commit 186db16707
No known key found for this signature in database
GPG Key ID: CD80BE9AAEE78097
3 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/session.rs
View File

@ -129,7 +129,7 @@ impl PlayState for SessionState {
Event::Close => {
return PlayStateResult::Shutdown;
}
Event::InputUpdate(GameInput::Attack, state) => {
Event::InputUpdate(GameInput::Main, state) => {
self.controller.respawn = state; // TODO: Move this into separate GameInput
// Check the existence of CanBuild component. If it's here, use LMB to
@ -158,7 +158,7 @@ impl PlayState for SessionState {
}
}
Event::InputUpdate(GameInput::Block, state) => {
Event::InputUpdate(GameInput::Alt, state) => {
let mut client = self.client.borrow_mut();
if state
&& client

8
voxygen/src/settings.rs
View File

@ -13,6 +13,8 @@ use std::{fs, io::prelude::*, path::PathBuf};
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(default)]
pub struct ControlSettings {
pub main: KeyMouse,
pub alt: KeyMouse,
pub toggle_cursor: KeyMouse,
pub escape: KeyMouse,
pub enter: KeyMouse,
@ -36,8 +38,6 @@ pub struct ControlSettings {
pub fullscreen: KeyMouse,
pub screenshot: KeyMouse,
pub toggle_ingame_ui: KeyMouse,
pub attack: KeyMouse,
pub block: KeyMouse,
pub roll: KeyMouse,
pub interact: KeyMouse,
}
@ -45,6 +45,8 @@ pub struct ControlSettings {
impl Default for ControlSettings {
fn default() -> Self {
Self {
main: KeyMouse::Mouse(MouseButton::Left),
alt: KeyMouse::Mouse(MouseButton::Right),
toggle_cursor: KeyMouse::Key(VirtualKeyCode::Tab),
escape: KeyMouse::Key(VirtualKeyCode::Escape),
enter: KeyMouse::Key(VirtualKeyCode::Return),
@ -68,8 +70,6 @@ impl Default for ControlSettings {
fullscreen: KeyMouse::Key(VirtualKeyCode::F11),
screenshot: KeyMouse::Key(VirtualKeyCode::F4),
toggle_ingame_ui: KeyMouse::Key(VirtualKeyCode::F6),
attack: KeyMouse::Mouse(MouseButton::Left),
block: KeyMouse::Mouse(MouseButton::Right),
roll: KeyMouse::Mouse(MouseButton::Middle),
interact: KeyMouse::Key(VirtualKeyCode::E),
}

61
voxygen/src/window.rs
View File

@ -11,6 +11,8 @@ use vek::*;
/// Represents a key that the game recognises after keyboard mapping.
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Deserialize, Serialize)]
pub enum GameInput {
Main,
Alt,
ToggleCursor,
MoveForward,
MoveBack,
@ -34,8 +36,6 @@ pub enum GameInput {
Fullscreen,
Screenshot,
ToggleIngameUi,
Attack,
Block,
Roll,
Respawn,
Interact,
@ -109,6 +109,8 @@ impl Window {
.map_err(|err| Error::BackendError(Box::new(err)))?;
let mut key_map = HashMap::new();
key_map.insert(settings.controls.main, GameInput::Main);
key_map.insert(settings.controls.alt, GameInput::Alt);
key_map.insert(settings.controls.toggle_cursor, GameInput::ToggleCursor);
key_map.insert(settings.controls.escape, GameInput::Escape);
key_map.insert(settings.controls.enter, GameInput::Enter);
@ -141,8 +143,6 @@ impl Window {
settings.controls.toggle_ingame_ui,
GameInput::ToggleIngameUi,
);
key_map.insert(settings.controls.attack, GameInput::Attack);
key_map.insert(settings.controls.block, GameInput::Block);
key_map.insert(settings.controls.roll, GameInput::Roll);
key_map.insert(settings.controls.interact, GameInput::Interact);
@ -222,51 +222,21 @@ impl Window {
Some(key) => match key_map.get(&KeyMouse::Key(key)) {
Some(GameInput::Fullscreen) => {
if input.state == glutin::ElementState::Pressed
&& !Self::is_event_key_held(keypress_map, GameInput::Fullscreen)
&& !Self::is_pressed(keypress_map, GameInput::Fullscreen)
{
toggle_fullscreen = !toggle_fullscreen;
}
Self::update_keypress_map(
keypress_map,
GameInput::Fullscreen,
input.state,
);
Self::set_pressed(keypress_map, GameInput::Fullscreen, input.state);
}
Some(GameInput::Screenshot) => {
take_screenshot = input.state == glutin::ElementState::Pressed
&& !Self::is_event_key_held(
keypress_map,
GameInput::Screenshot,
);
Self::update_keypress_map(
keypress_map,
GameInput::Screenshot,
input.state,
);
}
Some(&game_input)
if game_input == GameInput::MoveForward
|| game_input == GameInput::MoveBack
|| game_input == GameInput::MoveLeft
|| game_input == GameInput::MoveRight
|| game_input == GameInput::Jump
|| game_input == GameInput::Glide
|| game_input == GameInput::Attack
|| game_input == GameInput::Roll =>
{
events.push(Event::InputUpdate(
game_input,
input.state == glutin::ElementState::Pressed,
))
}
Some(&game_input) => {
if input.state == glutin::ElementState::Pressed
&& !Self::is_event_key_held(keypress_map, game_input)
{
events.push(Event::InputUpdate(game_input, true));
}
Self::update_keypress_map(keypress_map, game_input, input.state);
&& !Self::is_pressed(keypress_map, GameInput::Screenshot);
Self::set_pressed(keypress_map, GameInput::Screenshot, input.state);
}
Some(&game_input) => events.push(Event::InputUpdate(
game_input,
input.state == glutin::ElementState::Pressed,
)),
_ => {}
},
_ => {}
@ -386,15 +356,12 @@ impl Window {
}
}
fn is_event_key_held(
map: &mut HashMap<GameInput, glutin::ElementState>,
input: GameInput,
) -> bool {
fn is_pressed(map: &mut HashMap<GameInput, glutin::ElementState>, input: GameInput) -> bool {
*(map.entry(input).or_insert(glutin::ElementState::Released))
== glutin::ElementState::Pressed
}
fn update_keypress_map(
fn set_pressed(
map: &mut HashMap<GameInput, glutin::ElementState>,
input: GameInput,
state: glutin::ElementState,