Add Model v1.1.0

NewLandTV · Feb 22, 2024 · 3f3e912 · 3f3e912
1 parent 4a6733a
commit 3f3e912
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 4 deletions.
diff --git a/Apps/Unity/Assets/AI/Models/2024-02-22_001-2_Model.onnx b/Apps/Unity/Assets/AI/Models/2024-02-22_001-2_Model.onnx
diff --git a/Apps/Unity/Assets/AI/Models/2024-02-22_001-2_Model.onnx.meta b/Apps/Unity/Assets/AI/Models/2024-02-22_001-2_Model.onnx.meta
diff --git a/Apps/Unity/Assets/Scenes/Main.unity b/Apps/Unity/Assets/Scenes/Main.unity
@@ -529,8 +529,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: aaa9e23bf08e57e458c6ce77b279f99d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  model: {fileID: 5022602860645237092, guid: 96a73ee5fe8be1f42a5744fbd4b58433, type: 3}
+  model: {fileID: 5022602860645237092, guid: 62fd124ca0caee14a838f710fd555c91, type: 3}
   inputTexture: {fileID: 2800000, guid: 95fd240e32e79ce43b92d1276ea7ecba, type: 3}
+  board: {fileID: 410483257}
   prediction:
     predictedValue: 0
     predicted: []

diff --git a/Apps/Unity/Assets/Scripts/ToggleButton.cs b/Apps/Unity/Assets/Scripts/ToggleButton.cs
@@ -2,7 +2,7 @@
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
-public class ToggleButton : MonoBehaviour, IPointerClickHandler
+public class ToggleButton : MonoBehaviour, IPointerEnterHandler, IPointerClickHandler
 {
     private Color originColor;
     public Color onColor;
@@ -17,9 +17,23 @@ private void Awake()
         originColor = image.color;
     }
 
+    public void SetOn(bool value)
+    {
+        image.color = (IsOn = value) ? onColor : originColor;
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        if (!Input.GetMouseButton(0))
+        {
+            return;
+        }
+
+        SetOn(!IsOn);
+    }
+
     public void OnPointerClick(PointerEventData eventData)
     {
-        IsOn = !IsOn;
-        image.color = IsOn ? onColor : originColor;
+        SetOn(!IsOn);
     }
 }
diff --git a/Apps/Unity/Assets/Scripts/UIPaintBoard.cs b/Apps/Unity/Assets/Scripts/UIPaintBoard.cs
@@ -34,4 +34,12 @@ private void Update()
         targetTexture.SetPixels(colors);
         targetTexture.Apply();
     }
+
+    public void ClearBoard()
+    {
+        for (int i = 0; i < targetTexture.width * targetTexture.height; i++)
+        {
+            toggleButtonList[i].SetOn(false);
+        }
+    }
 }
diff --git a/Apps/Unity/Assets/Scripts/WhatShape.cs b/Apps/Unity/Assets/Scripts/WhatShape.cs
@@ -9,6 +9,8 @@ public class WhatShape : MonoBehaviour
     private Model runtimeModel;
     public Texture2D inputTexture;
 
+    public UIPaintBoard board;
+
     private IWorker engine;
 
     [Serializable]
@@ -49,6 +51,11 @@ private void Update()
         {
             Predict();
         }
+
+        if (Input.GetKeyDown(KeyCode.Delete))
+        {
+            board.ClearBoard();
+        }
     }
 
     public void Predict()

diff --git a/ONNX/Model.onnx → ONNX/2024-02-20_001-1_Model.onnx b/ONNX/Model.onnx → ONNX/2024-02-20_001-1_Model.onnx
diff --git a/ONNX/2024-02-22_001-2_Model.onnx b/ONNX/2024-02-22_001-2_Model.onnx