MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-06-18 18:56: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

32
framework/screen_director/src/mm/services/screen_director.cpp
View File

@ -1,5 +1,7 @@
#include "./screen_director.hpp"
#include <entt/core/hashed_string.hpp>
#include <tracy/Tracy.hpp>
#include <mm/logger.hpp>
@ -7,17 +9,6 @@
namespace MM::Services {
bool ScreenDirector::enable(MM::Engine& engine) {
if (!_update_handle.expired())
return false;
{
_update_handle = engine.addFixedUpdate([this](Engine& e) { this->update(e); });
auto tmp_lock = _update_handle.lock();
tmp_lock->priority = -100; // post everything ?
tmp_lock->name = "ScreenDirector::update";
}
// start initial screen
if (!queued_screen_id.empty()) {
auto next_screen_id = queued_screen_id;
@ -31,15 +22,24 @@ bool ScreenDirector::enable(MM::Engine& engine) {
return true;
}
void ScreenDirector::disable(MM::Engine& engine) {
engine.removeFixedUpdate(_update_handle);
_update_handle.reset();
void ScreenDirector::disable(MM::Engine&) {
}
std::vector<UpdateStrategies::UpdateCreationInfo> ScreenDirector::registerUpdates(void) {
return {
{
"ScreenDirector::update"_hs,
"ScreenDirector::update",
[this](Engine& engine) { update(engine); },
UpdateStrategies::update_phase_t::POST
}
};
}
void ScreenDirector::update(MM::Engine& engine) {
if (curr_screen_id != queued_screen_id) {
engine.addFixedDefer([this](MM::Engine& engine) {
changeScreenTo(engine, queued_screen_id);
engine.getUpdateStrategy().addDefered([this](MM::Engine& e) {
changeScreenTo(e, queued_screen_id);
});
}
}

3
framework/screen_director/src/mm/services/screen_director.hpp
View File

@ -15,6 +15,8 @@ class ScreenDirector : public Service {
bool enable(MM::Engine&) override;
void disable(MM::Engine&) override;
std::vector<UpdateStrategies::UpdateCreationInfo> registerUpdates(void) override;
public:
struct Screen {
// lists of services relevant for this screen, disable and enable are called when its changed to
@ -47,7 +49,6 @@ class ScreenDirector : public Service {
std::string queued_screen_id = "";
private:
MM::Engine::FunctionDataHandle _update_handle;
void update(MM::Engine& engine);
private: