Merge branch 'toggle-menu'

.gitignore

@@ -130,6 +130,5 @@ captures/
 ### Android Patch ###
 gen-external-apklibs
 
-
 ### MacVIM ###
 *.swp

Assets/Scripts/RadialMenu/MenuOpener.cs

@@ -13,8 +13,10 @@ public struct RadialMenuOption {
 public class MenuOpener : MonoBehaviour, IGvrGazeResponder {
 
 	public RadialMenuSpawner Spawner;
-
 	public RadialMenuOption[] options;
+	public bool UseToggleBehaviour;
+
+	private bool shown = false;
 
 	public void OnGazeEnter() {
 	}
@@ -23,6 +25,14 @@ public void OnGazeExit() {
 	}
 
 	public void OnGazeTrigger() {
-		Spawner.SpawnMenu (options);
+		if(!shown) {
+			Spawner.SpawnMenu(options, UseToggleBehaviour);
+		} else {
+			Spawner.CloseMenu();
+		}
+
+		if(UseToggleBehaviour) {
+			shown = !shown;
+		}	
 	}
 }

Assets/Scripts/RadialMenu/RadialButton.cs

@@ -11,6 +11,7 @@ public class RadialButton : MonoBehaviour, IGvrGazeResponder {
 	public RadialMenu Menu;
 	public Text Label;
 	public UnityEvent OnClick;
+	public bool UseToggleBehaviour;
 
 	private Color defaultColor;
 
@@ -28,8 +29,10 @@ public void OnGazeExit() {
 
 	public void OnGazeTrigger() {
 		Menu.Selected = this;
-
-		Menu.Close();
+
+		if(!UseToggleBehaviour) {
+			Menu.Close();
+		}
 	}
 
 	void Start () {

Assets/Scripts/RadialMenu/RadialMenu.cs

@@ -5,6 +5,7 @@ public class RadialMenu : MonoBehaviour {
 
 	public RadialButton ButtonPrefab;
 	public RadialButton Selected;
+	public bool UseToggleBehaviour;
 
 	// Use this for initialization
 	public void SpawnButtons (RadialMenuOption[] options) {
@@ -25,6 +26,7 @@ public void SpawnButtons (RadialMenuOption[] options) {
 			button.Circle.color = options [i].color;
 			button.Menu = this;
 			button.OnClick = options [i].onClick;
+			button.UseToggleBehaviour = UseToggleBehaviour;
 		}
 	}
 

Assets/Scripts/RadialMenu/RadialMenuSpawner.cs

@@ -3,21 +3,21 @@
 
 public class RadialMenuSpawner : MonoBehaviour {
 
-	public static RadialMenuSpawner Instance = null;
 	public RadialMenu MenuPrefab;
 
-	public void SpawnMenu (RadialMenuOption[] options) {
-		RadialMenu menu = (RadialMenu) Instantiate (MenuPrefab);
+	private RadialMenu menu;
+
+	public void SpawnMenu (RadialMenuOption[] options, bool useToggleBehaviour) {
+		menu = (RadialMenu) Instantiate (MenuPrefab);
 		menu.transform.SetParent (transform);
 		menu.transform.position = transform.position;
 		menu.transform.localScale = Vector3.one;
+		menu.UseToggleBehaviour = useToggleBehaviour;
 
 		menu.SpawnButtons (options);
 	}
 
-	void Awake () {
-		if (Instance == null) {
-			Instance = this;
-		}
+	public void CloseMenu () {
+		menu.Close();
 	}
 }