Bump to NatML 1.1.15

natmlx · Aug 12, 2023 · 638d895 · 638d895
1 parent 4b26b24
commit 638d895
Show file tree

Hide file tree

Showing 17 changed files with 2,517 additions and 364 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,10 +9,15 @@ Logs/
 .gradle/
 .vs/
 
+# Function
+ProjectSettings/Function.asset
+
 # NatML
-Assets/NatML/
-Assets/NatML.meta
+ProjectSettings/NatML.asset
 ProjectSettings/NatMLHub.asset
 
+# VideoKit
+ProjectSettings/VideoKit.asset
+
 # Misc
 .DS_Store
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
diff --git a/Assets/MoveNetSample.cs b/Assets/MoveNetSample.cs
@@ -6,8 +6,8 @@
 namespace NatML.Examples {
 
     using UnityEngine;
-    using NatML.VideoKit;
     using NatML.Vision;
+    using VideoKit;
     using Visualizers;
 
     public class MoveNetSample : MonoBehaviour {

diff --git a/Assets/MoveNetVisualizer.cs b/Assets/MoveNetVisualizer.cs
@@ -8,7 +8,7 @@ namespace NatML.Examples.Visualizers {
     using System.Collections.Generic;
     using UnityEngine;
     using NatML.Vision;
-    using NatML.VideoKit.UI;
+    using VideoKit.UI;
 
     /// <summary>
     /// MoveNet body pose visualizer.

diff --git a/Packages/ai.natml.vision.movenet/Changelog.md b/Packages/ai.natml.vision.movenet/Changelog.md
@@ -1,3 +1,6 @@
+## 1.0.9
++ Upgraded to NatML 1.1.15.
+
 ## 1.0.8
 + Added `MoveNetPredictor.Tag` constant string for enabling model embedding.
 + Upgraded to NatML 1.1.5.

diff --git a/Packages/ai.natml.vision.movenet/README.md b/Packages/ai.natml.vision.movenet/README.md
@@ -13,7 +13,7 @@ Add the following items to your Unity project's `Packages/manifest.json`:
     }
   ],
   "dependencies": {
-    "ai.natml.vision.movenet": "1.0.8"
+    "ai.natml.vision.movenet": "1.0.9"
   }
 }
 ```
@@ -35,7 +35,7 @@ MoveNetPredictor.Pose pose = predictor.Predict(image);
 ___
 
 ## Requirements
-- Unity 2021.2+
+- Unity 2022.3+
 
 ## Quick Tips
 - Discover more ML models on [NatML Hub](https://hub.natml.ai).

diff --git a/Packages/ai.natml.vision.movenet/Runtime/NatML.Vision.MoveNet.asmdef b/Packages/ai.natml.vision.movenet/Runtime/NatML.Vision.MoveNet.asmdef
@@ -1,7 +1,7 @@
 {
     "name": "NatML.Vision.MoveNet",
     "references": [
-		"NatML.ML"
+		"NatML.Runtime"
 	],
     "includePlatforms": [
         "Android",

diff --git a/Packages/ai.natml.vision.movenet/package.json b/Packages/ai.natml.vision.movenet/package.json
@@ -1,11 +1,11 @@
 {
     "name": "ai.natml.vision.movenet",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "displayName": "MoveNet",
     "description": "Realtime pose detection with MediaPipe MoveNet.",
-    "unity": "2021.2",
+    "unity": "2022.3",
     "dependencies": {
-        "ai.natml.natml": "1.1.5"
+        "ai.natml.natml": "1.1.15"
     },
     "keywords": [
         "natml",

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -4,19 +4,21 @@
       "name": "NatML",
       "url": "https://registry.npmjs.com",
       "scopes": [
-        "ai.natml"
+        "ai.natml",
+        "ai.fxn"
       ]
     }
   ],
   "dependencies": {
-    "ai.natml.videokit": "0.0.13",
-    "com.unity.collab-proxy": "1.17.7",
-    "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "ai.natml.videokit": "0.0.14",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.test-framework": "1.1.31",
+    "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
-    "com.unity.timeline": "1.6.4",
+    "com.unity.timeline": "1.7.5",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,58 +1,30 @@
 {
   "dependencies": {
-    "ai.natml.hub": {
-      "version": "1.0.20",
-      "depth": 2,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://registry.npmjs.com"
-    },
-    "ai.natml.natcorder": {
-      "version": "1.9.4",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "ai.natml.hub": "1.0.20"
-      },
-      "url": "https://registry.npmjs.com"
-    },
-    "ai.natml.natdevice": {
-      "version": "1.3.4",
+    "ai.fxn.fxn3d": {
+      "version": "0.0.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "ai.natml.hub": "1.0.20"
+        "com.unity.nuget.newtonsoft-json": "3.2.1"
       },
       "url": "https://registry.npmjs.com"
     },
     "ai.natml.natml": {
-      "version": "1.1.5",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "ai.natml.hub": "1.0.20",
-        "com.unity.nuget.newtonsoft-json": "3.1.0"
-      },
-      "url": "https://registry.npmjs.com"
-    },
-    "ai.natml.natshare": {
-      "version": "1.3.0",
+      "version": "1.1.15",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "ai.natml.hub": "1.0.12"
+        "com.unity.nuget.newtonsoft-json": "3.2.1"
       },
       "url": "https://registry.npmjs.com"
     },
     "ai.natml.videokit": {
-      "version": "0.0.13",
+      "version": "0.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "ai.natml.natml": "1.1.4",
-        "ai.natml.natcorder": "1.9.4",
-        "ai.natml.natdevice": "1.3.4",
-        "ai.natml.natshare": "1.3.0"
+        "ai.natml.natml": "1.1.15",
+        "ai.fxn.fxn3d": "0.0.4"
       },
       "url": "https://registry.npmjs.com"
     },
@@ -61,18 +33,25 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "ai.natml.natml": "1.1.5"
+        "ai.natml.natml": "1.1.15"
       }
     },
-    "com.unity.collab-proxy": {
-      "version": "1.17.7",
+    "com.unity.ai.navigation": {
+      "version": "1.1.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.core": "1.0.1"
+        "com.unity.modules.ai": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.collab-proxy": {
+      "version": "2.0.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
@@ -81,7 +60,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.18",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -90,7 +69,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -106,25 +85,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.nuget.newtonsoft-json": {
-      "version": "3.1.0",
+      "version": "3.2.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.services.core": {
-      "version": "1.7.0",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.modules.unitywebrequest": "1.0.0",
-        "com.unity.nuget.newtonsoft-json": "3.0.2",
-        "com.unity.modules.androidjni": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -144,7 +112,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.7.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -296,17 +264,6 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
-      "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.uielementsnative": "1.0.0"
-      }
-    },
-    "com.unity.modules.uielementsnative": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",

diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
@@ -13,10 +13,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_EnablePreReleasePackages: 0
-  m_EnablePackageDependencies: 0
   m_AdvancedSettingsExpanded: 1
   m_ScopedRegistriesSettingsExpanded: 1
   m_SeeAllPackageVersions: 0
+  m_DismissPreviewPackagesInUse: 0
   oneTimeWarningShown: 0
   m_Registries:
   - m_Id: main
@@ -31,6 +31,7 @@ MonoBehaviour:
     m_Url: https://registry.npmjs.com
     m_Scopes:
     - ai.natml
+    - ai.fxn
     m_IsDefault: 0
     m_Capabilities: 0
     m_ConfigSource: 4
@@ -39,6 +40,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -846
-    m_OriginalInstanceId: -850
+    m_UserModificationsInstanceId: -856
+    m_OriginalInstanceId: -860
   m_LoadAssets: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.17f1
-m_EditorVersionWithRevision: 2021.3.17f1 (3e8111cac19d)
+m_EditorVersion: 2022.3.5f1
+m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee)
diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config