Merge pull request #3 from SimonDarksideJ/SingletonRestartFix

Fix restart issue with FizzyoFramework

Author: leestott

Assets/Fizzyo/Scripts/FizzyoFramework/FizzyoFramework.cs

@@ -92,10 +92,10 @@ public static FizzyoFramework Instance
                     Debug.LogWarning("[Singleton] Instance '" + typeof(FizzyoFramework) +
                         "' already destroyed on application quit." +
                         " Won't create again - returning null.");
-               //     return null;
+                    //     return null;
                 }
 
-               // lock (_lock)
+                // lock (_lock)
                 {
                     if (_instance == null)
                     {
@@ -187,7 +187,8 @@ void Start()
         private void Update()
         {
             //update the breath recoginiser
-            if (Device != null) {
+            if (Device != null)
+            {
                 Recogniser.AddSample(Time.deltaTime, Device.Pressure());
             }
 
@@ -245,19 +246,19 @@ private void Update()
         /// false if data is not loaded and playing offline
         /// </returns>
         public bool Load()
-            {
+        {
             //Login to server
 
             if (showLoginAutomatically)
             {
                 LoginReturnType loginResult = User.Login();
 
 
-            if (loginResult != LoginReturnType.SUCCESS)
-            {
-                PlayOffline();
-                return false;
-            }
+                if (loginResult != LoginReturnType.SUCCESS)
+                {
+                    PlayOffline();
+                    return false;
+                }
             }
             else
             {
@@ -281,20 +282,26 @@ public bool Load()
         /// Sets up the player preferences to allow the user to play offline
         /// </summary>
         private static void PlayOffline()
-            {
-               // ResetPlayerPrefs();
-            }
+        {
+            // ResetPlayerPrefs();
+        }
 
-            /// <summary>
-            /// Resets all of the player preferences
-            /// </summary>
+        /// <summary>
+        /// Resets all of the player preferences
+        /// </summary>
 
 
 
-            public void OnDestroy()
-            {
-                applicationIsQuitting = true;
-            }
+        public void OnDestroy()
+        {
+            applicationIsQuitting = true;
+        }
+
+        private void OnEnable()
+        {
+            applicationIsQuitting = false;
+
+        }
 
 
     }

Assets/Fizzyo/Scripts/SceneScripts/PlayerBehaviour.cs

@@ -1,28 +1,35 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Fizzyo;
-
-public class PlayerBehaviour : MonoBehaviour {
-
-    //Speed to move character at
-    public float speed = 0.04f;
-    public float flyHeight = 3.0f;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using Fizzyo;
+using UnityEngine.SceneManagement;
+
+public class PlayerBehaviour : MonoBehaviour {
+
+    //Speed to move character at
+    public float speed = 0.04f;
+    public float flyHeight = 3.0f;
     Vector3 destPos;
     // Use this for initialization
     void Start () {
         destPos = transform.position;
-    }
-	
-	// Update is called once per frame
-	void Update () {
-        //move the player forward
-        float x = transform.position.x + speed;
-        //set height of the player using the player breath intensity
-        float y = FizzyoFramework.Instance.Device.Pressure() * flyHeight;
-        //Device.Pressure() can return negative numbers if the player is breathing in. Clamp the player height to be above 0
-        y = Mathf.Max(y, 0);
-
-        transform.position = new Vector3(x,y, 0);
-	}
-}
+    }
+	
+	// Update is called once per frame
+	void Update () {
+        //move the player forward
+        float x = transform.position.x + speed;
+        //set height of the player using the player breath intensity
+        float y = FizzyoFramework.Instance.Device.Pressure() * flyHeight;
+        //Device.Pressure() can return negative numbers if the player is breathing in. Clamp the player height to be above 0
+        y = Mathf.Max(y, 0);
+
+        transform.position = new Vector3(x,y, 0);
+
+        if (Input.GetKeyDown(KeyCode.Q))
+        {
+            Debug.Log("Level Restarted");
+            SceneManager.LoadScene("ExampleLevel");
+        }
+	}
+}