jan.mrna/pathfinding_demo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move UserInput implementation to user_input.cpp

Browse Source
This commit is contained in:
Jan Mrna 2025-09-27 14:46:13 +02:00
parent e31a45b229
commit 1941c4c29a
3 changed files with 104 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/Makefile
View File

@ -3,7 +3,7 @@ all: test pathfinding
# TODO linter? # TODO linter?
pathfinding: pathfinding:
g++ -Wall -ggdb3 -lSDL3 -lSDL3_image -std=c++23 -lGLEW -lGL -o pathfinding src/main.cpp src/sprite.cpp src/entities.cpp src/gameloop.cpp src/map.cpp src/pathfindingdemo.cpp src/tile.cpp g++ -Wall -ggdb3 -lSDL3 -lSDL3_image -std=c++23 -lGLEW -lGL -o pathfinding src/main.cpp src/sprite.cpp src/entities.cpp src/gameloop.cpp src/map.cpp src/pathfindingdemo.cpp src/tile.cpp src/user_input.cpp
test: src/test.cpp src/array.hpp test: src/test.cpp src/array.hpp
g++ -Wall -Wextra -Wpedantic -ggdb3 -std=c++23 -lgtest -o test src/test.cpp g++ -Wall -Wextra -Wpedantic -ggdb3 -std=c++23 -lgtest -o test src/test.cpp

91
cpp/src/user_input.cpp
View File

@ -0,0 +1,91 @@
#include <SDL3/SDL.h>
#include <expected>
#include <map>
#include <string>
#include <vector>
#include "user_input.hpp"
#include "log.hpp"
#include "math.hpp"
UserInput::UserInput()
: // pre-alloc some space
m_Actions(10) {
LOG_DEBUG(".");
};
UserInput::~UserInput() { LOG_DEBUG("."); };
std::expected<void, std::string> UserInput::Init() { return {}; }
const std::vector<UserAction> &UserInput::GetActions() {
m_Actions.clear();
static WorldPos move_direction = {0.0f, 0.0f};
static bool send_move_action = false;
SDL_Event event;
while (SDL_PollEvent(&event)) {
if (event.type == SDL_EVENT_KEY_DOWN || event.type == SDL_EVENT_KEY_UP) {
bool key_down = event.type == SDL_EVENT_KEY_DOWN ? true : false;
SDL_KeyboardEvent kbd_event = event.key;
if (kbd_event.repeat) {
// SDL repeats KEY_DOWN if key is held down, we ignore that
continue;
}
LOG_DEBUG("Key '", static_cast<char>(kbd_event.key),
key_down ? "' down" : "' up");
switch (kbd_event.key) {
case 'q':
m_Actions.emplace_back(UserAction::Type::EXIT);
// further processing of inputs is not needed
return m_Actions;
case 'w':
case 's':
case 'a':
case 'd':
case SDLK_UP:
case SDLK_DOWN:
case SDLK_LEFT:
case SDLK_RIGHT: {
static std::map<char, WorldPos> move_base{
{'w', {0.0, 1.0}},
{'s', {0.0, -1.0}},
{'a', {1.0, 0.0}},
{'d', {-1.0, 0.0}},
{static_cast<char>(SDLK_UP), {0.0, 1.0}},
{static_cast<char>(SDLK_DOWN), {0.0, -1.0}},
{static_cast<char>(SDLK_LEFT), {1.0, 0.0}},
{static_cast<char>(SDLK_RIGHT), {-1.0, 0.0}},
};
float direction = key_down ? -1.0f : 1.0f;
send_move_action = true;
move_direction += move_base[kbd_event.key] * direction;
break;
}
case SDLK_SPACE:
if (key_down)
m_Actions.emplace_back(UserAction::Type::FIRE);
break;
default:
LOG_INFO("Key '", static_cast<char>(kbd_event.key), "' not mapped");
break;
}
} else if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN) {
SDL_MouseButtonEvent mouse_event = event.button;
LOG_DEBUG("Mouse down: ", mouse_event.x, ", ", mouse_event.y);
m_Actions.emplace_back(UserAction::Type::MOVE_TARGET,
WorldPos{mouse_event.x, mouse_event.y});
} else {
// TODO uncomment, for now too much noise
// LOG_WARNING("Action not processed");
}
}
if (send_move_action) {
m_Actions.emplace_back(UserAction::Type::MOVE, move_direction.normalized());
send_move_action = false;
}
return m_Actions;
}

102
cpp/src/user_input.hpp
View File

@ -1,121 +1,43 @@
#pragma once #pragma once
#include <SDL3/SDL.h>
#include <vector>
#include <map>
#include <string>
#include <expected> #include <expected>
#include <string>
#include <vector>
#include "math.hpp"
#include "log.hpp" #include "log.hpp"
#include "math.hpp"
class UserAction { class UserAction {
public: public:
enum class Type { NONE, EXIT, MOVE, CROUCH, STAND, FIRE, MOVE_TARGET}; enum class Type { NONE, EXIT, MOVE, CROUCH, STAND, FIRE, MOVE_TARGET };
UserAction() = default; UserAction() = default;
UserAction(Type t) : type(t) {} UserAction(Type t) : type(t) {}
UserAction(Type t, char key) : type(t), Argument{.key = key} {} UserAction(Type t, char key) : type(t), Argument{.key = key} {}
UserAction(Type t, WorldPos v) : type(t), Argument{.position = v} {}
UserAction(Type t, Vec2D<float> v) : type(t), Argument{.position = v} {}
~UserAction() = default; ~UserAction() = default;
Type type; Type type;
union { union {
Vec2D<float> position; WorldPos position;
char key; char key;
} Argument; } Argument;
}; };
class UserInput { class UserInput {
public: public:
UserInput() UserInput();
: // pre-alloc some space ~UserInput();
m_Actions(10) {
LOG_DEBUG(".");
};
UserInput(const UserInput &x) = delete; UserInput(const UserInput &x) = delete;
UserInput(UserInput &&x) = delete; UserInput(UserInput &&x) = delete;
~UserInput() { LOG_DEBUG("."); }; UserInput &operator=(const UserInput &) = delete;
UserInput &operator=(UserInput &&) = delete;
std::expected<void, std::string> Init() { return {}; } std::expected<void, std::string> Init();
const std::vector<UserAction> &GetActions() { const std::vector<UserAction> &GetActions();
m_Actions.clear();
static Vec2D<float> move_direction = {0.0f, 0.0f};
static bool send_move_action = false;
SDL_Event event;
while (SDL_PollEvent(&event)) {
if (event.type == SDL_EVENT_KEY_DOWN || event.type == SDL_EVENT_KEY_UP) {
bool key_down = event.type == SDL_EVENT_KEY_DOWN ? true : false;
SDL_KeyboardEvent kbd_event = event.key;
if (kbd_event.repeat) {
// SDL repeats KEY_DOWN if key is held down, we ignore that
continue;
}
LOG_DEBUG("Key '", static_cast<char>(kbd_event.key),
key_down ? "' down" : "' up");
switch (kbd_event.key) {
case 'q':
m_Actions.emplace_back(UserAction::Type::EXIT);
// further processing of inputs is not needed
return m_Actions;
case 'w':
case 's':
case 'a':
case 'd':
case SDLK_UP:
case SDLK_DOWN:
case SDLK_LEFT:
case SDLK_RIGHT: {
static std::map<char, Vec2D<float>> move_base{
{'w', {0.0, 1.0}},
{'s', {0.0, -1.0}},
{'a', {1.0, 0.0}},
{'d', {-1.0, 0.0}},
{static_cast<char>(SDLK_UP), {0.0, 1.0}},
{static_cast<char>(SDLK_DOWN), {0.0, -1.0}},
{static_cast<char>(SDLK_LEFT), {1.0, 0.0}},
{static_cast<char>(SDLK_RIGHT), {-1.0, 0.0}},
};
float direction = key_down ? -1.0f : 1.0f;
send_move_action = true;
move_direction += move_base[kbd_event.key] * direction;
break;
}
case SDLK_SPACE:
if (key_down)
m_Actions.emplace_back(UserAction::Type::FIRE);
break;
default:
LOG_INFO("Key '", static_cast<char>(kbd_event.key), "' not mapped");
break;
}
} else if (event.type == SDL_EVENT_MOUSE_BUTTON_DOWN) {
SDL_MouseButtonEvent mouse_event = event.button;
LOG_DEBUG("Mouse down: ", mouse_event.x, ", ", mouse_event.y);
m_Actions.emplace_back(UserAction::Type::MOVE_TARGET,
Vec2D<float>{mouse_event.x, mouse_event.y});
} else {
// TODO uncomment, for now too much noise
// LOG_WARNING("Action not processed");
}
}
if (send_move_action) {
m_Actions.emplace_back(UserAction::Type::MOVE,
move_direction.normalized());
send_move_action = false;
}
return m_Actions;
}
private: private:
std::vector<UserAction> m_Actions; std::vector<UserAction> m_Actions;