Bump to NatML 1.1.15

natmlx · Sep 5, 2023 · 7aa57ad · 7aa57ad
1 parent f2cc3b0
commit 7aa57ad
Show file tree

Hide file tree

Showing 18 changed files with 1,562 additions and 408 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/MeetSample.cs b/Assets/MeetSample.cs
@@ -7,7 +7,7 @@ namespace NatML.Examples {
 
     using UnityEngine;
     using UnityEngine.UI;
-    using NatML.VideoKit;
+    using VideoKit;
     using NatML.Vision;
 
     public class MeetSample : MonoBehaviour {

diff --git a/Packages/ai.natml.vision.meet/Changelog.md b/Packages/ai.natml.vision.meet/Changelog.md
@@ -1,3 +1,6 @@
+## 1.0.7
++ Upgraded to NatML 1.1.15.
+
 ## 1.0.6
 + Added `MeetPredictor.Tag` constant string for enabling edge model embedding.
 

diff --git a/Packages/ai.natml.vision.meet/README.md b/Packages/ai.natml.vision.meet/README.md
@@ -9,11 +9,11 @@ Add the following items to your Unity project's `Packages/manifest.json`:
     {
       "name": "NatML",
       "url": "https://registry.npmjs.com",
-      "scopes": ["ai.natml"]
+      "scopes": ["ai.natml", "ai.fxn"]
     }
   ],
   "dependencies": {
-    "ai.natml.vision.meet": "1.0.6"
+    "ai.natml.vision.meet": "1.0.7"
   }
 }
 ```
@@ -44,7 +44,7 @@ matte.Render(result);
 ___
 
 ## Requirements
-- Unity 2021.2+
+- Unity 2022.3+
 
 ## Quick Tips
 - Join the [NatML community on Discord](https://natml.ai/community).

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

diff --git a/Packages/ai.natml.vision.meet/package.json b/Packages/ai.natml.vision.meet/package.json
@@ -1,11 +1,11 @@
 {
     "name": "ai.natml.vision.meet",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "displayName": "Meet",
     "description": "MediaPipe Meet Segmentation for human matting in Unity Engine.",
-    "unity": "2021.2",
+    "unity": "2022.3",
     "dependencies": {
-        "ai.natml.natml": "1.1.4"
+        "ai.natml.natml": "1.1.15"
     },
     "keywords": [
         "natml",

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -4,20 +4,22 @@
       "name": "NatML",
       "url": "https://registry.npmjs.com",
       "scopes": [
-        "ai.natml"
+        "ai.natml",
+        "ai.fxn"
       ]
     }
   ],
   "dependencies": {
-    "ai.natml.videokit": "0.0.11",
-    "com.unity.collab-proxy": "1.17.7",
+    "ai.natml.videokit": "0.0.14",
+    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.collab-proxy": "2.0.5",
     "com.unity.feature.development": "1.0.1",
-    "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "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.visualscripting": "1.8.0",
     "com.unity.modules.ai": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,59 +1,30 @@
 {
   "dependencies": {
-    "ai.natml.hub": {
-      "version": "1.0.20",
-      "depth": 1,
-      "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.3",
+    "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.4",
+      "version": "1.1.15",
       "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",
-      "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.11",
+      "version": "0.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "ai.natml.hub": "1.0.20",
-        "ai.natml.natml": "1.1.3",
-        "ai.natml.natcorder": "1.9.4",
-        "ai.natml.natdevice": "1.3.3",
-        "ai.natml.natshare": "1.3.0"
+        "ai.natml.natml": "1.1.15",
+        "ai.fxn.fxn3d": "0.0.4"
       },
       "url": "https://registry.npmjs.com"
     },
@@ -62,18 +33,25 @@
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "ai.natml.natml": "1.1.4"
+        "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.editorcoroutines": {
       "version": "1.0.0",
       "depth": 1,
@@ -93,17 +71,17 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.ide.visualstudio": "2.0.17",
-        "com.unity.ide.rider": "3.0.18",
+        "com.unity.ide.visualstudio": "2.0.18",
+        "com.unity.ide.rider": "3.0.24",
         "com.unity.ide.vscode": "1.2.5",
         "com.unity.editorcoroutines": "1.0.0",
-        "com.unity.performance.profile-analyzer": "1.1.1",
-        "com.unity.test-framework": "1.1.31",
-        "com.unity.testtools.codecoverage": "1.2.2"
+        "com.unity.performance.profile-analyzer": "1.2.2",
+        "com.unity.test-framework": "1.1.33",
+        "com.unity.testtools.codecoverage": "1.2.4"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.18",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -112,7 +90,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -128,39 +106,28 @@
       "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.performance.profile-analyzer": {
-      "version": "1.1.1",
+      "version": "1.2.2",
       "depth": 1,
       "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.settings-manager": {
-      "version": "1.0.3",
+      "version": "2.0.1",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -171,7 +138,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.2",
+      "version": "1.2.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -190,7 +157,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.7.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -352,17 +319,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/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
@@ -1,6 +1,4 @@
 {
-    "m_Name": "Settings",
-    "m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
     "m_Dictionary": {
         "m_DictionaryValues": []
     }

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
diff --git a/README.md b/README.md
@@ -7,13 +7,13 @@ Human segmentation sample with Meet model from Google MediaPipe.
 ## Running the Sample
 Retrieve your access key from [NatML Hub](https://hub.natml.ai/profile) and add it to your Project Settings.
 
-![project settings](https://github.com/natmlx/NatDevice/raw/main/.media/key.png)
+![project settings](https://github.com/natmlx/videokit/raw/main/Media/set-access-key.gif)
 
 ## Using the Predictor in a Different Project
 [See the predictor README for more details](Packages/ai.natml.vision.meet/README.md)
 
 ## Requirements
-- Unity 2021.2+
+- Unity 2022.3+
 
 ## Supported Platforms
 - Android API level 24+
@@ -23,6 +23,7 @@ Retrieve your access key from [NatML Hub](https://hub.natml.ai/profile) and add
 - WebGL:
     - Chrome 91+
     - Firefox 90+
+    - Safari 16.4+
 
 ## Resources
 - Join the [NatML community on Discord](https://natml.ai/community).