Implemented "navigate back" button that appears on the palm.

zachkinstner · zachkinstner · commit a3116dca5f09 · 2015-05-01T12:07:39.000-04:00
diff --git a/Core/Solution/Hover.Cast/Custom/Standard/HovercastItemVisualSettingsStandard.cs b/Core/Solution/Hover.Cast/Custom/Standard/HovercastItemVisualSettingsStandard.cs
@@ -4,6 +4,7 @@
 using Hover.Cast.Display.Standard;
 using Hover.Common.Custom;
 using Hover.Common.Items;
+using Hover.Common.Items.Groups;
 using Hover.Common.Items.Types;
 using UnityEngine;
 
@@ -59,6 +60,10 @@ protected override IItemVisualSettings GetSettingsInner(IBaseItem pItem,
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		private static Type GetRendererForItem(IBaseItem pItem) {
+			if ( pItem != null && pItem.Id == ItemHierarchy.NavigateBackItemId ) {
+				return typeof(UiPalmNavBackRenderer);
+			}
+
 			if ( (pItem as IParentItem) != null ) {
 				return typeof(UiItemParentRenderer);
 			}
diff --git a/Core/Solution/Hover.Cast/Display/Standard/UiHoverMeshSlice.cs b/Core/Solution/Hover.Cast/Display/Standard/UiHoverMeshSlice.cs
@@ -11,6 +11,9 @@ namespace Hover.Cast.Display.Standard {
 	public class UiHoverMeshSlice : UiHoverMesh {
 
 		public const float AngleInset = 0.0012f;
+		public const float EdgeThick = 0.01f;
+
+		public bool DrawOuterEdge { get; set; }
 
 		private readonly bool vBackgroundOnly;
 
@@ -85,8 +88,9 @@ protected override void UpdateMesh(MeshType pType, Mesh pMesh, float pAmount=1)
 			}
 
 			if ( pType == MeshType.Edge ) {
-				MeshUtil.BuildRingMesh(EdgeMesh, vRadInner-0.01f, vRadInner,
-					vAngle0, vAngle1, vMeshSteps);
+				float edgeInner = (DrawOuterEdge ? vRadOuter : vRadInner-EdgeThick);
+				float edgeOuter = (DrawOuterEdge ? vRadOuter+EdgeThick : vRadInner);
+				MeshUtil.BuildRingMesh(EdgeMesh, edgeInner, edgeOuter, vAngle0, vAngle1, vMeshSteps);
 				return;
 			}
 
diff --git a/Core/Solution/Hover.Cast/Display/Standard/UiItemSelectRenderer.cs b/Core/Solution/Hover.Cast/Display/Standard/UiItemSelectRenderer.cs
@@ -12,6 +12,9 @@ namespace Hover.Cast.Display.Standard {
 	/*================================================================================================*/
 	public class UiItemSelectRenderer : MonoBehaviour, IUiItemRenderer {
 
+		public const float Thickness = 0.5f;
+		public const float InnerRadius = 1;
+		public const float OuterRadius = InnerRadius+Thickness;
 		public const float ArcCanvasThickness = 250;
 		public const float ArcCanvasScale = 0.002f;
 
@@ -37,7 +40,7 @@ public virtual void Build(MenuState pMenuState, IBaseItemState pItemState,
 			////
 
 			vHoverSlice = new UiHoverMeshSlice(gameObject);
-			vHoverSlice.Resize(1, 1.5f, pArcAngle);
+			vHoverSlice.Resize(InnerRadius, OuterRadius, pArcAngle);
 
 			////
 
diff --git a/Core/Solution/Hover.Cast/Display/Standard/UiPalmNavBackRenderer.cs b/Core/Solution/Hover.Cast/Display/Standard/UiPalmNavBackRenderer.cs
@@ -0,0 +1,103 @@
+using System;
+using Hover.Cast.Custom.Standard;
+using Hover.Cast.State;
+using Hover.Common.Custom;
+using Hover.Common.Items;
+using Hover.Common.State;
+using UnityEngine;
+
+namespace Hover.Cast.Display.Standard {
+
+	/*================================================================================================*/
+	public class UiPalmNavBackRenderer : MonoBehaviour, IUiItemRenderer {
+
+		public const float InnerRadius = 0;
+		public const float OuterRadius = UiPalmRenderer.InnerRadius-UiHoverMeshSlice.EdgeThick-0.005f;
+
+		private static readonly Texture2D IconTex = Resources.Load<Texture2D>("Parent");
+
+		protected MenuState vMenuState;
+		protected IBaseItemState vItemState;
+		protected ItemVisualSettingsStandard vSettings;
+
+		protected UiHoverMeshSlice vHoverSlice;
+		protected GameObject vIcon;
+
+
+		////////////////////////////////////////////////////////////////////////////////////////////////
+		/*--------------------------------------------------------------------------------------------*/
+		public virtual void Build(MenuState pMenuState, IBaseItemState pItemState,
+													float pArcAngle, IItemVisualSettings pSettings) {
+			vMenuState = pMenuState;
+			vItemState = pItemState;
+			vSettings = (ItemVisualSettingsStandard)pSettings;
+
+			////
+
+			vHoverSlice = new UiHoverMeshSlice(gameObject);
+			vHoverSlice.DrawOuterEdge = true;
+			vHoverSlice.Resize(InnerRadius, OuterRadius, pArcAngle);
+
+			////
+
+			vIcon = GameObject.CreatePrimitive(PrimitiveType.Quad);
+			vIcon.name = "Icon";
+			vIcon.transform.SetParent(gameObject.transform, false);
+			vIcon.transform.localRotation = Quaternion.FromToRotation(Vector3.forward, Vector3.up)*
+				Quaternion.FromToRotation(Vector3.right, Vector3.up);
+			vIcon.renderer.sharedMaterial = new Material(Shader.Find("Unlit/AlphaSelfIllum"));
+			vIcon.renderer.sharedMaterial.color = Color.clear;
+			vIcon.renderer.sharedMaterial.mainTexture = IconTex;
+		}
+
+		/*--------------------------------------------------------------------------------------------*/
+		public virtual void Update() {
+			ISelectableItem selItem = (vItemState.Item as ISelectableItem);
+
+			float high = vItemState.MaxHighlightProgress;
+			bool showEdge = (vItemState.IsNearestHighlight && !vItemState.IsSelectionPrevented && 
+				selItem != null && selItem.AllowSelection);
+			float edge = (showEdge ? high : 0);
+			float select = 1-(float)Math.Pow(1-vItemState.SelectionProgress, 1.5f);
+			float alpha = Math.Max(0, 1-(float)Math.Pow(1-vMenuState.DisplayStrength, 2));
+
+			if ( vMenuState.NavBackStrength > select ) {
+				select = vMenuState.NavBackStrength;
+			}
+
+			Color colBg = vSettings.BackgroundColor;
+			Color colEdge = vSettings.EdgeColor;
+			Color colHigh = vSettings.HighlightColor;
+			Color colSel = vSettings.SelectionColor;
+			Color colIcon = vSettings.ArrowIconColor;
+
+			colBg.a *= alpha*(vItemState.Item.IsEnabled ? 1 : 0.333f);
+			colEdge.a *= edge*alpha;
+			colHigh.a *= high*alpha;
+			colSel.a *= select*alpha;
+			colIcon.a *= (vItemState.MaxHighlightProgress*0.75f + 0.25f)*alpha*
+				(vItemState.Item.IsEnabled ? 1 : 0);
+
+			vHoverSlice.UpdateBackground(colBg);
+			vHoverSlice.UpdateEdge(colEdge);
+			vHoverSlice.UpdateHighlight(colHigh, high);
+			vHoverSlice.UpdateSelect(colSel, select);
+
+			vIcon.renderer.sharedMaterial.color = colIcon;
+			vIcon.transform.localScale = Vector3.one*vSettings.TextSize*0.75f*
+				UiItemSelectRenderer.ArcCanvasScale;
+		}
+
+		/*--------------------------------------------------------------------------------------------*/
+		public virtual void HandleChangeAnimation(bool pFadeIn, int pDirection, float pProgress) {
+			//do nothing...
+		}
+
+		/*--------------------------------------------------------------------------------------------*/
+		public void UpdateHoverPoints(IBaseItemPointsState pPointsState, Vector3 pCursorWorldPos) {
+			vHoverSlice.UpdateHoverPoints(pPointsState);
+		}
+
+	}
+
+}
diff --git a/Core/Solution/Hover.Cast/Display/Standard/UiPalmRenderer.cs b/Core/Solution/Hover.Cast/Display/Standard/UiPalmRenderer.cs
@@ -11,12 +11,14 @@ namespace Hover.Cast.Display.Standard {
 	/*================================================================================================*/
 	public class UiPalmRenderer : MonoBehaviour, IUiPalmRenderer {
 
+		public const float InnerRadius = 0.13f;
+		public const float OuterRadius = InnerRadius+UiItemSelectRenderer.Thickness;
+
 		protected MenuState vMenuState;
 		protected float vAngle0;
 		protected float vAngle1;
 		protected int vMeshSteps;
 
-		protected float vInnerRadius;
 		protected float vMainAlpha;
 		private ItemVisualSettingsStandard vSettings;
 
@@ -33,7 +35,6 @@ public virtual void Build(MenuState pMenuState, IItemVisualSettings pSettings,
 			vAngle0 = pAngle0;
 			vAngle1 = pAngle1;
 			vMeshSteps = (int)Math.Round(Math.Max(2, (vAngle1-vAngle0)/Math.PI*60));
-			vInnerRadius = 0.17f;
 
 			////
 
@@ -51,7 +52,7 @@ public virtual void Build(MenuState pMenuState, IItemVisualSettings pSettings,
 
 			var labelObj = new GameObject("Label");
 			labelObj.transform.SetParent(gameObject.transform, false);
-			labelObj.transform.localPosition = new Vector3(0, 0, vInnerRadius);
+			labelObj.transform.localPosition = new Vector3(0, 0, InnerRadius);
 			labelObj.transform.localRotation = Quaternion.FromToRotation(Vector3.back, Vector3.right);
 			labelObj.transform.localScale = new Vector3((vMenuState.IsOnLeftSide ? 1 : -1), 1, 1);
 
@@ -93,7 +94,7 @@ public virtual void Update() {
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		private void BuildMesh(Mesh pMesh) {
-			MeshUtil.BuildRingMesh(pMesh, vInnerRadius, vInnerRadius+0.5f, vAngle0, vAngle1,vMeshSteps);
+			MeshUtil.BuildRingMesh(pMesh, InnerRadius, OuterRadius, vAngle0, vAngle1, vMeshSteps);
 		}
 
 	}
diff --git a/Core/Solution/Hover.Cast/Display/UiPalm.cs b/Core/Solution/Hover.Cast/Display/UiPalm.cs
@@ -1,7 +1,9 @@
+using System;
 using Hover.Cast.Custom;
 using Hover.Cast.State;
 using Hover.Common.Custom;
 using Hover.Common.Items;
+using Hover.Common.State;
 using UnityEngine;
 
 namespace Hover.Cast.Display {
@@ -29,6 +31,19 @@ internal void Build(MenuState pMenu, IItemVisualSettingsProvider pVisualSettings
 			vRendererHold.transform.SetParent(gameObject.transform, false);
 			vRendererHold.transform.localRotation = Quaternion.AngleAxis(170, Vector3.up);
 
+			////
+
+			BaseItemState itemState = pMenu.GetPalmItem();
+			IItemVisualSettings visualSett = pVisualSettingsProv.GetSettings(itemState.Item);
+
+			var itemObj = new GameObject("BackItem");
+			itemObj.transform.SetParent(vRendererHold.transform, false);
+
+			UiItem uiItem = itemObj.AddComponent<UiItem>();
+			uiItem.Build(vMenuState, itemState, (float)Math.PI*2, visualSett);
+
+			////
+
 			vMenuState.OnLevelChange += HandleLevelChange;
 			Rebuild();
 		}
diff --git a/Core/Solution/Hover.Cast/Hover.Cast.csproj b/Core/Solution/Hover.Cast/Hover.Cast.csproj
@@ -60,6 +60,7 @@
     <Compile Include="Display\Standard\UiItemBaseToggleRenderer.cs" />
     <Compile Include="Display\Standard\UiItemCheckboxRenderer.cs" />
     <Compile Include="Display\Standard\UiHoverMeshSlice.cs" />
+    <Compile Include="Display\Standard\UiPalmNavBackRenderer.cs" />
     <Compile Include="Display\Standard\UiPalmRenderer.cs" />
     <Compile Include="Display\Standard\UiItemParentRenderer.cs" />
     <Compile Include="Display\Standard\UiItemRadioRenderer.cs" />
@@ -110,7 +111,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Input\Transform\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/Core/Solution/Hover.Cast/State/MenuState.cs b/Core/Solution/Hover.Cast/State/MenuState.cs
@@ -28,19 +28,24 @@ public class MenuState : IHovercastMenuState {
 		
 		private readonly IItemHierarchy vItemHierarchy;
 		private readonly InteractionSettings vInteractSettings;
+		private readonly IList<BaseItemState> vAllItems;
 		private readonly IList<BaseItemState> vItems;
+		private readonly BaseItemState vPalmItem;
 
 		private ICursorState[] vCurrentCursors;
-		private bool vIsGrabbing;
+		private bool vIsNavigateBackStarted;
 
 
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		public MenuState(IItemHierarchy pItemHierarchy, InteractionSettings pInteractSettings) {
 			vItemHierarchy = pItemHierarchy;
 			vInteractSettings = pInteractSettings;
+
+			vAllItems = new List<BaseItemState>();
 			vItems = new List<BaseItemState>();
 			vCurrentCursors = new ICursorState[0];
+			vPalmItem = new BaseItemState(vItemHierarchy.NavigateBackItem, pInteractSettings);
 
 			OnLevelChange += (d => {});
 
@@ -60,6 +65,11 @@ public IBaseItemState[] GetLevelItems() {
 			return vItems.Cast<IBaseItemState>().ToArray();
 		}
 
+		/*--------------------------------------------------------------------------------------------*/
+		public BaseItemState GetPalmItem() {
+			return vPalmItem;
+		}
+
 		/*--------------------------------------------------------------------------------------------*/
 		public IBaseItem GetLevelParentItem() {
 			IItemGroup parGroup = vItemHierarchy.ParentLevel;
@@ -85,22 +95,22 @@ internal void UpdateAfterInput(IInputMenu pInputMenu, ICursorState[] pCursors) {
 			DisplayStrength = pInputMenu.DisplayStrength;
 			NavBackStrength = pInputMenu.NavigateBackStrength;
 
-			CheckGrabGesture(pInputMenu);
+			CheckNavigateBackAction(pInputMenu);
 
 			foreach ( ICursorState cursor in vCurrentCursors ) {
 				UpdateWithCursor(cursor);
 			}
 
-			foreach ( BaseItemState item in vItems ) {
+			foreach ( BaseItemState item in vAllItems ) {
 				if ( item.UpdateSelectionProcess() ) { //returns true if selection occurred
-					break; //exit loop, since the vItems list changes after a selection
+					break; //exit loop, since the items list changes after a selection
 				}
 			}
 		}
 
 		/*--------------------------------------------------------------------------------------------*/
 		public void ResetAllItemCursorInteractions() {
-			foreach ( BaseItemState item in vItems ) {
+			foreach ( BaseItemState item in vAllItems ) {
 				item.ResetAllCursorInteractions();
 			}
 		}
@@ -116,7 +126,7 @@ private void UpdateWithCursor(ICursorState pCursor) {
 
 			NearestItem = null;
 
-			foreach ( BaseItemState item in vItems ) {
+			foreach ( BaseItemState item in vAllItems ) {
 				item.UpdateWithCursor(cursorType, cursorWorldPos);
 
 				if ( !allowSelect ) {
@@ -133,42 +143,45 @@ private void UpdateWithCursor(ICursorState pCursor) {
 				nearestDist = itemDist;
 			}
 
-			foreach ( BaseItemState item in vItems ) {
+			foreach ( BaseItemState item in vAllItems ) {
 				item.SetAsNearestItem(cursorType, (item == NearestItem));
 			}
 		}
 
 		/*--------------------------------------------------------------------------------------------*/
-		private void CheckGrabGesture(IInputMenu pInputMenu) {
+		private void CheckNavigateBackAction(IInputMenu pInputMenu) {
 			if ( pInputMenu == null ) {
-				vIsGrabbing = false;
+				vIsNavigateBackStarted = false;
 				return;
 			}
 
-			if ( vIsGrabbing && pInputMenu.NavigateBackStrength <= 0 ) {
-				vIsGrabbing = false;
+			if ( vIsNavigateBackStarted && pInputMenu.NavigateBackStrength <= 0 ) {
+				vIsNavigateBackStarted = false;
 				return;
 			}
 
-			if ( vIsGrabbing || pInputMenu.NavigateBackStrength < 1 ) {
+			if ( vIsNavigateBackStarted || pInputMenu.NavigateBackStrength < 1 ) {
 				return;
 			}
 
-			vIsGrabbing = true;
+			vIsNavigateBackStarted = true;
 			vItemHierarchy.Back();
 		}
 
 		/*--------------------------------------------------------------------------------------------*/
 		private void HandleLevelChange(int pDirection) {
+			vAllItems.Clear();
 			vItems.Clear();
 
 			IBaseItem[] items = vItemHierarchy.CurrentLevel.Items;
 
 			foreach ( IBaseItem item in items ) {
 				var seg = new BaseItemState(item, vInteractSettings);
+				vAllItems.Add(seg);
 				vItems.Add(seg);
 			}
 
+			vAllItems.Add(vPalmItem);
 			OnLevelChange(pDirection);
 		}
 
diff --git a/Core/Solution/Hover.Common/Items/Groups/IItemHierarchy.cs b/Core/Solution/Hover.Common/Items/Groups/IItemHierarchy.cs
@@ -1,4 +1,6 @@
-﻿namespace Hover.Common.Items.Groups {
+﻿using Hover.Common.Items.Types;
+
+namespace Hover.Common.Items.Groups {
 
 	/*================================================================================================*/
 	public interface IItemHierarchy { 
@@ -10,6 +12,7 @@ public interface IItemHierarchy {
 		IItemGroup CurrentLevel { get; }
 		IItemGroup ParentLevel { get; }
 		string CurrentLevelTitle { get; }
+		SelectorItem NavigateBackItem { get; }
 
 
 		////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Solution/Hover.Common/Items/Groups/ItemHierarchy.cs b/Core/Solution/Hover.Common/Items/Groups/ItemHierarchy.cs
diff --git a/Unity/Assets/Hover/Demo/GifAnim/Scenes/GifAnim-Hoverboard-Leap.unity b/Unity/Assets/Hover/Demo/GifAnim/Scenes/GifAnim-Hoverboard-Leap.unity
diff --git a/Unity/Assets/Hover/Demo/GifAnim/Scenes/GifAnim-Hovercast-Leap.unity b/Unity/Assets/Hover/Demo/GifAnim/Scenes/GifAnim-Hovercast-Leap.unity
diff --git a/Unity/ProjectSettings/EditorBuildSettings.asset b/Unity/ProjectSettings/EditorBuildSettings.asset
