diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 42 | ||||
| -rw-r--r-- | src/window.cpp | 95 |
2 files changed, 111 insertions, 26 deletions
diff --git a/src/main.cpp b/src/main.cpp index d7e6462..9d4a0bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -72,32 +72,34 @@ int main() { break; } case EVENT_TYPES::KEY_PRESS: { - auto move_speed = 0.1; - if (event.modifiers & MODIFIERS::SHIFT) { - move_speed *= 10; + auto move_speed = 0.1f; + if (wnd.keyboard[KEYS::SHIFT]) { + move_speed *= 10.f; } - switch((uint8_t)event.keycode) { - case('w'): { - renderer.mapped_data->cam.move(renderer.mapped_data->cam.forward * move_speed); - break; - } - case('s'): { - renderer.mapped_data->cam.move(-renderer.mapped_data->cam.forward * move_speed); - break; - } - case('d'): { - renderer.mapped_data->cam.move(renderer.mapped_data->cam.right * move_speed); - break; - } - case('a'): { - renderer.mapped_data->cam.move(-renderer.mapped_data->cam.right * move_speed); - break; - } + vec3 move_vec {}; + if (wnd.keyboard[KEYS::W]) { + move_vec += renderer.mapped_data->cam.forward; } + if (wnd.keyboard[KEYS::S]) { + move_vec += -renderer.mapped_data->cam.forward; + } + if (wnd.keyboard[KEYS::D]) { + move_vec += renderer.mapped_data->cam.right; + } + if (wnd.keyboard[KEYS::A]) { + move_vec += -renderer.mapped_data->cam.right; + } + + move_vec = move_vec.unit() * move_speed; + + renderer.mapped_data->cam.move(move_vec); + + break; } case EVENT_TYPES::MOVE: { std::cerr << "X : " << event.x << " Y : " << event.y << std::endl; + break; } default: { } diff --git a/src/window.cpp b/src/window.cpp index 43fff2a..273d7e9 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -123,11 +123,10 @@ void window::poll_events() { auto keysym = xkb_state_key_get_one_sym(keyboard_state, key_press_event->detail); struct event new_event = { .type = event->response_type == XCB_KEY_PRESS ? EVENT_TYPES::KEY_PRESS :EVENT_TYPES::KEY_RELEASE + .modifiers = key_press_event->state; + .keycode = keysym; }; - new_event.modifiers = key_press_event->state; - new_event.keycode = keysym; - events.push_back(new_event); break; } @@ -166,6 +165,10 @@ void window::poll_events() { } #elif defined(WINDOWS) + +#include <windowsx.h> +#include <cctype> + LRESULT CALLBACK window::window_procedure(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lparam) { window* win = nullptr; @@ -219,6 +222,8 @@ window::window(uint32_t width, uint32_t height) isOpen = true; } +window::~window() {} + void window::poll_events() { MSG msg = {}; @@ -235,7 +240,7 @@ LRESULT window::message_handler(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lpar case WM_QUIT: { events.push_back({ .type = EVENT_TYPES::QUIT }); isOpen = false; - return 0; + break; } case WM_SIZE: { width = LOWORD(lparam); @@ -246,9 +251,87 @@ LRESULT window::message_handler(HWND hwnd, UINT umsg, WPARAM wparam, LPARAM lpar .height = height, .type = EVENT_TYPES::RESIZE }); - return 0; + break; + } + + case WM_KEYDOWN: { + auto key_press_event = event { + .key = (KEYS)wparam, + .type = EVENT_TYPES::KEY_PRESS, + }; + + keyboard[wparam] = true; + + events.push_back(key_press_event); + break; + } + + case WM_KEYUP: { + auto key_press_event = event { + .key = (KEYS)wparam, + .type = EVENT_TYPES::KEY_RELEASE, + }; + + keyboard[wparam] = false; + + events.push_back(key_press_event); + break; + } + + case WM_LBUTTONDOWN: { + events.push_back({ + .button = BUTTONS::LEFT, + .type = EVENT_TYPES::BUTTON_PRESS, + }); + break; + } + case WM_LBUTTONUP: { + events.push_back({ + .button = BUTTONS::LEFT, + .type = EVENT_TYPES::BUTTON_RELEASE, + }); + break; + } + case WM_RBUTTONDOWN: { + events.push_back({ + .button = BUTTONS::RIGHT, + .type = EVENT_TYPES::BUTTON_PRESS, + }); + break; + } + case WM_RBUTTONUP: { + events.push_back({ + .button = BUTTONS::RIGHT, + .type = EVENT_TYPES::BUTTON_RELEASE, + }); + break; + } + case WM_MBUTTONDOWN: { + events.push_back({ + .button = BUTTONS::MIDDLE, + .type = EVENT_TYPES::BUTTON_PRESS, + }); + break; + } + case WM_MBUTTONUP: { + events.push_back({ + .button = BUTTONS::MIDDLE, + .type = EVENT_TYPES::BUTTON_RELEASE, + }); + break; + } + case WM_MOUSEMOVE: { + events.push_back({ + .x = GET_X_LPARAM(lparam), + .y = GET_Y_LPARAM(lparam), + .type = EVENT_TYPES::MOVE, + }); + break; + } + default: { + return DefWindowProc(hwnd, umsg, wparam, lparam); } } - return DefWindowProc(hwnd, umsg, wparam, lparam); + return 0; } #endif |