Update RunYOLO.cs

RunYOLO.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Unity.Sentis;
 using UnityEngine;
 using UnityEngine.UI;
@@ -17,6 +17,7 @@ using UnityEngine.Video;
 
 public class RunYOLO : MonoBehaviour
 {
+    public ModelAsset modelAsset;
     const string modelName = "yolov7-tiny.sentis";
     // Change this to the name of the video you put in StreamingAssets folder:
     const string videoName = "giraffes.mp4";
@@ -25,7 +26,8 @@ public class RunYOLO : MonoBehaviour
     // Create a Raw Image in the scene and link it here:
     public RawImage displayImage;
     // Link to a bounding box texture here:
-    public Sprite boxTexture;
+    public Sprite borderSprite;
+    public Texture2D borderTexture;
     // Link to the font for the labels:
     public Font font;
 
@@ -53,17 +55,18 @@ public class RunYOLO : MonoBehaviour
         public string label;
         public float confidence;
     }
-    
+
     void Start()
     {
         Application.targetFrameRate = 60;
         Screen.orientation = ScreenOrientation.LandscapeLeft;
-        
+
         //Parse neural net labels
         labels = labelsAsset.text.Split('\n');
 
         //Load model
-        model = ModelLoader.Load(Application.streamingAssetsPath +"/"+ modelName);
+        model = ModelLoader.Load(modelAsset);
+        //model = ModelLoader.Load(Application.streamingAssetsPath + "/" + modelName);
 
         targetRT = new RenderTexture(imageWidth, imageHeight, 0);
 
@@ -74,6 +77,11 @@ public class RunYOLO : MonoBehaviour
         engine = WorkerFactory.CreateWorker(backend, model);
 
         SetupInput();
+
+        if (borderSprite == null)
+        {
+            borderSprite = Sprite.Create(borderTexture, new Rect(0, 0, borderTexture.width, borderTexture.height), new Vector2(borderTexture.width / 2, borderTexture.height / 2));
+        }
     }
     void SetupInput()
     {
@@ -112,7 +120,7 @@ public class RunYOLO : MonoBehaviour
 
         //Read output tensors
         var output = engine.PeekOutput() as TensorFloat;
-        output.MakeReadable();
+        output.CompleteOperationsAndDownload();
 
         float displayWidth = displayImage.rectTransform.rect.width;
         float displayHeight = displayImage.rectTransform.rect.height;
@@ -120,15 +128,17 @@ public class RunYOLO : MonoBehaviour
         float scaleX = displayWidth / imageWidth;
         float scaleY = displayHeight / imageHeight;
 
+
+        int foundBoxes = output.shape[0];
         //Draw the bounding boxes
-        for (int n = 0; n < output.shape[0]; n++)
+        for (int n = 0; n < foundBoxes; n++)
         {
             var box = new BoundingBox
             {
-                centerX = ((output[n, 1] + output[n, 3])*scaleX - displayWidth) / 2,
-                centerY = ((output[n, 2] + output[n, 4])*scaleY - displayHeight) / 2,
-                width = (output[n, 3] - output[n, 1])*scaleX,
-                height = (output[n, 4] - output[n, 2])*scaleY,
+                centerX = ((output[n, 1] + output[n, 3]) * scaleX - displayWidth) / 2,
+                centerY = ((output[n, 2] + output[n, 4]) * scaleY - displayHeight) / 2,
+                width = (output[n, 3] - output[n, 1]) * scaleX,
+                height = (output[n, 4] - output[n, 2]) * scaleY,
                 label = labels[(int)output[n, 5]],
                 confidence = Mathf.FloorToInt(output[n, 6] * 100 + 0.5f)
             };
@@ -136,7 +146,7 @@ public class RunYOLO : MonoBehaviour
         }
     }
 
-    public void DrawBox(BoundingBox box , int id)
+    public void DrawBox(BoundingBox box, int id)
     {
         //Create the bounding box graphic or get from pool
         GameObject panel;
@@ -155,7 +165,7 @@ public class RunYOLO : MonoBehaviour
         //Set box size
         RectTransform rt = panel.GetComponent<RectTransform>();
         rt.sizeDelta = new Vector2(box.width, box.height);
-        
+
         //Set label text
         var label = panel.GetComponentInChildren<Text>();
         label.text = box.label + " (" + box.confidence + "%)";
@@ -169,7 +179,7 @@ public class RunYOLO : MonoBehaviour
         panel.AddComponent<CanvasRenderer>();
         Image img = panel.AddComponent<Image>();
         img.color = color;
-        img.sprite = boxTexture;
+        img.sprite = borderSprite;
         img.type = Image.Type.Sliced;
         panel.transform.SetParent(displayLocation, false);
 
@@ -198,7 +208,7 @@ public class RunYOLO : MonoBehaviour
 
     public void ClearAnnotations()
     {
-        foreach(var box in boxPool)
+        foreach (var box in boxPool)
         {
             box.SetActive(false);
         }
@@ -208,4 +218,4 @@ public class RunYOLO : MonoBehaviour
     {
         engine?.Dispose();
     }
-}
+}