Upload 3 files

README.md

@@ -4,7 +4,7 @@ license: apache-2.0
 library_name: unity-sentis
 ---
 
-# Hand Landmark from Google Mediapipe validated for Unity Sentis (Version 1.3.0-pre.3*)
+# Hand Landmark from Google Mediapipe validated for Unity Sentis (Version 1.4.0-pre.3*)
 *Version 1.3.0 Sentis files are not compatible with Sentis 1.4.0 and need to be recreated/downloaded
 
 This is the [Hand Landmark model](https://developers.google.com/mediapipe/solutions/vision/hand_landmarker) from Google in the Sentis format.
@@ -15,8 +15,9 @@ The model detects 3D markers on a hand centered in an image. You could use these
 
 ## How to Use
 * Create a new scene in Unity 2023
-* Install `com.unity.sentis` version `1.3.0-pre.3` from the package manager
-* Put the hand_landmark.sentis file in the `Assets/StreamingAssets` folder
+* Install `com.unity.sentis` version `1.4.0-pre.3` from the package manager
+* Add the c# file to the Main Camera
+* Drag the hand_landmark.sentis file in asset field
 * Put a video in the `Assets/StreamingAssets` folder and set `videoName` variable to the video name
 * Create a RawImage and place it in your scene. Link to this image in the `previewUI` field.
 

RunHandLandmark.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using Unity.Sentis;
 using UnityEngine.Video;
 using UnityEngine.UI;
+using System.IO;
 using Lays = Unity.Sentis.Layers;
 using System.Collections.Generic;
 
@@ -12,7 +13,7 @@ using System.Collections.Generic;
  * Basic inference script for blaze hand landmarks
  * 
  * Put this script on the Main Camera
- * Put hand_landmark.sentis in the Assets/StreamingAssets folder
+ * Drag the sentis file onto the modelAsset field
  * Create a RawImage of in the scene
  * Put a link to that image in previewUI
  * Put a video in Assets/StreamingAssets folder and put the name of it int videoName
@@ -23,11 +24,14 @@ using System.Collections.Generic;
 
 public class RunHandLandmark : MonoBehaviour
 {
+    //Draw the *.sentis or *.onnx model asset here:
+    public ModelAsset asset;
+    string modelName = "hand_landmark.sentis";
     //Drag a link to a raw image here:
     public RawImage previewUI = null;
 
     // Put your bounding box sprite image here
-    public Sprite faceTexture;
+    public Sprite boxSprite;
 
     // 6 optional sprite images (left eye, right eye, nose, mouth, left ear, right ear)
     public Sprite[] markerTextures;
@@ -53,9 +57,6 @@ public class RunHandLandmark : MonoBehaviour
     //Holds image size
     const int size = 224;
 
-    Ops ops;
-    ITensorAllocator allocator;
-
     Model model;
 
     //webcam device name:
@@ -74,8 +75,6 @@ public class RunHandLandmark : MonoBehaviour
     List<GameObject> boxPool = new();
     void Start()
     {
-        allocator = new TensorCachingAllocator();
-
         //(Note: if using a webcam on mobile get permissions here first)
 
         targetTexture = new RenderTexture(resolution.x, resolution.y, 0);
@@ -88,12 +87,12 @@ public class RunHandLandmark : MonoBehaviour
 
     void SetupModel()
     {
-        model = ModelLoader.Load(Application.streamingAssetsPath + "/hand_landmark.sentis");
+        model = ModelLoader.Load(asset);
+        //model = ModelLoader.Load(Path.Join(Application.streamingAssetsPath ,modelName));
     }
     public void SetupEngine()
     {
         worker = WorkerFactory.CreateWorker(backend, model);
-        ops = WorkerFactory.CreateOps(backend, allocator);
     }
 
     void SetupInput()
@@ -190,7 +189,7 @@ public class RunHandLandmark : MonoBehaviour
                 width = 8f * scale.x,
                 height = 8f * scale.y,
             };
-            DrawBox(marker, j < markerTextures.Length ? markerTextures[j] : faceTexture, j);
+            DrawBox(marker, j < markerTextures.Length ? markerTextures[j] : boxSprite, j);
         }
     }
 
@@ -199,10 +198,7 @@ public class RunHandLandmark : MonoBehaviour
         var transform = new TextureTransform();
         transform.SetDimensions(size, size, 3);
         transform.SetTensorLayout(0, 1, 2, 3);
-        using var image0 = TextureConverter.ToTensor(source, transform);
-
-        // Pre-process the image to make input in range (-1..1)
-        using var image = ops.Mad(image0, 2f, -1f);
+        using var image = TextureConverter.ToTensor(source, transform);
 
         worker.Execute(image);
 
@@ -211,7 +207,7 @@ public class RunHandLandmark : MonoBehaviour
         ClearAnnotations();
 
         Vector2 markerScale = previewUI.rectTransform.rect.size/ size;
-        landmarks.MakeReadable();
+        landmarks.CompleteOperationsAndDownload();
         DrawLandmarks(landmarks, markerScale);
 
         bool showExtraInformation = false;
@@ -219,8 +215,8 @@ public class RunHandLandmark : MonoBehaviour
         {
             using var A = worker.PeekOutput("Identity_1") as TensorFloat;
             using var B = worker.PeekOutput("Identity_2") as TensorFloat;
-            A.MakeReadable();
-            B.MakeReadable();
+            A.CompleteOperationsAndDownload();
+            B.CompleteOperationsAndDownload();
             Debug.Log("A,B=" + A[0, 0] + "," + B[0, 0]);
         }
     }
@@ -263,8 +259,6 @@ public class RunHandLandmark : MonoBehaviour
     void CleanUp()
     {
         closing = true;
-        ops?.Dispose();
-        allocator?.Dispose();
         if (webcam) Destroy(webcam);
         if (video) Destroy(video);
         RenderTexture.active = null;

hand_landmark.sentis

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:584d24cd0814e354d9f14b74a53a921c5ff0c31ca282872cc0ca3b6dc21119de
-size 3879993
+oid sha256:dc2d912227dd19ba9482b0ec0fd2c69d2665191d3473925b25d7ec1d0b04cd5d
+size 3812936