MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-20 11:46:36 +02:00
Code Issues Projects Releases Wiki Activity

adopt engine stuff to new update strategy

Browse Source
This commit is contained in:
Green Sky
2020-12-26 19:29:39 +01:00
parent c1ae30c89c
commit 840b663d5e
28 changed files with 351 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
framework/input/src/mm/services/input_service.cpp
View File

@ -1,5 +1,7 @@
#include "./input_service.hpp"
#include <entt/core/hashed_string.hpp>
#include <glm/common.hpp>
#include <glm/geometric.hpp>
#include <glm/trigonometric.hpp>
@ -88,24 +90,6 @@ bool InputService::enable(Engine& engine) {
return false;
}
_update_handle = engine.addFixedUpdate([this](MM::Engine&) {
for (size_t i = 0; i < 4; i++) {
if (!_player_active[i])
continue;
auto& p = _player[i];
if (p.is_controller) {
} else {
updateKPlayerDirs(p);
}
}
});
if (_update_handle.expired()) {
LOG_ERROR("couldnt register update handler!");
return false;
}
_update_handle.lock()->priority = 1; // scene is 0
return true;
}
@ -119,12 +103,27 @@ void InputService::disable(Engine& engine) {
sdl_ss->removeEventHandler(_event_handle);
}
}
if (!_update_handle.expired()) {
engine.removeFixedUpdate(_update_handle);
_update_handle.reset();
}
std::vector<UpdateStrategies::UpdateCreationInfo> InputService::registerUpdates(void) {
return {
{
"InputService::update"_hs,
"InputService::update",
[this](MM::Engine&) {
for (size_t i = 0; i < 4; i++) {
if (!_player_active[i])
continue;
auto& p = _player[i];
if (p.is_controller) {
} else {
updateKPlayerDirs(p);
}
}
}
}
};
}
bool InputService::handleSDL_Event(const SDL_Event& e, MM::Engine& engine) {

8
framework/input/src/mm/services/input_service.hpp
View File

@ -16,7 +16,7 @@ namespace MM::Services {
class InputService : public Service {
public:
// TDO: rework
// TODO: rework
enum input_action_t {
SPELL_WEAPON,
SPELL_1,
@ -106,8 +106,6 @@ namespace MM::Services {
private:
SDLService::EventHandlerHandle _event_handle = nullptr;
MM::Engine::FunctionDataHandle _update_handle;
public:
bool enable(Engine& engine) override;
@ -115,6 +113,10 @@ namespace MM::Services {
const char* name(void) override { return "InputService"; }
// you will likely want to make the scene depend on this
std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
public:
// returns true if event was relevant
bool handleSDL_Event(const SDL_Event& e, MM::Engine& engine);