diff options
author | Matthew Michelotti <michelotti.matthew@gmail.com> | 2018-05-24 23:57:41 -0500 |
---|---|---|
committer | Matthew Michelotti <michelotti.matthew@gmail.com> | 2018-05-24 23:57:41 -0500 |
commit | 69d101be10c9d590bb9f74a458bb8be0ed072085 (patch) | |
tree | d080676c81c7c99da4a0604b01dabcb63f9fb167 | |
parent | 7b2a22f835f84c6342df9f9de683cb3d8c4e3501 (diff) |
added some additional keyboard keys
-rw-r--r-- | gate/src/core/sdl/event_handler.rs | 2 | ||||
-rw-r--r-- | gate/src/input.rs | 3 | ||||
-rw-r--r-- | gate_build/src/html/gate.js | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gate/src/core/sdl/event_handler.rs b/gate/src/core/sdl/event_handler.rs index 7470477..e3a6712 100644 --- a/gate/src/core/sdl/event_handler.rs +++ b/gate/src/core/sdl/event_handler.rs @@ -123,6 +123,8 @@ fn sdl_to_gate_key(sdl: SdlKeyCode) -> Option<KeyCode> { SdlKeyCode::Up => Some(KeyCode::Up), SdlKeyCode::Return => Some(KeyCode::Return), SdlKeyCode::Space => Some(KeyCode::Space), + SdlKeyCode::Backspace => Some(KeyCode::Backspace), + SdlKeyCode::Delete => Some(KeyCode::Delete), _ => None, } } diff --git a/gate/src/input.rs b/gate/src/input.rs index 2a05aba..d00a45c 100644 --- a/gate/src/input.rs +++ b/gate/src/input.rs @@ -25,12 +25,13 @@ pub enum KeyCode { Right, Left, Down, Up, Return, Space, + Backspace, Delete, MouseLeft, MouseRight, MouseMiddle, } #[cfg(target_arch = "wasm32")] impl KeyCode { - fn count() -> u8 { KeyCode::Space as u8 + 1 } + fn count() -> u8 { KeyCode::MouseMiddle as u8 + 1 } pub(crate) fn from_u8(id: u8) -> Option<KeyCode> { if id < Self::count() { Some(unsafe { mem::transmute(id) }) } else { None } } diff --git a/gate_build/src/html/gate.js b/gate_build/src/html/gate.js index 0e9c98b..6c0ed43 100644 --- a/gate_build/src/html/gate.js +++ b/gate_build/src/html/gate.js @@ -23,7 +23,7 @@ function makeKeycodesMap () { "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "ArrowRight", "ArrowLeft", "ArrowDown", "ArrowUp", - "Enter", " ", + "Enter", " ", "Backspace", "Delete" ]; for (var i = 0; i < keycodesArray.length; i++) { result[keycodesArray[i]] = i; |