MadeOfJelly/MushMachine
MadeOfJelly/MushMachine
2
2
Fork 0
mirror of https://github.com/MadeOfJelly/MushMachine.git synced 2025-04-20 01:52:59 +02:00
Code Issues Projects Releases Wiki Activity

update strat now has name

Browse Source
This commit is contained in:
Green Sky 2021-02-16 20:59:47 +01:00
parent 77b43c572e
commit d22ad0d913
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/imgui/CMakeLists.txt vendored
View File

@ -51,6 +51,8 @@ target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
#target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/imgui") #target_include_directories(imgui PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/imgui")
target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui") # im sad target_include_directories(imgui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/imgui") # im sad
target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1)
if(EMSCRIPTEN) if(EMSCRIPTEN)
set_target_properties(imgui PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_WEBGL2=1 -s FULL_ES2=1 -s FULL_ES3=1") set_target_properties(imgui PROPERTIES COMPILE_FLAGS "-s USE_SDL=2 -s USE_WEBGL2=1 -s FULL_ES2=1 -s FULL_ES3=1")
set_target_properties(imgui PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_WEBGL2=1 -s FULL_ES2=1 -s FULL_ES3=1") set_target_properties(imgui PROPERTIES LINK_FLAGS "-s USE_SDL=2 -s USE_WEBGL2=1 -s FULL_ES2=1 -s FULL_ES3=1")

4
framework/engine/src/mm/engine.hpp
View File

@ -58,10 +58,7 @@ class Engine {
// called from destructor or explicitly // called from destructor or explicitly
void cleanup(void); void cleanup(void);
//[[nodiscard]] float getFixedDeltaTime(void) const { return _fixed_delta_time; };
void update(void); void update(void);
//void fixedUpdate(void);
void run(void); // calls update() until stopped void run(void); // calls update() until stopped
void stop(void); void stop(void);
@ -70,7 +67,6 @@ class Engine {
std::vector<service_family::family_type> _service_add_order; // ? std::vector<service_family::family_type> _service_add_order; // ?
std::vector<service_family::family_type> _service_enable_order; // ? std::vector<service_family::family_type> _service_enable_order; // ?
//std::unordered_map<service_family::family_type, std::pair<bool, std::unique_ptr<Service>>> _services;
std::unordered_map< std::unordered_map<
service_family::family_type, service_family::family_type,
std::shared_ptr<std::pair< std::shared_ptr<std::pair<

2
framework/engine/src/mm/update_strategies/default_strategy.hpp
View File

@ -49,6 +49,8 @@ class SingleThreadedDefault : public MM::UpdateStrategies::UpdateStrategy {
SingleThreadedDefault(void) = default; SingleThreadedDefault(void) = default;
virtual ~SingleThreadedDefault(void); virtual ~SingleThreadedDefault(void);
const char* name(void) override { return "SingleThreadedDefault"; }
protected: protected:
bool registerService(const entt::id_type s_id, std::vector<UpdateCreationInfo>&& info_array) override; bool registerService(const entt::id_type s_id, std::vector<UpdateCreationInfo>&& info_array) override;

2
framework/engine/src/mm/update_strategies/update_strategy.hpp
View File

@ -37,6 +37,8 @@ class UpdateStrategy {
public: public:
virtual ~UpdateStrategy(void) {} virtual ~UpdateStrategy(void) {}
virtual const char* name(void) = 0;
protected: // the engine facing interface protected: // the engine facing interface
friend ::MM::Engine; friend ::MM::Engine;

2
framework/engine/test/update_strategy_test.cpp
View File

@ -15,6 +15,8 @@ using namespace entt::literals;
class MockUpdateStrategy : public MM::UpdateStrategies::UpdateStrategy { class MockUpdateStrategy : public MM::UpdateStrategies::UpdateStrategy {
public: public:
const char* name(void) override { return "MockUpdateStrategy"; }
MOCK_METHOD( MOCK_METHOD(
bool, bool,
registerService, registerService,