From 2a06c0fda83ccfc7c527a1aad5c9c6ef00c4ea1d Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 19 Oct 2016 16:39:55 +1100 Subject: [PATCH] OpenTK: Make Key enum much more concise --- ClassicalSharp/Game/KeyMap.cs | 2 +- OpenTK/Input/Key.cs | 294 +++------------------------ OpenTK/Platform/Windows/WinKeyMap.cs | 3 - 3 files changed, 28 insertions(+), 271 deletions(-) diff --git a/ClassicalSharp/Game/KeyMap.cs b/ClassicalSharp/Game/KeyMap.cs index 839c2511c..61d3f2f3d 100644 --- a/ClassicalSharp/Game/KeyMap.cs +++ b/ClassicalSharp/Game/KeyMap.cs @@ -6,7 +6,7 @@ namespace ClassicalSharp { public enum KeyBind { Forward, Back, Left, Right, Jump, Respawn, SetSpawn, Chat, - Inventory, ToggleFog, SendChat, PauseOrExit, PlayerList, + Inventory, ToggleFog, SendChat, PauseOrExit, PlayerList, Speed, NoClip, Fly, FlyUp, FlyDown, ExtInput, HideFps, Screenshot, Fullscreen, ThirdPerson, HideGui, AxisLines, ZoomScrolling, HalfSpeed, MouseLeft, MouseMiddle, MouseRight, diff --git a/OpenTK/Input/Key.cs b/OpenTK/Input/Key.cs index 8cff94917..fccc9f61a 100644 --- a/OpenTK/Input/Key.cs +++ b/OpenTK/Input/Key.cs @@ -25,291 +25,51 @@ // #endregion -namespace OpenTK.Input -{ +namespace OpenTK.Input { /// The available keyboard keys. - public enum Key : int - { - /// A key outside the known keys. + public enum Key : int { + // Key outside the known keys Unknown = 0, // Modifiers - /// The left shift key. - ShiftLeft, - /// The right shift key. - ShiftRight, - /// The left control key. - ControlLeft, - /// The right control key. - ControlRight, - /// The left alt key. - AltLeft, - /// The right alt key. - AltRight, - /// The left win key. - WinLeft, - /// The right win key. - WinRight, - /// The menu key. - Menu, + ShiftLeft, ShiftRight, ControlLeft, ControlRight, + AltLeft, AltRight, WinLeft, WinRight, Menu, // Function keys (hopefully enough for most keyboards - mine has 26) // on X11 reports up to 35 function keys. - /// The F1 key. - F1, - /// The F2 key. - F2, - /// The F3 key. - F3, - /// The F4 key. - F4, - /// The F5 key. - F5, - /// The F6 key. - F6, - /// The F7 key. - F7, - /// The F8 key. - F8, - /// The F9 key. - F9, - /// The F10 key. - F10, - /// The F11 key. - F11, - /// The F12 key. - F12, - /// The F13 key. - F13, - /// The F14 key. - F14, - /// The F15 key. - F15, - /// The F16 key. - F16, - /// The F17 key. - F17, - /// The F18 key. - F18, - /// The F19 key. - F19, - /// The F20 key. - F20, - /// The F21 key. - F21, - /// The F22 key. - F22, - /// The F23 key. - F23, - /// The F24 key. - F24, - /// The F25 key. - F25, - /// The F26 key. - F26, - /// The F27 key. - F27, - /// The F28 key. - F28, - /// The F29 key. - F29, - /// The F30 key. - F30, - /// The F31 key. - F31, - /// The F32 key. - F32, - /// The F33 key. - F33, - /// The F34 key. - F34, - /// The F35 key. - F35, + F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, + F11, F12, F13, F14, F15, F16, F17, F18, F19, F20, + F21, F22, F23, F24, F25, F26, F27, F28, F29, F30, + F31, F32, F33, F34, F35, // Direction arrows - /// The up arrow key. - Up, - /// The down arrow key. - Down, - /// The left arrow key. - Left, - /// The right arrow key. - Right, + Up, Down, Left, Right, - /// The enter key. - Enter, - /// The escape key. - Escape, - /// The space key. - Space, - /// The tab key. - Tab, - /// The backspace key. - BackSpace, - /// The insert key. - Insert, - /// The delete key. - Delete, - /// The page up key. - PageUp, - /// The page down key. - PageDown, - /// The home key. - Home, - /// The end key. - End, - /// The caps lock key. - CapsLock, - /// The scroll lock key. - ScrollLock, - /// The print screen key. - PrintScreen, - /// The pause key. - Pause, - /// The num lock key. - NumLock, - - // Special keys - /// The clear key (Keypad5 with NumLock disabled, on typical keyboards). - Clear, - /// The sleep key. - Sleep, + // Action keys + Enter, Escape, Space, Tab, BackSpace, Insert, + Delete, PageUp, PageDown, Home, End, CapsLock, + ScrollLock, PrintScreen, Pause, NumLock, // Keypad keys - /// The keypad 0 key. - Keypad0, - /// The keypad 1 key. - Keypad1, - /// The keypad 2 key. - Keypad2, - /// The keypad 3 key. - Keypad3, - /// The keypad 4 key. - Keypad4, - /// The keypad 5 key. - Keypad5, - /// The keypad 6 key. - Keypad6, - /// The keypad 7 key. - Keypad7, - /// The keypad 8 key. - Keypad8, - /// The keypad 9 key. - Keypad9, - /// The keypad divide key. - KeypadDivide, - /// The keypad multiply key. - KeypadMultiply, - /// The keypad subtract key. - KeypadSubtract, - /// The keypad add key. - KeypadAdd, - /// The keypad decimal key. - KeypadDecimal, - /// The keypad enter key. - KeypadEnter, + Keypad0, Keypad1, Keypad2, Keypad3, Keypad4, + Keypad5, Keypad6, Keypad7, Keypad8, Keypad9, + KeypadDivide, KeypadMultiply, KeypadSubtract, + KeypadAdd, KeypadDecimal, KeypadEnter, // Letters - /// The A key. - A, - /// The B key. - B, - /// The C key. - C, - /// The D key. - D, - /// The E key. - E, - /// The F key. - F, - /// The G key. - G, - /// The H key. - H, - /// The I key. - I, - /// The J key. - J, - /// The K key. - K, - /// The L key. - L, - /// The M key. - M, - /// The N key. - N, - /// The O key. - O, - /// The P key. - P, - /// The Q key. - Q, - /// The R key. - R, - /// The S key. - S, - /// The T key. - T, - /// The U key. - U, - /// The V key. - V, - /// The W key. - W, - /// The X key. - X, - /// The Y key. - Y, - /// The Z key. - Z, + A, B, C, D, E, F, G, H, I, J, + K, L, M, N, O, P, Q, R, S, T, + U, V, W, X, Y, Z, // Numbers - /// The number 0 key. - Number0, - /// The number 1 key. - Number1, - /// The number 2 key. - Number2, - /// The number 3 key. - Number3, - /// The number 4 key. - Number4, - /// The number 5 key. - Number5, - /// The number 6 key. - Number6, - /// The number 7 key. - Number7, - /// The number 8 key. - Number8, - /// The number 9 key. - Number9, + Number0, Number1, Number2, Number3, Number4, + Number5, Number6, Number7, Number8, Number9, // Symbols - /// The tilde key. - Tilde, - /// The minus key. - Minus, - //Equal, - /// The plus key. - Plus, - /// The left bracket key. - BracketLeft, - /// The right bracket key. - BracketRight, - /// The semicolon key. - Semicolon, - /// The quote key. - Quote, - /// The comma key. - Comma, - /// The period key. - Period, - /// The slash key. - Slash, - /// The backslash key. - BackSlash, - /// Indicates the last available keyboard key. + Tilde, Minus, Plus, BracketLeft, BracketRight, + Semicolon, Quote, Comma, Period, Slash, BackSlash, + + // Last available keyboard key LastKey } } \ No newline at end of file diff --git a/OpenTK/Platform/Windows/WinKeyMap.cs b/OpenTK/Platform/Windows/WinKeyMap.cs index 1c4eadd7a..5601d23e5 100644 --- a/OpenTK/Platform/Windows/WinKeyMap.cs +++ b/OpenTK/Platform/Windows/WinKeyMap.cs @@ -69,11 +69,8 @@ internal class WinKeyMap : Dictionary { AddKey(VirtualKeys.SCROLL, Key.ScrollLock); AddKey(VirtualKeys.SNAPSHOT, Key.PrintScreen); - AddKey(VirtualKeys.CLEAR, Key.Clear); AddKey(VirtualKeys.INSERT, Key.Insert); - AddKey(VirtualKeys.SLEEP, Key.Sleep); - // Keypad for (int i = 0; i <= 9; i++) { AddKey((VirtualKeys)((int)VirtualKeys.NUMPAD0 + i), Key.Keypad0 + i);