Merge branch 'release/0.2.0-alpha'

Author: Wing Chau

Assets/Scenes/StartScene.unity

@@ -3,8 +3,10 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
+using UnityEngine.EventSystems;
+using Utilities;
 
-public class MenuFunctions : MonoBehaviour {
+public class MenuFunctions : MonoBehaviour, IGvrPointerHoverTarget {
 
     [SerializeField]
     private float speed , maxSize, minSize , incrementBy ,decrementBy;
@@ -20,13 +22,16 @@ public class MenuFunctions : MonoBehaviour {
     [SerializeField]
     Image image;
 
+    [SerializeField]
+    private GameObject m_player; // TODO implement super class to handle target object mapping
+
     private float crtScale,crtAlpha = 0.0f;
-    
+
 	// Use this for initialization
 	void Start () {
-		
+
 	}
-	
+
 	public void OnStartJourneyButton()
     {
         SceneManager.LoadScene(1);
@@ -45,13 +50,24 @@ public void OnHoverButton()
         InvokeRepeating("IncrementScale", speed,speed);
         CancelInvoke("DecrementScale");
         print("Incrementing" + " " + incrementAlphaBy + " " + decrementAlphaBy);
+
+        ExecuteEvents.Execute<IGvrPointerHoverEvent>(m_player, null, (x, y) => x.OnGvrPointerHover(this));
+        // TODO move to super class
+
     }
     public void OnHoverExitButton()
     {
         CancelInvoke("DecrementScale");
         CancelInvoke("IncrementScale");
         panel.localScale = new Vector3(minSize, minSize, minSize);
         print("Decrementing");
+
+        ExecuteEvents.Execute<IGvrPointerHoverEvent>(m_player, null, (x, y) => x.OnGvrPointerHoverExit());
+        // TODO move to super class
+    }
+
+    void IGvrPointerHoverTarget.Execute() {
+        OnStartJourneyButton();
     }
 
     private void IncrementScale()

Assets/Scripts/MenuFunctions.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using Utilities;
+
+public class GvrPointerHoverEvent : MonoBehaviour, IGvrPointerHoverEvent {
+
+    [SerializeField] private GameObject m_progressBar;
+    [SerializeField] private Image m_progress;
+
+    private float m_hoverTime = 2.0f; // hover 2s to preform as click
+    private bool m_onHover = false;
+    private bool m_reset = false;
+
+    private IGvrPointerHoverTarget m_target;
+
+	// Use this for initialization
+	void Start () {
+        m_progress.fillAmount = 0;
+	}
+
+	// Update is called once per frame
+	void Update () {
+        if (m_onHover) {
+            ActiveProgressBar();
+        } else {
+            if (m_reset)
+                ResetProgressBar();
+        }
+	}
+
+    void IGvrPointerHoverEvent.OnGvrPointerHover(IGvrPointerHoverTarget target) {
+        m_target = target;
+        m_onHover = true;
+
+        Debug.Log("on hover");
+    }
+
+    void IGvrPointerHoverEvent.OnGvrPointerHoverExit() {
+        m_onHover = false;
+
+        Debug.Log("hover exit");
+    }
+
+    void ActiveProgressBar() {
+        m_progressBar.SetActive(true);
+        m_reset = true;
+
+        if (m_progress.fillAmount < 1) {
+            m_progress.fillAmount += 1.0f / m_hoverTime * Time.deltaTime;
+        } else {
+            m_target.Execute();
+        }
+    }
+
+    void ResetProgressBar() {
+        m_progressBar.SetActive(false);
+        m_reset = false;
+
+        m_progress.fillAmount = 0;
+    }
+}

Assets/Scripts/Utilities.meta

@@ -0,0 +1,13 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace Utilities {
+
+    internal interface IGvrPointerHoverEvent : IEventSystemHandler {
+
+        void OnGvrPointerHover(IGvrPointerHoverTarget target);
+        void OnGvrPointerHoverExit();
+    }
+}

Assets/Scripts/Utilities/GvrPointerHoverEvent.cs

@@ -0,0 +1,12 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+
+namespace Utilities {
+
+    internal interface IGvrPointerHoverTarget : IEventSystemHandler{
+
+        void Execute();
+    }
+}

Assets/Scripts/Utilities/GvrPointerHoverEvent.cs.meta

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class OnPointerHover : MonoBehaviour {
+
+    private float hoverTime = 3.0f;
+    [SerializeField] private Image progressBar;
+
+	// Use this for initialization
+	void Start () {
+        progressBar.fillAmount = 0;
+	}
+
+	// Update is called once per frame
+	void Update () {
+
+        if (progressBar.fillAmount < 1) {
+            progressBar.fillAmount += 1.0f / hoverTime * Time.deltaTime;
+        }
+	}
+}