Fix #10

fxnai · Nov 14, 2024 · 075469f · 075469f
1 parent 1cb27ae
commit 075469f
Show file tree

Hide file tree

Showing 21 changed files with 1,066 additions and 1,731 deletions.
diff --git a/Assets/Media/dance1.mp4.meta b/Assets/Media/dance1.mp4.meta
diff --git a/Assets/Media/dance2.mp4.meta b/Assets/Media/dance2.mp4.meta
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,6 @@
 ## 0.0.31
-*INCOMPLETE*
++ Fixed `Function.dylib` macOS plugin missing when building universal macOS apps from Unity.
++ Upgraded to Function C 0.0.31.
 
 ## 0.0.30
 + Added `FunctionAPIException` exception class for explicitly catching API errors.

diff --git a/Function.Editor.csproj b/Function.Editor.csproj
diff --git a/Function.Runtime.csproj b/Function.Runtime.csproj
diff --git a/Function.Tests.Editor.csproj b/Function.Tests.Editor.csproj
diff --git a/Function.Tests.Runtime.csproj b/Function.Tests.Runtime.csproj
diff --git a/Function.Unity.csproj b/Function.Unity.csproj
diff --git a/Packages/ai.fxn.fxn3d/Plugins/Android/Function.aar b/Packages/ai.fxn.fxn3d/Plugins/Android/Function.aar
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64.meta b/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64.meta
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64/Function.dylib b/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64/Function.dylib
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64/Function.dylib.meta b/Packages/ai.fxn.fxn3d/Plugins/macOS/arm64/Function.dylib.meta
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64.meta b/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64.meta
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64/Function.dylib b/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64/Function.dylib
diff --git a/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64/Function.dylib.meta b/Packages/ai.fxn.fxn3d/Plugins/macOS/x86_64/Function.dylib.meta
diff --git a/Packages/ai.fxn.fxn3d/Runtime/Services/Prediction.cs b/Packages/ai.fxn.fxn3d/Runtime/Services/Prediction.cs
@@ -26,6 +26,13 @@ namespace Function.Services {
     public sealed class PredictionService {
 
         #region --Client API--
+        /// <summary>
+        /// Check whether a predictor is preloaded and ready to make predictions.
+        /// </summary>
+        /// <param name="tag">Predictor tag.</param>
+        /// <returns>Whether the predictor is preloaded.</returns>
+        public bool Ready (string tag) => cache.ContainsKey(tag);
+
         /// <summary>
         /// Create a prediction.
         /// </summary>

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -4,11 +4,9 @@
     "com.unity.ide.rider": "3.0.31",
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.multiplayer.center": "1.0.0",
     "com.unity.test-framework": "2.0.1-exp.2",
     "com.unity.ugui": "2.0.0",
     "com.unity.visualscripting": "1.9.4",
-    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.audio": "1.0.0",
     "com.unity.modules.imageconversion": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -16,7 +16,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "2.0.5",
+      "version": "2.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
@@ -28,11 +28,12 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.22",
-        "com.unity.ide.rider": "3.0.31",
+        "com.unity.ide.rider": "3.0.28",
+        "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.2.2",
-        "com.unity.test-framework": "1.4.5",
-        "com.unity.testtools.codecoverage": "1.2.6"
+        "com.unity.test-framework": "1.1.33",
+        "com.unity.testtools.codecoverage": "1.2.5"
       }
     },
     "com.unity.ide.rider": {
@@ -60,14 +61,6 @@
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.multiplayer.center": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.uielements": "1.0.0"
-      }
-    },
     "com.unity.nuget.newtonsoft-json": {
       "version": "3.2.1",
       "depth": 1,
@@ -101,7 +94,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.6",
+      "version": "1.2.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -129,12 +122,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.modules.accessibility": {
-      "version": "1.0.0",
-      "depth": 0,
-      "source": "builtin",
-      "dependencies": {}
-    },
     "com.unity.modules.androidjni": {
       "version": "1.0.0",
       "depth": 0,
@@ -153,12 +140,6 @@
       "source": "builtin",
       "dependencies": {}
     },
-    "com.unity.modules.hierarchycore": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
-    },
     "com.unity.modules.imageconversion": {
       "version": "1.0.0",
       "depth": 0,
@@ -198,8 +179,7 @@
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.hierarchycore": "1.0.0"
+        "com.unity.modules.jsonserialize": "1.0.0"
       }
     },
     "com.unity.modules.unitywebrequest": {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 6000.0.23f1
-m_EditorVersionWithRevision: 6000.0.23f1 (1c4764c07fb4)
+m_EditorVersion: 2022.3.23f1
+m_EditorVersionWithRevision: 2022.3.23f1 (dbb3f7c5b5c6)
diff --git a/fxn3d.sln b/fxn3d.sln
@@ -5,12 +5,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Unity", "Function.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Editor", "Function.Editor.csproj", "{F6CFE704-6BBB-5E8B-3466-90A910FEFF45}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Runtime", "Function.Runtime.csproj", "{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Tests.Editor", "Function.Tests.Editor.csproj", "{F3E28E69-92B4-5DD0-F5CB-FE41B2DDC4D2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Tests.Runtime", "Function.Tests.Runtime.csproj", "{7A269B5E-3515-56D4-2537-D4449B313A23}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function.Runtime", "Function.Runtime.csproj", "{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +25,10 @@ Global
 		{F6CFE704-6BBB-5E8B-3466-90A910FEFF45}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F6CFE704-6BBB-5E8B-3466-90A910FEFF45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F6CFE704-6BBB-5E8B-3466-90A910FEFF45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F3E28E69-92B4-5DD0-F5CB-FE41B2DDC4D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3E28E69-92B4-5DD0-F5CB-FE41B2DDC4D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3E28E69-92B4-5DD0-F5CB-FE41B2DDC4D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,10 +37,6 @@ Global
 		{7A269B5E-3515-56D4-2537-D4449B313A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A269B5E-3515-56D4-2537-D4449B313A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A269B5E-3515-56D4-2537-D4449B313A23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC22D047-DD2E-2FCA-FEA7-CB465093B38D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/fxnc.py b/fxnc.py
@@ -40,12 +40,8 @@ def main (): # CHECK # Linux # Android AAR
             "path": LIB_PATH_BASE / "iOS" / "Function.framework.zip"
         },
         {
-            "url": f"https://cdn.fxn.ai/fxnc/{version}/Function-macos-x86_64.dylib",
-            "path": LIB_PATH_BASE / "macOS" / "x86_64" / "Function.dylib"
-        },
-        {
-            "url": f"https://cdn.fxn.ai/fxnc/{version}/Function-macos-arm64.dylib",
-            "path": LIB_PATH_BASE / "macOS" / "arm64" / "Function.dylib"
+            "url": f"https://cdn.fxn.ai/fxnc/{version}/Function-macos.dylib",
+            "path": LIB_PATH_BASE / "macOS" / "Function.dylib"
         },
         {
             "url": f"https://cdn.fxn.ai/fxnc/{version}/Function-win-x86_64.dll",