Windows keycodes, moved gamepad keycodes (Android) to keycodes header

This commit is contained in:
saschawillems 2016-08-04 21:18:48 +02:00
parent 563d7c4b9c
commit ed71ae00c3
3 changed files with 24 additions and 19 deletions

View file

@ -11,7 +11,11 @@
#if defined(_WIN32)
#define KEY_ESCAPE VK_ESCAPE
#define KEY_F1 VK_F1
#define KEY_F1 VK_F2
#define KEY_F2 VK_F2
#define KEY_W 0x57
#define KEY_A 0x41
#define KEY_S 0x53
#define KEY_D 0x44
#define KEY_P 0x50
#elif defined(__ANDROID__)
#elif defined(__linux__)
@ -24,3 +28,12 @@
#define KEY_F1 0x43
#define KEY_F2 0x44
#endif
// todo: Android gamepad keycodes outside of define for now
#define GAMEPAD_BUTTON_A 0x1000
#define GAMEPAD_BUTTON_B 0x1001
#define GAMEPAD_BUTTON_X 0x1002
#define GAMEPAD_BUTTON_Y 0x1003
#define GAMEPAD_BUTTON_L1 0x1004
#define GAMEPAD_BUTTON_R1 0x1005
#define GAMEPAD_BUTTON_START 0x1006

View file

@ -1039,7 +1039,7 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
textOverlay->visible = !textOverlay->visible;
}
break;
case VK_ESCAPE:
case KEY_ESCAPE:
PostQuitMessage(0);
break;
}
@ -1048,16 +1048,16 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
{
switch (wParam)
{
case 0x57:
case KEY_W:
camera.keys.up = true;
break;
case 0x53:
case KEY_S:
camera.keys.down = true;
break;
case 0x41:
case KEY_A:
camera.keys.left = true;
break;
case 0x44:
case KEY_D:
camera.keys.right = true;
break;
}
@ -1070,16 +1070,16 @@ void VulkanExampleBase::handleMessages(HWND hWnd, UINT uMsg, WPARAM wParam, LPAR
{
switch (wParam)
{
case 0x57:
case KEY_W:
camera.keys.up = false;
break;
case 0x53:
case KEY_S:
camera.keys.down = false;
break;
case 0x41:
case KEY_A:
camera.keys.left = false;
break;
case 0x44:
case KEY_D:
camera.keys.right = false;
break;
}

View file

@ -44,14 +44,6 @@
#include "vulkantextoverlay.hpp"
#include "camera.hpp"
#define GAMEPAD_BUTTON_A 0x1000
#define GAMEPAD_BUTTON_B 0x1001
#define GAMEPAD_BUTTON_X 0x1002
#define GAMEPAD_BUTTON_Y 0x1003
#define GAMEPAD_BUTTON_L1 0x1004
#define GAMEPAD_BUTTON_R1 0x1005
#define GAMEPAD_BUTTON_START 0x1006
// Function pointer for getting physical device fetures to be enabled
typedef VkPhysicalDeviceFeatures (*PFN_GetEnabledFeatures)();