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:)];

47
src/ios/yaze.xcodeproj/project.pbxproj
View File

@@ -44,8 +44,6 @@
E318D9082C59C08300091322 /* common.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8522C59C08300091322 /* common.cc */; };
E318D9092C59C08300091322 /* controller.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8552C59C08300091322 /* controller.cc */; };
E318D90A2C59C08300091322 /* controller.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8552C59C08300091322 /* controller.cc */; };
E318D90B2C59C08300091322 /* labeling.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8572C59C08300091322 /* labeling.cc */; };
E318D90C2C59C08300091322 /* labeling.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8572C59C08300091322 /* labeling.cc */; };
E318D90D2C59C08300091322 /* assembly_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D85C2C59C08300091322 /* assembly_editor.cc */; };
E318D90E2C59C08300091322 /* assembly_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D85C2C59C08300091322 /* assembly_editor.cc */; };
E318D90F2C59C08300091322 /* dungeon_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8602C59C08300091322 /* dungeon_editor.cc */; };
@@ -736,6 +734,10 @@
E318E87F2C609B3500091322 /* PencilKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E318E87E2C609B3500091322 /* PencilKit.framework */; };
E32BC4CB2CA4D7D9001F57A8 /* command_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = E32BC4CA2CA4D7BC001F57A8 /* command_manager.cc */; };
E34C789C2C5882A100A6C275 /* imgui_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5079822D257677DB0038A28D /* imgui_tables.cpp */; };
E36971DA2CE189EA00DEF2F6 /* project.cc in Sources */ = {isa = PBXBuildFile; fileRef = E36971D92CE189EA00DEF2F6 /* project.cc */; };
E36971DB2CE189EA00DEF2F6 /* project.cc in Sources */ = {isa = PBXBuildFile; fileRef = E36971D92CE189EA00DEF2F6 /* project.cc */; };
E36971E42CE18A2A00DEF2F6 /* file_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = E36971E12CE18A2A00DEF2F6 /* file_util.cc */; };
E36971E52CE18A2A00DEF2F6 /* file_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = E36971E12CE18A2A00DEF2F6 /* file_util.cc */; };
E384E2D62C76C6E800147029 /* message_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = E384E2D52C76C6C800147029 /* message_data.cc */; };
E38A97F72C6C4CE3005FB662 /* extension_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = E38A97F22C6C4CE3005FB662 /* extension_manager.cc */; };
E38A97F82C6C4CE3005FB662 /* settings_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E38A97F42C6C4CE3005FB662 /* settings_editor.cc */; };
@@ -815,6 +817,13 @@
remoteGlobalIDString = BECDF6BE0761BA81005FE872;
remoteInfo = "Standard DMG";
};
E36971D72CE1898700DEF2F6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = E318E8492C5D74B700091322 /* SDL.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = E2D187CF28A5673500D2B4F1;
remoteInfo = "xcFramework-iOS";
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -882,8 +891,6 @@
E318D8542C59C08300091322 /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = constants.h; sourceTree = "<group>"; };
E318D8552C59C08300091322 /* controller.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controller.cc; sourceTree = "<group>"; };
E318D8562C59C08300091322 /* controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller.h; sourceTree = "<group>"; };
E318D8572C59C08300091322 /* labeling.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = labeling.cc; sourceTree = "<group>"; };
E318D8582C59C08300091322 /* labeling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = labeling.h; sourceTree = "<group>"; };
E318D8592C59C08300091322 /* project.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = project.h; sourceTree = "<group>"; };
E318D85C2C59C08300091322 /* assembly_editor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = assembly_editor.cc; sourceTree = "<group>"; };
E318D85D2C59C08300091322 /* assembly_editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = assembly_editor.h; sourceTree = "<group>"; };
@@ -2403,6 +2410,10 @@
E318E8782C5D958400091322 /* Media.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Media.xcassets; sourceTree = "<group>"; };
E318E87E2C609B3500091322 /* PencilKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PencilKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS17.5.sdk/System/Library/Frameworks/PencilKit.framework; sourceTree = DEVELOPER_DIR; };
E32BC4CA2CA4D7BC001F57A8 /* command_manager.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = command_manager.cc; sourceTree = "<group>"; };
E36971D92CE189EA00DEF2F6 /* project.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = project.cc; sourceTree = "<group>"; };
E36971E02CE18A2A00DEF2F6 /* file_util.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = file_util.h; sourceTree = "<group>"; };
E36971E12CE18A2A00DEF2F6 /* file_util.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = file_util.cc; sourceTree = "<group>"; };
E36971E22CE18A2A00DEF2F6 /* sdl_deleter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = sdl_deleter.h; sourceTree = "<group>"; };
E384E2D52C76C6C800147029 /* message_data.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = message_data.cc; sourceTree = "<group>"; };
E38985002C67082800D4CF13 /* renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = renderer.h; sourceTree = "<group>"; };
E38985012C67CDDB00D4CF13 /* view_controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = view_controller.h; sourceTree = "<group>"; };
@@ -2567,14 +2578,14 @@
E318D85B2C59C08300091322 /* core */ = {
isa = PBXGroup;
children = (
E36971E32CE18A2A00DEF2F6 /* utils */,
E318D8512C59C08300091322 /* platform */,
E318D8522C59C08300091322 /* common.cc */,
E318D8532C59C08300091322 /* common.h */,
E318D8542C59C08300091322 /* constants.h */,
E318D8552C59C08300091322 /* controller.cc */,
E318D8562C59C08300091322 /* controller.h */,
E318D8572C59C08300091322 /* labeling.cc */,
E318D8582C59C08300091322 /* labeling.h */,
E36971D92CE189EA00DEF2F6 /* project.cc */,
E318D8592C59C08300091322 /* project.h */,
);
path = core;
@@ -5050,6 +5061,7 @@
E318E8572C5D74B700091322 /* SDL2.framework */,
E318E8592C5D74B700091322 /* SDL2.framework */,
E318E85B2C5D74B700091322 /* SDL2.framework */,
E36971D82CE1898700DEF2F6 /* SDL2.framework */,
E318E85D2C5D74B700091322 /* libSDL2.a */,
E318E85F2C5D74B700091322 /* libSDL2.a */,
E318E8612C5D74B700091322 /* libSDL2.a */,
@@ -5061,6 +5073,16 @@
name = Products;
sourceTree = "<group>";
};
E36971E32CE18A2A00DEF2F6 /* utils */ = {
isa = PBXGroup;
children = (
E36971E02CE18A2A00DEF2F6 /* file_util.h */,
E36971E12CE18A2A00DEF2F6 /* file_util.cc */,
E36971E22CE18A2A00DEF2F6 /* sdl_deleter.h */,
);
path = utils;
sourceTree = "<group>";
};
E38A97F62C6C4CE3005FB662 /* system */ = {
isa = PBXGroup;
children = (
@@ -5239,6 +5261,13 @@
remoteRef = E318E8682C5D74B700091322 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
E36971D82CE1898700DEF2F6 /* SDL2.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = SDL2.framework;
remoteRef = E36971D72CE1898700DEF2F6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@@ -5409,6 +5438,7 @@
E318DFFB2C5A4FBF00091322 /* stacktrace_arm-inl.inc in Sources */,
E318E2292C5A4FC200091322 /* time_zone_fixed.cc in Sources */,
E318E12F2C5A4FC100091322 /* status_payload_printer.cc in Sources */,
E36971DB2CE189EA00DEF2F6 /* project.cc in Sources */,
E318E78D2C5A536400091322 /* ImGuiFileDialog.cpp in Sources */,
E318E1792C5A4FC100091322 /* cordz_functions.cc in Sources */,
E318E0212C5A4FBF00091322 /* symbolize_elf.inc in Sources */,
@@ -5461,6 +5491,7 @@
E318E1732C5A4FC100091322 /* cord_rep_crc.cc in Sources */,
E318E2332C5A4FC300091322 /* time_zone_info.cc in Sources */,
E318E16F2C5A4FC100091322 /* cord_rep_consume.cc in Sources */,
E36971E52CE18A2A00DEF2F6 /* file_util.cc in Sources */,
E318E1CF2C5A4FC200091322 /* match.cc in Sources */,
E318E02F2C5A4FBF00091322 /* flag_msvc.inc in Sources */,
E318DFFF2C5A4FBF00091322 /* stacktrace_generic-inl.inc in Sources */,
@@ -5490,7 +5521,6 @@
E318E7272C5A4FC900091322 /* bad_variant_access.cc in Sources */,
E318DFA32C5A4FBE00091322 /* hashtablez_sampler_force_weak_definition.cc in Sources */,
E318E18D2C5A4FC100091322 /* escaping.cc in Sources */,
E318D90B2C59C08300091322 /* labeling.cc in Sources */,
E318E01D2C5A4FBF00091322 /* stacktrace.cc in Sources */,
E318E0DD2C5A4FC000091322 /* randen_detect.cc in Sources */,
E318E7B92C5A548C00091322 /* pngrio.c in Sources */,
@@ -5661,6 +5691,7 @@
E318DF402C5A4FBE00091322 /* fast_type_id_test.cc in Sources */,
E318E16A2C5A4FC100091322 /* cord_rep_btree_reader.cc in Sources */,
E318E11A2C5A4FC100091322 /* mock_distributions_test.cc in Sources */,
E36971DA2CE189EA00DEF2F6 /* project.cc in Sources */,
E318E0602C5A4FBF00091322 /* reflection.cc in Sources */,
E318DF882C5A4FBE00091322 /* log_severity.cc in Sources */,
E318DF302C5A4FBD00091322 /* equal_benchmark.cc in Sources */,
@@ -5834,7 +5865,6 @@
E318E20A2C5A4FC200091322 /* barrier_test.cc in Sources */,
E318DF6A2C5A4FBE00091322 /* thread_identity.cc in Sources */,
E318DF802C5A4FBE00091322 /* inline_variable_test_b.cc in Sources */,
E318D90C2C59C08300091322 /* labeling.cc in Sources */,
E318E7322C5A4FC900091322 /* optional_test.cc in Sources */,
E318E1782C5A4FC100091322 /* cordz_functions_test.cc in Sources */,
E318DF682C5A4FBE00091322 /* thread_identity_test.cc in Sources */,
@@ -5939,6 +5969,7 @@
E318E1582C5A4FC100091322 /* charconv_bigint_test.cc in Sources */,
E318E71A2C5A4FC900091322 /* time_zone_test.cc in Sources */,
E318E1D22C5A4FC200091322 /* numbers_benchmark.cc in Sources */,
E36971E42CE18A2A00DEF2F6 /* file_util.cc in Sources */,
E318E1FE2C5A4FC200091322 /* graphcycles_benchmark.cc in Sources */,
E318DF282C5A4FBD00091322 /* algorithm_test.cc in Sources */,
E318E0EA2C5A4FC000091322 /* randen_slow.cc in Sources */,

BIN
src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

4
src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@@ -27,12 +27,12 @@
<key>yaze_ios.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
<integer>7</integer>
</dict>
<key>yaze_macos.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
<integer>5</integer>
</dict>
</dict>
</dict>