Refactoring

.github/workflows/publish.yml

@@ -0,0 +1,17 @@
+name: Publish to NPM
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+jobs:
+  npm:
+    runs-on: ubuntu-latest
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
+      with:
+        registry-url: 'https://registry.npmjs.org'
+    - run: npm publish --access public
+      working-directory: Packages/ai.natml.vision.blazepose-detector

Assembly-CSharp.csproj

@@ -22,7 +22,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;UNITY_2021_3_4;UNITY_2021_3;UNITY_2021;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_SEARCH_EXTENSION_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;PLATFORM_STANDALONE;TEXTCORE_1_0_OR_NEWER;PLATFORM_STANDALONE_OSX;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_SPATIALTRACKING;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;UNITY_2021_3_4;UNITY_2021_3;UNITY_2021;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_SEARCH_EXTENSION_API;SCENE_TEMPLATE_MODULE;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_MANAGED_UNITYTLS;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;PLATFORM_WEBGL;TEXTCORE_1_0_OR_NEWER;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_SPATIALTRACKING;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169</NoWarn>
@@ -44,9 +44,6 @@
     <Reference Include="UnityEngine.AIModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.AIModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.ARModule">
-        <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.ARModule.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.AccessibilityModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll</HintPath>
     </Reference>
@@ -65,12 +62,6 @@
     <Reference Include="UnityEngine.ClothModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.ClusterInputModule">
-        <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.ClusterRendererModule">
-        <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEngine.CoreModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.CoreModule.dll</HintPath>
     </Reference>
@@ -227,8 +218,8 @@
     <Reference Include="UnityEngine.VideoModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.VideoModule.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEngine.VirtualTexturingModule">
-        <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll</HintPath>
+    <Reference Include="UnityEngine.WebGLModule">
+        <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/PlaybackEngines/WebGLSupport/Managed/UnityEngine.WebGLModule.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.WindModule">
         <HintPath>/Applications/Unity/Hub/Editor/2021.3.4f1/Unity.app/Contents/Managed/UnityEngine/UnityEngine.WindModule.dll</HintPath>

Assets/BlazePoseDetectorSample.cs

@@ -1,5 +1,5 @@
 /* 
-*   BlazePose
+*   BlazePose Detector
 *   Copyright (c) 2022 NatML Inc. All Rights Reserved.
 */
 
@@ -49,15 +49,14 @@ void Update () {
             // Check that the detector has been loaded
             if (predictor == null)
                 return;
-            // Create input feature
-            var previewTexture = previewTextureOutput.texture;
-            var imageFeature = new MLImageFeature(previewTexture.GetRawTextureData<byte>(), previewTexture.width, previewTexture.height);
+            // Create image feature
+            var imageFeature = new MLImageFeature(previewTextureOutput.texture);
             (imageFeature.mean, imageFeature.std) = modelData.normalization;
             imageFeature.aspectMode = modelData.aspectMode;
-            // Predict
-            var poses = predictor.Predict(imageFeature);
-            // Visualize
-            visualizer.Render(poses);
+            // Detect people in the image
+            var detections = predictor.Predict(imageFeature);
+            // Visualize detections
+            visualizer.Render(detections);
         }
     }
 }

Assets/DetectionVisualizer.cs

@@ -1,5 +1,5 @@
 /* 
-*   BlazePose
+*   BlazePose Detector
 *   Copyright (c) 2022 NatML Inc. All Rights Reserved.
 */
 
@@ -24,6 +24,9 @@ public sealed class DetectionVisualizer : MonoBehaviour {
 
 
         #region --Client API--
+        /// <summary>
+        /// Detection source image.
+        /// </summary>
         public Texture2D image {
             get => rawImage.texture as Texture2D;
             set {

Packages/ai.natml.vision.blazepose-detector/README.md → Packages/ai.natml.vision.blazepose.detector/README.md

@@ -44,12 +44,12 @@ BlazePoseDetector.Detection[] faces = predictor.Predict(imageFeature);
 ___
 
 ## Requirements
-- Unity 2020.3+
+- Unity 2021.2+
 
 ## Quick Tips
+- Join the [NatML community on Discord](https://hub.natml.ai/community).
 - Discover more ML models on [NatML Hub](https://hub.natml.ai).
 - See the [NatML documentation](https://docs.natml.ai/unity).
-- Join the [NatML community on Discord](https://hub.natml.ai/community).
 - Discuss [NatML on Unity Forums](https://forum.unity.com/threads/open-beta-natml-machine-learning-runtime.1109339/).
 - Contact us at [[email protected]](mailto:[email protected]).
 

Packages/ai.natml.vision.blazepose-detector/Runtime/BlazePoseDetector.cs → Packages/ai.natml.vision.blazepose.detector/Runtime/BlazePoseDetector.cs

@@ -31,7 +31,7 @@ public BlazePoseDetector (MLModel model, float minScore = 0.4f, float maxIoU = 0
             this.maxIoU = maxIoU;
             this.anchors = GenerateAnchors(
                 model.inputs[0] as MLImageType,
-                new [] { 8, 16, 16, 16 }, //new [] { 8, 16, 32, 32, 32 },
+                new [] { 8, 16, 16, 16 },
                 0.1484375f,
                 0.75f
             );
@@ -112,20 +112,14 @@ public Detection[] Predict (params MLFeature[] inputs) {
         private readonly MLEdgeModel model;
         private readonly float minScore;
         private readonly float maxIoU;
+        private readonly Vector2[] anchors;
         private readonly List<Rect> candidateBoxes;
         private readonly List<float> candidateScores;
         private readonly List<Vector2[]> candidatePoints;
-        private readonly Vector2[] anchors;
 
         void IDisposable.Dispose () { } // Not used
 
-        private static Vector2[] GenerateAnchors (
-            MLImageType type,
-            int[] strides,
-            float minScale,
-            float maxScale,
-            float aspect = 1f
-        ) {
+        private static Vector2[] GenerateAnchors (MLImageType type, int[] strides, float minScale, float maxScale, float aspect = 1f) {
             var result = new List<Vector2>();
             var layerId = 0;
             while (layerId < strides.Length) {
@@ -154,13 +148,8 @@ private static Vector2[] GenerateAnchors (
             }
             return result.ToArray();
         }
-
-        private static float CalculateScale (
-            float minScale,
-            float maxScale,
-            int strideIdx,
-            int strideCount
-        ) {
+
+        private static float CalculateScale (float minScale, float maxScale, int strideIdx, int strideCount) {
             if (strideCount == 1)
                 return (minScale + maxScale) * 0.5f;
             else

Packages/ai.natml.vision.blazepose-detector/package.json → Packages/ai.natml.vision.blazepose.detector/package.json

@@ -3,9 +3,9 @@
     "version": "1.0.2",
     "displayName": "BlazePose Detector",
     "description": "Pose detection with MediaPipe BlazePose.",
-    "unity": "2020.3",
+    "unity": "2021.2",
     "dependencies": {
-        "ai.natml.natml": "1.0.17"
+        "ai.natml.natml": "1.0.18"
     },
     "keywords": [
         "natml",

Packages/manifest.json

@@ -7,7 +7,7 @@
     }
   ],
   "dependencies": {
-    "ai.natml.natdevice": "1.2.3",
+    "ai.natml.natdevice": "1.2.5",
     "com.unity.collab-proxy": "1.15.17",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.14",

Packages/packages-lock.json

@@ -2,22 +2,22 @@
   "dependencies": {
     "ai.natml.hub": {
       "version": "1.0.12",
-      "depth": 2,
+      "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://registry.npmjs.com"
     },
     "ai.natml.natdevice": {
-      "version": "1.2.3",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "ai.natml.hub": "1.0.10"
+        "ai.natml.hub": "1.0.12"
       },
       "url": "https://registry.npmjs.com"
     },
     "ai.natml.natml": {
-      "version": "1.0.17",
+      "version": "1.0.18",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -26,11 +26,11 @@
       "url": "https://registry.npmjs.com"
     },
     "ai.natml.vision.blazepose.detector": {
-      "version": "file:ai.natml.vision.blazepose-detector",
+      "version": "file:ai.natml.vision.blazepose.detector",
       "depth": 0,
       "source": "embedded",
       "dependencies": {
-        "ai.natml.natml": "1.0.17"
+        "ai.natml.natml": "1.0.18"
       }
     },
     "com.unity.collab-proxy": {

ProjectSettings/ProjectSettings.asset

@@ -137,7 +137,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -791,12 +792,12 @@ PlayerSettings:
   webGLNameFilesAsHashes: 0
   webGLDataCaching: 1
   webGLDebugSymbols: 0
-  webGLEmscriptenArgs: 
+  webGLEmscriptenArgs: ' --bind '
   webGLModulesDirectory: 
   webGLTemplate: APPLICATION:Default
   webGLAnalyzeBuildSize: 0
   webGLUseEmbeddedResources: 0
-  webGLCompressionFormat: 1
+  webGLCompressionFormat: 2
   webGLWasmArithmeticExceptions: 0
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0

README.md

@@ -1,5 +1,37 @@
-# BlazePose Detector Sample
+# BlazePose Detector
 
 ![demo](demo.gif)
 
-*INCOMPLETE*
+Pose detection 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. Note that running the sample code requires an active [NatML Cloud](https://www.natml.ai/pricing) subscription:
+
+![project settings](https://github.com/natmlx/NatDevice/raw/main/.media/key.png)
+
+## Using the Predictor in a Different Project
+[See the predictor README for more details](Packages/ai.natml.vision.blazepose.detector/README.md).
+
+## Requirements
+- Unity 2021.2+
+
+## Supported Platforms
+- Android API level 24+
+- iOS 13+
+- macOS 10.15+ (Apple Silicon and Intel)
+- Windows 10+ (64-bit only)
+- WebGL:
+    - Chrome 91+
+    - Firefox 90+
+
+## Resources
+- Join the [NatML community on Discord](https://hub.natml.ai/community).
+- See the [NatML documentation](https://docs.natml.ai/unity).
+- See the [NatDevice documentation](https://docs.natml.ai/natdevice).
+- Check out [NatML on GitHub](https://github.com/natmlx).
+- Read the [NatML blog](https://blog.natml.ai/).
+- Discuss [NatML on Unity Forums](https://forum.unity.com/threads/open-beta-natml-machine-learning-runtime.1109339/).
+- Discuss [NatDevice on Unity Forums](https://forum.unity.com/threads/natdevice-media-device-api.374690/).
+- Contact us at [[email protected]](mailto:[email protected]).
+
+Thank you very much!