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

added screen director tools

Browse Source 
minor additions / fixes
This commit is contained in:
Green Sky
2021-05-29 18:22:08 +02:00
parent 9e9b644856
commit 2c1faa60c6
8 changed files with 197 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,10 +28,21 @@
namespace MM::Services {
SDLService::SDLService(uint32_t sdl_init_flags) {
SDLService::SDLService(uint32_t _sdl_init_flags) {
MM::Logger::initSectionLogger("SDLService");
LOG_TRACE("constructing SDLService...");
//#ifdef __EMSCRIPTEN__
//_sdl_init_flags &= ~SDL_INIT_HAPTIC;
//#endif
sdl_init_flags = _sdl_init_flags;
}
SDLService::~SDLService(void) {
}
bool SDLService::enable(Engine&, std::vector<UpdateStrategies::TaskInfo>& task_array) {
LOG_TRACE("enabling SDLService...");
SDL_LogSetOutputFunction(
+[](void*, int category, SDL_LogPriority priority, const char* message) {
@ -43,19 +54,25 @@ SDLService::SDLService(uint32_t sdl_init_flags) {
SDL_LogSetAllPriority(SDL_LOG_PRIORITY_VERBOSE);
//#ifdef __EMSCRIPTEN__
//sdl_init_flags &= ~SDL_INIT_HAPTIC;
//#endif
if (SDL_Init(sdl_init_flags)) {
LOG_CRIT("SDL_Init() failed: {}", SDL_GetError());
return;
return false;
}
// add task
task_array.push_back(
UpdateStrategies::TaskInfo{"SDLService::events"}
.phase(UpdateStrategies::update_phase_t::PRE)
.fn([this](Engine& e) { this->processEvents(e); })
);
return true;
}
SDLService::~SDLService(void) {
LOG_TRACE("deconstructing SDLService...");
void SDLService::disable(Engine&) {
LOG_TRACE("disabling SDLService...");
// destroy stuff
if (gl_context) {
SDL_GL_DeleteContext(gl_context);
}
@ -68,30 +85,6 @@ SDLService::~SDLService(void) {
SDL_Quit();
}
bool SDLService::enable(Engine&, std::vector<UpdateStrategies::TaskInfo>& task_array) {
// add task
task_array.push_back(
UpdateStrategies::TaskInfo{"SDLService::events"}
.phase(UpdateStrategies::update_phase_t::PRE)
.fn([this](Engine& e) { this->processEvents(e); })
);
bool succ = true;
return succ;
}
void SDLService::disable(Engine&) {
// destroy stuff
if (gl_context) {
SDL_GL_DeleteContext(gl_context);
}
if (win) {
LOG_WARN("destroying open window");
destroyWindow();
}
}
bool SDLService::createWindow(const char* title, int screen_width, int screen_height, uint32_t sdl_window_flags) {
if (!win) {
win = SDL_CreateWindow(title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, screen_width, screen_height, sdl_window_flags);

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

@ -11,6 +11,8 @@ namespace MM::Services {
class SDLService : public Service {
public:
uint32_t sdl_init_flags = SDL_INIT_EVERYTHING;
SDL_Window* win{nullptr};
SDL_GLContext gl_context{nullptr};