From 7c6cf45d3ca015be74ef021ed6978dd74f527223 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 2 Feb 2020 00:34:13 +0100 Subject: [PATCH] include/Spectre/Input/Keyboard.h: Fix CamelCase for some enum values. --- include/Spectre/Input/Keyboard.h | 22 ++++++++++----------- source/Input/Keyboard.cpp | 22 ++++++++++----------- source/Platform/Win32/Win32Keyboard.cpp | 26 ++++++++++++------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/include/Spectre/Input/Keyboard.h b/include/Spectre/Input/Keyboard.h index 1d9f998..b6ce394 100644 --- a/include/Spectre/Input/Keyboard.h +++ b/include/Spectre/Input/Keyboard.h @@ -59,17 +59,17 @@ public : Down, Left, Right, - NUMPAD_1, - NUMPAD_2, - NUMPAD_3, - NUMPAD_4, - NUMPAD_5, - NUMPAD_6, - NUMPAD_7, - NUMPAD_8, - NUMPAD_9, - NUMPAD_0, - NUMPAD_Enter, + Numpad1, + Numpad2, + Numpad3, + Numpad4, + Numpad5, + Numpad6, + Numpad7, + Numpad8, + Numpad9, + Numpad0, + NumpadEnter, Home, End, Insert, diff --git a/source/Input/Keyboard.cpp b/source/Input/Keyboard.cpp index de07b14..0b200fb 100644 --- a/source/Input/Keyboard.cpp +++ b/source/Input/Keyboard.cpp @@ -62,17 +62,17 @@ struct keyentry table[] = { MapSym(Keyboard::Key::Right, "Right"), // Numpad - MapSym(Keyboard::Key::NUMPAD_1, "Numpad 1"), - MapSym(Keyboard::Key::NUMPAD_2, "Numpad 2"), - MapSym(Keyboard::Key::NUMPAD_3, "Numpad 3"), - MapSym(Keyboard::Key::NUMPAD_4, "Numpad 4"), - MapSym(Keyboard::Key::NUMPAD_5, "Numpad 5"), - MapSym(Keyboard::Key::NUMPAD_6, "Numpad 6"), - MapSym(Keyboard::Key::NUMPAD_7, "Numpad 7"), - MapSym(Keyboard::Key::NUMPAD_8, "Numpad 8"), - MapSym(Keyboard::Key::NUMPAD_9, "Numpad 9"), - MapSym(Keyboard::Key::NUMPAD_0, "Numpad 0"), - MapSym(Keyboard::Key::NUMPAD_Enter, "Numpad Enter"), + MapSym(Keyboard::Key::Numpad1, "Numpad 1"), + MapSym(Keyboard::Key::Numpad2, "Numpad 2"), + MapSym(Keyboard::Key::Numpad3, "Numpad 3"), + MapSym(Keyboard::Key::Numpad4, "Numpad 4"), + MapSym(Keyboard::Key::Numpad5, "Numpad 5"), + MapSym(Keyboard::Key::Numpad6, "Numpad 6"), + MapSym(Keyboard::Key::Numpad7, "Numpad 7"), + MapSym(Keyboard::Key::Numpad8, "Numpad 8"), + MapSym(Keyboard::Key::Numpad9, "Numpad 9"), + MapSym(Keyboard::Key::Numpad0, "Numpad 0"), + MapSym(Keyboard::Key::NumpadEnter, "Numpad Enter"), MapSym(Keyboard::Key::Home, "Home"), MapSym(Keyboard::Key::End, "End"), diff --git a/source/Platform/Win32/Win32Keyboard.cpp b/source/Platform/Win32/Win32Keyboard.cpp index 64d1304..ec53e9c 100644 --- a/source/Platform/Win32/Win32Keyboard.cpp +++ b/source/Platform/Win32/Win32Keyboard.cpp @@ -62,17 +62,17 @@ static const BYTE keyToWin32[Keyboard::Key::NUM_KEYS] = { VK_LEFT, // Left VK_RIGHT, // Right - VK_NUMPAD1, // NUMPAD_1 - VK_NUMPAD2, // NUMPAD_2 - VK_NUMPAD3, // NUMPAD_3 - VK_NUMPAD4, // NUMPAD_4 - VK_NUMPAD5, // NUMPAD_5 - VK_NUMPAD6, // NUMPAD_6 - VK_NUMPAD7, // NUMPAD_7 - VK_NUMPAD8, // NUMPAD_8 - VK_NUMPAD9, // NUMPAD_9 - VK_NUMPAD0, // NUMPAD_0 - 0x0, // NUMPAD_Enter + VK_NUMPAD1, // Numpad1 + VK_NUMPAD2, // Numpad2 + VK_NUMPAD3, // Numpad3 + VK_NUMPAD4, // Numpad4 + VK_NUMPAD5, // Numpad5 + VK_NUMPAD6, // Numpad6 + VK_NUMPAD7, // Numpad7 + VK_NUMPAD8, // Numpad8 + VK_NUMPAD9, // Numpad9 + VK_NUMPAD0, // Numpad0 + 0x0, // NumpadEnter VK_HOME, // Home VK_END, // End @@ -126,8 +126,8 @@ static const Keyboard::Key deviceToKey[256] = { Keyboard::Key::P, Keyboard::Key::Q, Keyboard::Key::R, Keyboard::Key::S, Keyboard::Key::T, Keyboard::Key::U, Keyboard::Key::V, Keyboard::Key::W, Keyboard::Key::X, Keyboard::Key::Y, Keyboard::Key::Z, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, // 60-6F - Keyboard::Key::NUMPAD_0, Keyboard::Key::NUMPAD_1, Keyboard::Key::NUMPAD_2, Keyboard::Key::NUMPAD_3, Keyboard::Key::NUMPAD_4, Keyboard::Key::NUMPAD_5, Keyboard::Key::NUMPAD_6, Keyboard::Key::NUMPAD_7, - Keyboard::Key::NUMPAD_8, Keyboard::Key::NUMPAD_9, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, + Keyboard::Key::Numpad0, Keyboard::Key::Numpad1, Keyboard::Key::Numpad2, Keyboard::Key::Numpad3, Keyboard::Key::Numpad4, Keyboard::Key::Numpad5, Keyboard::Key::Numpad6, Keyboard::Key::Numpad7, + Keyboard::Key::Numpad8, Keyboard::Key::Numpad9, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, // 70-7F Keyboard::Key::F1, Keyboard::Key::F2, Keyboard::Key::F3, Keyboard::Key::F4, Keyboard::Key::F5, Keyboard::Key::F6, Keyboard::Key::F7, Keyboard::Key::F8, Keyboard::Key::F9, Keyboard::Key::F10, Keyboard::Key::F11, Keyboard::Key::F12, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown, Keyboard::Key::Unknown,