Added fade in/out transition for the new "navigate back" button (#22).

Author: zachkinstner

Core/Solution/Hover.Cast/Display/Standard/UiItemSelectRenderer.cs

@@ -124,7 +124,7 @@ public void UpdateHoverPoints(IBaseItemPointsState pPointsState, Vector3 pCursor
 		/*--------------------------------------------------------------------------------------------*/
 		public static float GetArcAlpha(MenuState pMenuState) {
 			float alpha = 1-(float)Math.Pow(1-pMenuState.DisplayStrength, 2);
-			alpha -= (float)Math.Pow(pMenuState.NavBackStrength, 2);
+			alpha -= (float)Math.Pow(pMenuState.NavBackStrength, 2)*0.5f;
 			return Math.Max(0, alpha);
 		}
 

Core/Solution/Hover.Cast/Display/Standard/UiPalmNavBackRenderer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Hover.Cast.Custom.Standard;
 using Hover.Cast.State;
 using Hover.Common.Custom;
@@ -18,10 +19,13 @@ public class UiPalmNavBackRenderer : MonoBehaviour, IUiItemRenderer {
 
 		protected MenuState vMenuState;
 		protected IBaseItemState vItemState;
+		protected ISelectableItem vSelItem;
 		protected ItemVisualSettingsStandard vSettings;
 
 		protected UiHoverMeshSlice vHoverSlice;
 		protected GameObject vIcon;
+		protected Stopwatch vEnabledAnim;
+		protected bool vPrevEnabled;
 
 
 		////////////////////////////////////////////////////////////////////////////////////////////////
@@ -30,6 +34,7 @@ public virtual void Build(MenuState pMenuState, IBaseItemState pItemState,
 													float pArcAngle, IItemVisualSettings pSettings) {
 			vMenuState = pMenuState;
 			vItemState = pItemState;
+			vSelItem = (vItemState.Item as ISelectableItem);
 			vSettings = (ItemVisualSettingsStandard)pSettings;
 
 			////
@@ -52,31 +57,32 @@ public virtual void Build(MenuState pMenuState, IBaseItemState pItemState,
 
 		/*--------------------------------------------------------------------------------------------*/
 		public virtual void Update() {
-			ISelectableItem selItem = (vItemState.Item as ISelectableItem);
-
 			float high = vItemState.MaxHighlightProgress;
 			bool showEdge = (vItemState.IsNearestHighlight && !vItemState.IsSelectionPrevented && 
-				selItem != null && selItem.AllowSelection);
+				vSelItem.AllowSelection);
 			float edge = (showEdge ? high : 0);
-			float select = 1-(float)Math.Pow(1-vItemState.SelectionProgress, 1.5f);
+			float select = vItemState.SelectionProgress;
 			float alpha = Math.Max(0, 1-(float)Math.Pow(1-vMenuState.DisplayStrength, 2));
+			float enabledAnimProg = GetEnabledAnimProgress();
 
-			if ( vMenuState.NavBackStrength > select ) {
+			if ( vSelItem.IsEnabled && vMenuState.NavBackStrength > select ) {
 				select = vMenuState.NavBackStrength;
+				edge = select;
 			}
 
+			select = 1-(float)Math.Pow(1-select, 1.5f);
+
 			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);
+			colBg.a *= alpha*Mathf.Lerp(0.333f, 1, enabledAnimProg);
 			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);
+			colIcon.a *= (vItemState.MaxHighlightProgress*0.75f + 0.25f)*alpha*enabledAnimProg;
 
 			vHoverSlice.UpdateBackground(colBg);
 			vHoverSlice.UpdateEdge(colEdge);
@@ -98,6 +104,34 @@ public void UpdateHoverPoints(IBaseItemPointsState pPointsState, Vector3 pCursor
 			vHoverSlice.UpdateHoverPoints(pPointsState);
 		}
 
+
+		////////////////////////////////////////////////////////////////////////////////////////////////
+		/*--------------------------------------------------------------------------------------------*/
+		private float GetEnabledAnimProgress() {
+			if ( vSelItem.IsEnabled != vPrevEnabled ) {
+				vEnabledAnim = Stopwatch.StartNew();
+				vPrevEnabled = vSelItem.IsEnabled;
+			}
+
+			float prog = (vSelItem.IsEnabled ? 1 : 0);
+
+			if ( vEnabledAnim != null ) {
+				float ms = (float)vEnabledAnim.Elapsed.TotalMilliseconds;
+				prog = Math.Min(1, ms/UiArc.LevelChangeMilliseconds);
+				prog = 1-(float)Math.Pow(1-prog, 3);
+
+				if ( prog >= 1 ) {
+					vEnabledAnim = null;
+				}
+
+				if ( !vSelItem.IsEnabled ) {
+					prog = 1-prog;
+				}
+			}
+
+			return prog;
+		}
+
 	}
 
 }

Core/Solution/Hover.Cast/Display/UiArc.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using Hover.Cast.State;
 using Hover.Common.Custom;
 using UnityEngine;
@@ -8,15 +9,15 @@ namespace Hover.Cast.Display {
 	/*================================================================================================*/
 	public class UiArc : MonoBehaviour {
 
-		private const float LevelChangeMilliseconds = 1000;
+		public const float LevelChangeMilliseconds = 1000;
 		private const float LevelChangeDistance = 0.5f;
 
 		private MenuState vMenuState;
 		private IItemVisualSettingsProvider vVisualSettingsProv;
 
 		private GameObject vPrevLevelObj;
 		private GameObject vCurrLevelObj;
-		private DateTime? vChangeTime;
+		private Stopwatch vChangeAnim;
 		private int vChangeDir;
 
 
@@ -71,7 +72,7 @@ private void HandleLevelChange(int pDirection) {
 
 			////
 
-			vChangeTime = DateTime.UtcNow;
+			vChangeAnim = Stopwatch.StartNew();
 			vChangeDir = pDirection;
 			UpdateItemChangeAnim();
 		}
@@ -89,11 +90,11 @@ private void DestroyPrevLevel() {
 
 		/*--------------------------------------------------------------------------------------------*/
 		private void UpdateItemChangeAnim() {
-			if ( vChangeTime == null ) {
+			if ( vChangeAnim == null ) {
 				return;
 			}
 
-			float ms = (float)(DateTime.UtcNow-(DateTime)vChangeTime).TotalMilliseconds;
+			float ms = (float)vChangeAnim.Elapsed.TotalMilliseconds;
 			float prog = Math.Min(1, ms/LevelChangeMilliseconds);
 			float push = 1-(float)Math.Pow(1-prog, 3);
 			float dist = LevelChangeDistance*vChangeDir;
@@ -126,7 +127,7 @@ private void UpdateItemChangeAnim() {
 				return;
 			}
 
-			vChangeTime = null;
+			vChangeAnim = null;
 			DestroyPrevLevel();
 		}
 

Core/Solution/Hover.Cast/Hover.Cast.csproj

@@ -37,6 +37,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="UnityEngine">
       <HintPath>..\..\Packages\Unity\UnityEngine.dll</HintPath>

Unity/ProjectSettings/EditorBuildSettings.asset

@@ -11,13 +11,9 @@ EditorBuildSettings:
     path: Assets/Hover/Demo/BoardTest/HoverboardTest-VR-LookCursor.unity
   - enabled: 0
     path: Assets/Hover/Demo/BoardTest/HoverboardTest-VR-LeapCursor.unity
-  - enabled: 0
+  - enabled: 1
     path: Assets/Hover/Demo/CastCubes/Scenes/HovercastDemo-LeapVR.unity
   - enabled: 0
     path: Assets/Hover/Demo/CastCubes/Scenes/HovercastDemo-LeapLookVR.unity
-  - enabled: 0
-    path: Assets/Hover/Demo/CastCubes/Scenes/HovercastDemo-LeapVR.unity
   - enabled: 0
     path: Assets/Hover/Demo/BoardKeys/Scenes/HoverboardDemo-LeapVR.unity
-  - enabled: 1
-    path: Assets/Hover/Demo/CastCubes/Scenes/HovercastDemo-LeapLookVR.unity