Fix iOS

jmorton06 · Feb 10, 2025 · 6a76ee6 · 6a76ee6
1 parent c9faf3a
commit 6a76ee6
Show file tree

Hide file tree

Showing 35 changed files with 978 additions and 851 deletions.
diff --git a/Editor/Source/Editor.cpp b/Editor/Source/Editor.cpp
@@ -173,11 +173,10 @@ namespace Lumos
         auto& guizmoStyle                    = ImGuizmo::GetStyle();
         guizmoStyle.HatchedAxisLineThickness = -1.0f;
 
-#ifdef LUMOS_PLATFORM_IOS
-        m_TempSceneSaveFilePath = OS::Get().GetAssetPath();
-#else
 #ifdef LUMOS_PLATFORM_LINUX
         m_TempSceneSaveFilePath = std::filesystem::current_path().string();
+#elif defined(LUMOS_PLATFORM_IOS)
+		m_TempSceneSaveFilePath = OS::Get().GetCurrentWorkingDirectory();
 #else
         m_TempSceneSaveFilePath = std::filesystem::temp_directory_path().string();
 #endif
@@ -190,14 +189,19 @@ namespace Lumos
             deleteIniFile = true;
         }
 
-        m_TempSceneSaveFilePath += "Lumos/";
+        m_TempSceneSaveFilePath += "/Lumos/";
         if(!FileSystem::FolderExists(m_TempSceneSaveFilePath))
             std::filesystem::create_directory(m_TempSceneSaveFilePath);
 
         std::vector<std::string> iniLocation = {
             StringUtilities::GetFileLocation(OS::Get().GetExecutablePath()) + "Editor.ini",
             StringUtilities::GetFileLocation(OS::Get().GetExecutablePath()) + "../../../Editor.ini"
         };
+
+#if defined(LUMOS_PLATFORM_IOS)
+		iniLocation.push_back(StringUtilities::GetFileLocation(OS::Get().GetAssetPath()) + "Editor.ini");
+#endif
+
         bool fileFound = false;
         std::string filePath;
         for(auto& path : iniLocation)
@@ -228,6 +232,8 @@ namespace Lumos
             LINFO("Editor Ini not found");
 #ifdef LUMOS_PLATFORM_MACOS
             filePath = StringUtilities::GetFileLocation(OS::Get().GetExecutablePath()) + "../../../Editor.ini";
+#elif defined(LUMOS_PLATFORM_IOS)
+			filePath = StringUtilities::GetFileLocation(OS::Get().GetAssetPath()) + "Editor.ini";
 #else
             filePath = StringUtilities::GetFileLocation(OS::Get().GetExecutablePath()) + "Editor.ini";
 #endif
@@ -238,7 +244,6 @@ namespace Lumos
             AddDefaultEditorSettings();
             // ImGui::GetIO().IniFilename = "editor.ini";
         }
-#endif
 
         Application::Init();
         Application::SetEditorState(EditorState::Preview);
@@ -2894,6 +2899,8 @@ namespace Lumos
                 m_ProjectSettings.m_ProjectRoot = "../../ExampleProject/";
             }
         }
+#elif defined(LUMOS_PLATFORM_IOS)
+		m_ProjectSettings.m_ProjectRoot = OS::Get().GetAssetPath() + "/ExampleProject/";
 #endif
 
         m_ProjectSettings.m_ProjectName = "Example";

diff --git a/Editor/premake5.lua b/Editor/premake5.lua
@@ -184,6 +184,7 @@ project "LumosEditor"
 			"AudioToolbox.framework",
 			"Foundation.framework",
 			"SystemConfiguration.framework",
+			"IOSurface.framework"
 		}
 
 		linkoptions
@@ -197,12 +198,13 @@ project "LumosEditor"
 			"../Resources/AppIcons/Assets.xcassets",
 			"../Lumos/Assets/Shaders",
 			"../Lumos/Source/Lumos/Platform/iOS/Client/**",
-            "../ExampleProject/Assets/Scenes",
-			"../ExampleProject/Assets/Scripts",
-			"../ExampleProject/Assets/Meshes",
-			"../ExampleProject/Assets/Sounds",
-			"../ExampleProject/Assets/Textures",
-			"../ExampleProject/Example.lmproj"
+			"../ExampleProject/"
+            -- "../ExampleProject/Assets/Scenes",
+            -- "../ExampleProject/Assets/Scripts",
+            -- "../ExampleProject/Assets/Meshes",
+            -- "../ExampleProject/Assets/Sounds",
+            -- "../ExampleProject/Assets/Textures",
+            -- "../ExampleProject/Example.lmproj"
 		}
 
 		xcodebuildsettings
@@ -253,12 +255,13 @@ project "LumosEditor"
 			"../Lumos/Source/Platform/iOS/Client",
 			"Assets.xcassets",
             "Shaders",
-            "Meshes",
-            "Scenes",
-            "Scripts",
-            "Sounds",
-			"Textures",
-			"Example.lmproj"
+            "ExampleProject"
+            -- "Meshes",
+            -- "Scenes",
+            -- "Scripts",
+            -- "Sounds",
+            -- "Textures",
+			--"Example.lmproj"
 		}
 
 	filter "system:linux"

diff --git a/ExampleProject/Assets/Scenes/Cache/Physics.png b/ExampleProject/Assets/Scenes/Cache/Physics.png