popup se il leap si disconnette

dvgniele · Mar 2, 2021 · 189b949 · 189b949
1 parent 8eafe20
commit 189b949
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/MarcoSmiles/Assets/Own/Scenes/TrainingScene 1.unity b/MarcoSmiles/Assets/Own/Scenes/TrainingScene 1.unity
@@ -6371,7 +6371,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1662408758
 RectTransform:
   m_ObjectHideFlags: 0

diff --git a/MarcoSmiles/Assets/Own/Scripts/MS_LeapController.cs b/MarcoSmiles/Assets/Own/Scripts/MS_LeapController.cs
@@ -14,8 +14,7 @@ public class MS_LeapController : MonoBehaviour
 
     bool connected = false;
     bool notified = false;
-
-    bool prevState = false;
+    bool notConnectedShowed = true;
 
     // Start is called before the first frame update
     void Start()
@@ -32,6 +31,13 @@ void Start()
     // Update is called once per frame
     void Update()
     {
+        if(controller.Devices.Count == 0 && !notConnectedShowed)
+        {
+            notified = false;
+            notConnectedShowed = true;
+            MS_LeapListener.Connected = false;
+            _GM.ShowConnectLeapPopup();
+        }
 
         //  ascolta ogni frame del leap motion
         if (controller.Devices.Count > 0 && !connected)
@@ -43,6 +49,7 @@ void Update()
         if (MS_LeapListener.Connected && !notified)
         {
             notified = true;
+            notConnectedShowed = false;
             _GM.HideConnectLeapPopup();
         }
     }

diff --git a/MarcoSmiles/Assets/Own/Scripts/TrainingScript.cs b/MarcoSmiles/Assets/Own/Scripts/TrainingScript.cs
@@ -131,21 +131,6 @@ private void DataSelector()
 
     public async Task<bool> RemoveNote()
     {
-        /*
-        Task delete = Task.Run(() =>
-        {
-            try
-            {
-                Task.WaitAny(FileUtils.DeleteRowsNote(currentNoteId));
-
-                return true;
-            }
-            catch { return false; }
-        });
-
-        return await Task.FromResult(true);
-        */
-
         await FileUtils.DeleteRowsNote(currentNoteId);
         return true;
     }

diff --git a/MarcoSmiles/Assets/Own/Scripts/_GM.cs b/MarcoSmiles/Assets/Own/Scripts/_GM.cs
@@ -210,10 +210,6 @@ void Start()
     }
     void FixedUpdate()
     {
-        StartCircleAnimation();
-
-
-
         if (currSceneEnum == SceneEnum.Suonah)
         {
             if (isActive)
@@ -242,11 +238,9 @@ void FixedUpdate()
         {
             //  Debug.Log(FileUtils.selectedDataset);
 
-
-            /*
             if (LoadingCircle.activeSelf)
                 StartCircleAnimation();
-            */
+
 
         }
     }