Skip to content

Commit

Permalink
Bump to NatML 1.1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
olokobayusuf committed Sep 21, 2023
1 parent 746253f commit 01d433a
Show file tree
Hide file tree
Showing 20 changed files with 1,911 additions and 618 deletions.
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
595 changes: 307 additions & 288 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/BlazePalmDetectorSample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
namespace NatML.Examples {

using UnityEngine;
using NatML.VideoKit;
using NatML.Vision;
using NatML.Visualizers;
using VideoKit;

public sealed class BlazePalmDetectorSample : MonoBehaviour {

Expand Down
39 changes: 27 additions & 12 deletions Assets/BlazePalmDetectorSample.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.4440765, g: 0.49331635, b: 0.57239074, a: 1}
m_IndirectSpecularColor: {r: 0.44407493, g: 0.49331808, b: 0.5724013, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -104,7 +104,7 @@ NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
Expand All @@ -117,7 +117,7 @@ NavMeshSettings:
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
Expand Down Expand Up @@ -154,7 +154,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1001331462}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -238,13 +237,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 246868624}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &246868627
MonoBehaviour:
Expand Down Expand Up @@ -354,13 +353,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
serializedVersion: 2
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &963194225
GameObject:
Expand Down Expand Up @@ -402,9 +401,17 @@ Camera:
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
Expand Down Expand Up @@ -438,13 +445,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1001331458
GameObject:
Expand Down Expand Up @@ -522,7 +529,9 @@ Canvas:
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 0
m_AdditionalShaderChannelsFlag: 0
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
Expand All @@ -542,7 +551,6 @@ RectTransform:
- {fileID: 1912959189}
- {fileID: 48880254}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -584,7 +592,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1001331462}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
Expand Down Expand Up @@ -717,7 +724,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1001331462}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -822,11 +828,20 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2081334773}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 963194228}
- {fileID: 705507995}
- {fileID: 1001331462}
- {fileID: 2081334776}
- {fileID: 246868626}
2 changes: 1 addition & 1 deletion Assets/PalmDetectionVisualizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace NatML.Visualizers {
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using NatML.VideoKit.UI;
using NatML.Vision;
using VideoKit.UI;

/// <summary>
/// </summary>
Expand Down
3 changes: 3 additions & 0 deletions Packages/ai.natml.vision.blazepalm.detector/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## 1.0.2
+ Upgraded to NatML 1.1.15.

## 1.0.1
+ Added `BlazePalmDetector.Create` static method for creating the detector.
+ Removed `BlazePalmDetector` public constructor. Use `BlazePalmDetector.Create` method instead.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ namespace NatML.Vision {
public sealed partial class BlazePalmDetector : IMLPredictor<BlazePalmDetector.Detection[]> {

#region --Client API--
/// <summary>
/// Predictor tag on NatML.
/// </summary>
public const string Tag = "@natml/blazepalm-detector";

/// <summary>
/// Detect palms in an image.
/// </summary>
Expand Down Expand Up @@ -105,7 +110,7 @@ public static async Task<BlazePalmDetector> Create (
MLEdgeModel.Configuration configuration = null,
string accessKey = null
) {
var model = await MLEdgeModel.Create("@natml/blazepalm-detector", configuration, accessKey);
var model = await MLEdgeModel.Create(Tag, configuration, accessKey);
var predictor = new BlazePalmDetector(model, minScore, maxIoU);
return predictor;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "NatML.Vision.BlazePalm.Detector",
"references": [
"NatML.ML"
"NatML.Runtime"
],
"includePlatforms": [
"Android",
Expand Down
6 changes: 3 additions & 3 deletions Packages/ai.natml.vision.blazepalm.detector/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "ai.natml.vision.blazepalm.detector",
"version": "1.0.1",
"version": "1.0.2",
"displayName": "BlazePalm Detector",
"description": "Palm detection from Google MediaPipe in Unity Engine.",
"unity": "2021.2",
"unity": "2022.3",
"dependencies": {
"ai.natml.natml": "1.1.3"
"ai.natml.natml": "1.1.15"
},
"keywords": [
"natml",
Expand Down
14 changes: 8 additions & 6 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@
"name": "NatML",
"url": "https://registry.npmjs.com",
"scopes": [
"ai.fxn",
"ai.natml"
]
}
],
"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",
Expand Down
Loading

0 comments on commit 01d433a

Please sign in to comment.