Fixed issue causing the active CursorType lists to not update correctly.

Author: zachkinstner

Core/Solution/Hover.Board/Custom/HoverboardInteractionSettings.cs

@@ -30,7 +30,10 @@ public virtual InteractionSettings GetSettings() {
 				vSettings.HighlightDistanceMax = HighlightDistanceMax;
 				vSettings.StickyReleaseDistance = StickyReleaseDistance;
 				vSettings.SelectionMilliseconds = SelectionMilliseconds;
-				vSettings.Cursors = Cursors;
+
+				foreach ( CursorType cursorType in Cursors ) {
+					vSettings.Cursors.Add(cursorType);
+				}
 			}
 
 			return vSettings;

Core/Solution/Hover.Board/Custom/InteractionSettings.cs

@@ -7,7 +7,14 @@ namespace Hover.Board.Custom {
 	/*================================================================================================*/
 	public class InteractionSettings : BaseInteractionSettings {
 
-		public IList<CursorType> Cursors { get; set; }
+		public IList<CursorType> Cursors { get; private set; }
+
+
+		////////////////////////////////////////////////////////////////////////////////////////////////
+		/*--------------------------------------------------------------------------------------------*/
+		public InteractionSettings() {
+			Cursors = new List<CursorType>();
+		}
 
 	}
 

Core/Solution/Hover.Board/HoverboardSetup.cs

@@ -25,7 +25,7 @@ public class HoverboardSetup : MonoBehaviour {
 
 		private HoverboardState vState;
 		private UiPanel[] vUiPanels;
-		private IList<CursorType> vPrevActiveCursorTypes;
+		private List<CursorType> vPrevActiveCursorTypes;
 		private IDictionary<CursorType, UiProjection> vProjMap;
 		private List<CursorType> vHideCursorTypes;
 		private List<CursorType> vShowCursorTypes;
@@ -60,7 +60,7 @@ public void Awake() {
 			vState = new HoverboardState(Panels.Select(x => x.GetPanel()).ToArray(), Hovercursor, 
 				InteractionSettings.GetSettings(), gameObject.transform);
 
-			vPrevActiveCursorTypes = new CursorType[0];
+			vPrevActiveCursorTypes = new List<CursorType>();
 			vProjMap = new Dictionary<CursorType, UiProjection>(EnumIntKeyComparer.CursorType);
 			vHideCursorTypes = new List<CursorType>();
 			vShowCursorTypes = new List<CursorType>();
@@ -132,7 +132,8 @@ public void Update() {
 				vProjMap.Add(cursorType, uiProj);
 			}
 
-			vPrevActiveCursorTypes = activeCursorTypes;
+			vPrevActiveCursorTypes.Clear();
+			vPrevActiveCursorTypes.AddRange(activeCursorTypes);
 		}
 	}
 

Core/Solution/Hover.Cast/State/HovercastState.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Hover.Cast.Custom;
 using Hover.Cast.Input;
 using Hover.Common.Input;

Core/Solution/Hover.Cast/State/MenuState.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using Hover.Cast.Custom;
 using Hover.Cast.Input;
 using Hover.Common.Input;

Core/Solution/Hover.Cursor/HovercursorSetup.cs

@@ -19,7 +19,7 @@ public class HovercursorSetup : MonoBehaviour {
 		public Transform CameraTransform;
 
 		private HovercursorState vState;
-		private ReadOnlyCollection<CursorType> vPrevActiveCursorTypes;
+		private List<CursorType> vPrevActiveCursorTypes;
 		private IDictionary<CursorType, UiCursor> vCursorMap;
 		private List<CursorType> vHideCursorTypes;
 		private List<CursorType> vShowCursorTypes;
@@ -51,7 +51,7 @@ public void Awake() {
 			vState = new HovercursorState(gameObject.transform, Input,
 				DefaultVisualSettings, CameraTransform);
 
-			vPrevActiveCursorTypes = new ReadOnlyCollection<CursorType>(new List<CursorType>());
+			vPrevActiveCursorTypes = new List<CursorType>();
 			vCursorMap = new Dictionary<CursorType, UiCursor>(EnumIntKeyComparer.CursorType);
 			vHideCursorTypes = new List<CursorType>();
 			vShowCursorTypes = new List<CursorType>();
@@ -94,7 +94,8 @@ public void Update() {
 				vState.SetCursorTransform(type, cursorObj.transform);
 			}
 
-			vPrevActiveCursorTypes = activeTypes;
+			vPrevActiveCursorTypes.Clear();
+			vPrevActiveCursorTypes.AddRange(activeTypes);
 		}
 
 	}

Core/Solution/Hover.Cursor/State/HovercursorState.cs

@@ -50,7 +50,7 @@ public HovercursorState(Transform pBaseTx, HovercursorInput pInput,
 			vActiveCursorPlaneMap = new Dictionary<CursorType, ReadList<PlaneData>>(
 				EnumIntKeyComparer.CursorType);
 
-			ActiveCursorTypes = new ReadOnlyCollection<CursorType>(vActiveCursorTypes);
+			ActiveCursorTypes = vActiveCursorTypes.AsReadOnly();
 
 			vInput.SetPlaneProvider(GetActiveCursorPlanes);
 		}
@@ -65,7 +65,6 @@ public IHovercursorInput Input {
 		}
 
 
-
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		public ICursorState GetCursorState(CursorType pType) {

Unity/Assets/Hover/Demo/BoardKeys/CastItems/DemoAllowThumbListener.cs

@@ -43,7 +43,13 @@ protected override void BroadcastInitialValue() {
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		private void HandleValueChanged(ISelectableItem<bool> pItem) {
-			vInteractSett.Cursors = (pItem.Value ? vThumbCursors : vNoThumbCursors);
+			CursorType[] cursorTypes = (pItem.Value ? vThumbCursors : vNoThumbCursors);
+
+			vInteractSett.Cursors.Clear();
+
+			foreach ( CursorType cursorType in cursorTypes ) {
+				vInteractSett.Cursors.Add(cursorType);
+			}
 		}
 	}
 

Unity/Assets/Hover/Demo/BoardTest/DemoBoardToggle.cs

@@ -29,14 +29,12 @@ private struct Bundle {
 
 		private HoverboardSetup vSetup;
 		private Bundle[] vBundles;
-		private List<CursorType> vActiveCursorTypes;
 
 
 		////////////////////////////////////////////////////////////////////////////////////////////////
 		/*--------------------------------------------------------------------------------------------*/
 		public void Awake() {
 			vSetup = gameObject.GetComponent<HoverboardSetup>();
-			vActiveCursorTypes = new List<CursorType>();
 		}
 
 		/*--------------------------------------------------------------------------------------------*/
@@ -59,17 +57,16 @@ public void Start() {
 
 		/*--------------------------------------------------------------------------------------------*/
 		public void Update() {
-			vActiveCursorTypes.Clear();
+			IList<CursorType> cursorTypes = vSetup.InteractionSettings.GetSettings().Cursors;
+			cursorTypes.Clear();
 
 			foreach ( Bundle bundle in vBundles ) {
 				if ( !bundle.ShowFunc() ) {
 					continue;
 				}
 
-				vActiveCursorTypes.Add(bundle.CursorType);
+				cursorTypes.Add(bundle.CursorType);
 			}
-
-			vSetup.InteractionSettings.GetSettings().Cursors = vActiveCursorTypes;
 		}