Skip to content

Commit 7aa57ad

Browse files
olokobayusufolokobayusuf
committed
Bump to NatML 1.1.15
1 parent f2cc3b0 commit 7aa57ad

File tree

18 files changed

+1562
-408
lines changed

18 files changed

+1562
-408
lines changed

‎.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ Logs/
99
.gradle/
1010
.vs/
1111

12+
# Function
13+
ProjectSettings/Function.asset
14+
1215
# NatML
13-
Assets/NatML/
14-
Assets/NatML.meta
16+
ProjectSettings/NatML.asset
1517
ProjectSettings/NatMLHub.asset
1618

19+
# VideoKit
20+
ProjectSettings/VideoKit.asset
21+
1722
# Misc
1823
.DS_Store

‎Assembly-CSharp.csproj

Lines changed: 303 additions & 302 deletions
Large diffs are not rendered by default.

‎Assets/MeetSample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace NatML.Examples {
77

88
using UnityEngine;
99
using UnityEngine.UI;
10-
using NatML.VideoKit;
10+
using VideoKit;
1111
using NatML.Vision;
1212

1313
public class MeetSample : MonoBehaviour {

‎Packages/ai.natml.vision.meet/Changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 1.0.7
2+
+ Upgraded to NatML 1.1.15.
3+
14
## 1.0.6
25
+ Added `MeetPredictor.Tag` constant string for enabling edge model embedding.
36

‎Packages/ai.natml.vision.meet/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Add the following items to your Unity project's `Packages/manifest.json`:
99
{
1010
"name": "NatML",
1111
"url": "https://registry.npmjs.com",
12-
"scopes": ["ai.natml"]
12+
"scopes": ["ai.natml", "ai.fxn"]
1313
}
1414
],
1515
"dependencies": {
16-
"ai.natml.vision.meet": "1.0.6"
16+
"ai.natml.vision.meet": "1.0.7"
1717
}
1818
}
1919
```
@@ -44,7 +44,7 @@ matte.Render(result);
4444
___
4545

4646
## Requirements
47-
- Unity 2021.2+
47+
- Unity 2022.3+
4848

4949
## Quick Tips
5050
- Join the [NatML community on Discord](https://natml.ai/community).

‎Packages/ai.natml.vision.meet/Runtime/NatML.Vision.Meet.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "NatML.Vision.Meet",
33
"references": [
4-
"NatML.ML"
4+
"NatML.Runtime"
55
],
66
"includePlatforms": [
77
"Android",

‎Packages/ai.natml.vision.meet/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"name": "ai.natml.vision.meet",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"displayName": "Meet",
55
"description": "MediaPipe Meet Segmentation for human matting in Unity Engine.",
6-
"unity": "2021.2",
6+
"unity": "2022.3",
77
"dependencies": {
8-
"ai.natml.natml": "1.1.4"
8+
"ai.natml.natml": "1.1.15"
99
},
1010
"keywords": [
1111
"natml",

‎Packages/manifest.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@
44
"name": "NatML",
55
"url": "https://registry.npmjs.com",
66
"scopes": [
7-
"ai.natml"
7+
"ai.natml",
8+
"ai.fxn"
89
]
910
}
1011
],
1112
"dependencies": {
12-
"ai.natml.videokit": "0.0.11",
13-
"com.unity.collab-proxy": "1.17.7",
13+
"ai.natml.videokit": "0.0.14",
14+
"com.unity.ai.navigation": "1.1.4",
15+
"com.unity.collab-proxy": "2.0.5",
1416
"com.unity.feature.development": "1.0.1",
15-
"com.unity.ide.rider": "3.0.18",
16-
"com.unity.ide.visualstudio": "2.0.17",
17+
"com.unity.ide.rider": "3.0.24",
18+
"com.unity.ide.visualstudio": "2.0.18",
1719
"com.unity.ide.vscode": "1.2.5",
18-
"com.unity.test-framework": "1.1.31",
20+
"com.unity.test-framework": "1.1.33",
1921
"com.unity.textmeshpro": "3.0.6",
20-
"com.unity.timeline": "1.6.4",
22+
"com.unity.timeline": "1.7.5",
2123
"com.unity.ugui": "1.0.0",
2224
"com.unity.visualscripting": "1.8.0",
2325
"com.unity.modules.ai": "1.0.0",

‎Packages/packages-lock.json

Lines changed: 32 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,30 @@
11
{
22
"dependencies": {
3-
"ai.natml.hub": {
4-
"version": "1.0.20",
5-
"depth": 1,
6-
"source": "registry",
7-
"dependencies": {},
8-
"url": "https://registry.npmjs.com"
9-
},
10-
"ai.natml.natcorder": {
11-
"version": "1.9.4",
12-
"depth": 1,
13-
"source": "registry",
14-
"dependencies": {
15-
"ai.natml.hub": "1.0.20"
16-
},
17-
"url": "https://registry.npmjs.com"
18-
},
19-
"ai.natml.natdevice": {
20-
"version": "1.3.3",
3+
"ai.fxn.fxn3d": {
4+
"version": "0.0.4",
215
"depth": 1,
226
"source": "registry",
237
"dependencies": {
24-
"ai.natml.hub": "1.0.20"
8+
"com.unity.nuget.newtonsoft-json": "3.2.1"
259
},
2610
"url": "https://registry.npmjs.com"
2711
},
2812
"ai.natml.natml": {
29-
"version": "1.1.4",
13+
"version": "1.1.15",
3014
"depth": 1,
3115
"source": "registry",
3216
"dependencies": {
33-
"ai.natml.hub": "1.0.20",
34-
"com.unity.nuget.newtonsoft-json": "3.1.0"
35-
},
36-
"url": "https://registry.npmjs.com"
37-
},
38-
"ai.natml.natshare": {
39-
"version": "1.3.0",
40-
"depth": 1,
41-
"source": "registry",
42-
"dependencies": {
43-
"ai.natml.hub": "1.0.12"
17+
"com.unity.nuget.newtonsoft-json": "3.2.1"
4418
},
4519
"url": "https://registry.npmjs.com"
4620
},
4721
"ai.natml.videokit": {
48-
"version": "0.0.11",
22+
"version": "0.0.14",
4923
"depth": 0,
5024
"source": "registry",
5125
"dependencies": {
52-
"ai.natml.hub": "1.0.20",
53-
"ai.natml.natml": "1.1.3",
54-
"ai.natml.natcorder": "1.9.4",
55-
"ai.natml.natdevice": "1.3.3",
56-
"ai.natml.natshare": "1.3.0"
26+
"ai.natml.natml": "1.1.15",
27+
"ai.fxn.fxn3d": "0.0.4"
5728
},
5829
"url": "https://registry.npmjs.com"
5930
},
@@ -62,18 +33,25 @@
6233
"depth": 0,
6334
"source": "embedded",
6435
"dependencies": {
65-
"ai.natml.natml": "1.1.4"
36+
"ai.natml.natml": "1.1.15"
6637
}
6738
},
68-
"com.unity.collab-proxy": {
69-
"version": "1.17.7",
39+
"com.unity.ai.navigation": {
40+
"version": "1.1.4",
7041
"depth": 0,
7142
"source": "registry",
7243
"dependencies": {
73-
"com.unity.services.core": "1.0.1"
44+
"com.unity.modules.ai": "1.0.0"
7445
},
7546
"url": "https://packages.unity.com"
7647
},
48+
"com.unity.collab-proxy": {
49+
"version": "2.0.5",
50+
"depth": 0,
51+
"source": "registry",
52+
"dependencies": {},
53+
"url": "https://packages.unity.com"
54+
},
7755
"com.unity.editorcoroutines": {
7856
"version": "1.0.0",
7957
"depth": 1,
@@ -93,17 +71,17 @@
9371
"depth": 0,
9472
"source": "builtin",
9573
"dependencies": {
96-
"com.unity.ide.visualstudio": "2.0.17",
97-
"com.unity.ide.rider": "3.0.18",
74+
"com.unity.ide.visualstudio": "2.0.18",
75+
"com.unity.ide.rider": "3.0.24",
9876
"com.unity.ide.vscode": "1.2.5",
9977
"com.unity.editorcoroutines": "1.0.0",
100-
"com.unity.performance.profile-analyzer": "1.1.1",
101-
"com.unity.test-framework": "1.1.31",
102-
"com.unity.testtools.codecoverage": "1.2.2"
78+
"com.unity.performance.profile-analyzer": "1.2.2",
79+
"com.unity.test-framework": "1.1.33",
80+
"com.unity.testtools.codecoverage": "1.2.4"
10381
}
10482
},
10583
"com.unity.ide.rider": {
106-
"version": "3.0.18",
84+
"version": "3.0.24",
10785
"depth": 0,
10886
"source": "registry",
10987
"dependencies": {
@@ -112,7 +90,7 @@
11290
"url": "https://packages.unity.com"
11391
},
11492
"com.unity.ide.visualstudio": {
115-
"version": "2.0.17",
93+
"version": "2.0.18",
11694
"depth": 0,
11795
"source": "registry",
11896
"dependencies": {
@@ -128,39 +106,28 @@
128106
"url": "https://packages.unity.com"
129107
},
130108
"com.unity.nuget.newtonsoft-json": {
131-
"version": "3.1.0",
109+
"version": "3.2.1",
132110
"depth": 2,
133111
"source": "registry",
134112
"dependencies": {},
135113
"url": "https://packages.unity.com"
136114
},
137115
"com.unity.performance.profile-analyzer": {
138-
"version": "1.1.1",
116+
"version": "1.2.2",
139117
"depth": 1,
140118
"source": "registry",
141119
"dependencies": {},
142120
"url": "https://packages.unity.com"
143121
},
144-
"com.unity.services.core": {
145-
"version": "1.7.0",
146-
"depth": 1,
147-
"source": "registry",
148-
"dependencies": {
149-
"com.unity.modules.unitywebrequest": "1.0.0",
150-
"com.unity.nuget.newtonsoft-json": "3.0.2",
151-
"com.unity.modules.androidjni": "1.0.0"
152-
},
153-
"url": "https://packages.unity.com"
154-
},
155122
"com.unity.settings-manager": {
156-
"version": "1.0.3",
123+
"version": "2.0.1",
157124
"depth": 2,
158125
"source": "registry",
159126
"dependencies": {},
160127
"url": "https://packages.unity.com"
161128
},
162129
"com.unity.test-framework": {
163-
"version": "1.1.31",
130+
"version": "1.1.33",
164131
"depth": 0,
165132
"source": "registry",
166133
"dependencies": {
@@ -171,7 +138,7 @@
171138
"url": "https://packages.unity.com"
172139
},
173140
"com.unity.testtools.codecoverage": {
174-
"version": "1.2.2",
141+
"version": "1.2.4",
175142
"depth": 1,
176143
"source": "registry",
177144
"dependencies": {
@@ -190,7 +157,7 @@
190157
"url": "https://packages.unity.com"
191158
},
192159
"com.unity.timeline": {
193-
"version": "1.6.4",
160+
"version": "1.7.5",
194161
"depth": 0,
195162
"source": "registry",
196163
"dependencies": {
@@ -352,17 +319,6 @@
352319
"version": "1.0.0",
353320
"depth": 0,
354321
"source": "builtin",
355-
"dependencies": {
356-
"com.unity.modules.ui": "1.0.0",
357-
"com.unity.modules.imgui": "1.0.0",
358-
"com.unity.modules.jsonserialize": "1.0.0",
359-
"com.unity.modules.uielementsnative": "1.0.0"
360-
}
361-
},
362-
"com.unity.modules.uielementsnative": {
363-
"version": "1.0.0",
364-
"depth": 1,
365-
"source": "builtin",
366322
"dependencies": {
367323
"com.unity.modules.ui": "1.0.0",
368324
"com.unity.modules.imgui": "1.0.0",

‎ProjectSettings/PackageManagerSettings.asset

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
m_EnablePreReleasePackages: 0
16-
m_EnablePackageDependencies: 0
1716
m_AdvancedSettingsExpanded: 1
1817
m_ScopedRegistriesSettingsExpanded: 1
1918
m_SeeAllPackageVersions: 0
19+
m_DismissPreviewPackagesInUse: 0
2020
oneTimeWarningShown: 0
2121
m_Registries:
2222
- m_Id: main
@@ -31,6 +31,7 @@ MonoBehaviour:
3131
m_Url: https://registry.npmjs.com
3232
m_Scopes:
3333
- ai.natml
34+
- ai.fxn
3435
m_IsDefault: 0
3536
m_Capabilities: 0
3637
m_ConfigSource: 4
@@ -39,6 +40,6 @@ MonoBehaviour:
3940
m_RegistryInfoDraft:
4041
m_Modified: 0
4142
m_ErrorMessage:
42-
m_UserModificationsInstanceId: -846
43-
m_OriginalInstanceId: -850
43+
m_UserModificationsInstanceId: -856
44+
m_OriginalInstanceId: -860
4445
m_LoadAssets: 0

‎ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"m_Name": "Settings",
3-
"m_Path": "ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json",
42
"m_Dictionary": {
53
"m_DictionaryValues": []
64
}

‎ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.17f1
2-
m_EditorVersionWithRevision: 2021.3.17f1 (3e8111cac19d)
1+
m_EditorVersion: 2022.3.5f1
2+
m_EditorVersionWithRevision: 2022.3.5f1 (9674261d40ee)

‎ProjectSettings/boot.config

Whitespace-only changes.

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ Human segmentation sample with Meet model from Google MediaPipe.
77
## Running the Sample
88
Retrieve your access key from [NatML Hub](https://hub.natml.ai/profile) and add it to your Project Settings.
99

10-
![project settings](https://github.com/natmlx/NatDevice/raw/main/.media/key.png)
10+
![project settings](https://github.com/natmlx/videokit/raw/main/Media/set-access-key.gif)
1111

1212
## Using the Predictor in a Different Project
1313
[See the predictor README for more details](Packages/ai.natml.vision.meet/README.md)
1414

1515
## Requirements
16-
- Unity 2021.2+
16+
- Unity 2022.3+
1717

1818
## Supported Platforms
1919
- Android API level 24+
@@ -23,6 +23,7 @@ Retrieve your access key from [NatML Hub](https://hub.natml.ai/profile) and add
2323
- WebGL:
2424
- Chrome 91+
2525
- Firefox 90+
26+
- Safari 16.4+
2627

2728
## Resources
2829
- Join the [NatML community on Discord](https://natml.ai/community).

0 commit comments

Comments
 (0)