scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update iOS project and ImGui load order in main.mm

Browse Source
This commit is contained in:
scawful
2024-11-14 13:31:38 -05:00
parent fbb46d571a
commit ac05355ace
4 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ios/main.mm
View File

@@ -48,15 +48,6 @@
_controller = new yaze::app::core::Controller();
// Setup Dear ImGui context
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO &io = ImGui::GetIO();
(void)io;
io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
yaze::app::gui::ColorsYaze();
SDL_SetMainReady();
SDL_iOSSetEventPump(SDL_TRUE);
@@ -70,8 +61,8 @@
}
std::string rom_filename = "";
if (argc > 0) {
rom_filename = argv[0];
if (argc > 1) {
rom_filename = argv[1];
}
SDL_iOSSetEventPump(SDL_FALSE);
@@ -88,6 +79,16 @@
abort();
}
// Setup Dear ImGui context
IMGUI_CHECKVERSION();
ImGui::CreateContext();
ImGuiIO &io = ImGui::GetIO();
(void)io;
io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; // Enable Gamepad Controls
yaze::app::gui::ColorsYaze();
ImGui_ImplSDL2_InitForSDLRenderer(_controller->window(), _controller->renderer());
ImGui_ImplSDLRenderer2_Init(_controller->renderer());
@@ -95,6 +96,7 @@
abort();
}
_controller->SetupScreen(rom_filename);
_controller->set_active(true);
_hoverGestureRecognizer =
[[UIHoverGestureRecognizer alloc] initWithTarget:self action:@selector(HoverGesture:)];