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

42
framework/sdl_service/src/mm/services/sdl_service.cpp
View File

@ -1,5 +1,7 @@
#include "./sdl_service.hpp"
#include <entt/core/hashed_string.hpp>
#include <tracy/Tracy.hpp>
#ifdef MM_OPENGL_3_GLES
@ -58,37 +60,23 @@ SDLService::~SDLService(void) {
SDL_Quit();
}
bool SDLService::enable(Engine& engine) {
std::vector<UpdateStrategies::UpdateCreationInfo> SDLService::registerUpdates(void) {
return {
{
"SDLService::events"_hs,
"SDLService::events",
[this](Engine& e) { this->processEvents(e); },
UpdateStrategies::update_phase_t::PRE
}
};
}
bool SDLService::enable(Engine&) {
bool succ = true;
_func_handle = engine.addUpdate([this](Engine& e) { this->processEvents(e); });
if (!_func_handle.expired()) {
auto tmp_lock = _func_handle.lock();
tmp_lock->priority = 100; // before the calls before the scene
tmp_lock->name = "sdl events";
} else {
succ = false;
}
_f_func_handle = engine.addFixedUpdate([this](Engine& e) { this->processEvents(e); });
if (!_f_func_handle.expired()) {
auto tmp_lock = _f_func_handle.lock();
tmp_lock->priority = 100; // before the calls before the scene
tmp_lock->name = "sdl events";
} else {
succ = false;
}
return succ;
}
void SDLService::disable(Engine& engine) {
// remove update hooks
if (!_func_handle.expired())
engine.removeUpdate(_func_handle);
if (!_f_func_handle.expired())
engine.removeFixedUpdate(_f_func_handle);
void SDLService::disable(Engine&) {
// destroy stuff
if (gl_context) {
SDL_GL_DeleteContext(gl_context);

5
framework/sdl_service/src/mm/services/sdl_service.hpp
View File

@ -22,14 +22,13 @@ namespace MM::Services {
private:
std::vector<std::unique_ptr<EventHandlerType>> _event_handler_list;
Engine::FunctionDataHandle _func_handle;
Engine::FunctionDataHandle _f_func_handle;
public:
SDLService(uint32_t sdl_init_flags = SDL_INIT_EVERYTHING);
~SDLService(void);
public:
std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
bool enable(Engine& engine) override;
void disable(Engine& engine) override; // destroys windows and ass contexts