Fix incorrect EnumArray.StaticMin/Max

lawwong · lawwong · commit 1e6431f26ea4 · 2021-05-12T21:26:55.000+08:00
diff --git a/Assets/HTC.UnityPlugin/Utility/Container/EnumArray.cs b/Assets/HTC.UnityPlugin/Utility/Container/EnumArray.cs
@@ -399,6 +399,7 @@ static EnumArrayBase()
                                 continue; // length out of range
                             }
                             StaticMinInt = vi;
+                            StaticMin = ve;
                         }
                         else if (vi > StaticMaxInt)
                         {
@@ -408,6 +409,7 @@ static EnumArrayBase()
                                 continue; // length out of range
                             }
                             StaticMaxInt = vi;
+                            StaticMax = ve;
                         }
                     }
 
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/ControllerTooltips.unity b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/ControllerTooltips.unity
@@ -1302,6 +1302,9 @@ MonoBehaviour:
     - {fileID: 0}
     - {fileID: 0}
     - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
+    - {fileID: 0}
   m_defaultRenderData: {fileID: 0}
   m_tooltipParent: {fileID: 0}
   m_tooltipPrefab: {fileID: 191042, guid: f64ed917a7e3d044d8d831b345edca5d, type: 2}
@@ -3006,18 +3009,7 @@ MonoBehaviour:
     m_roleValueInt: 0
   m_onIsValidChanged:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 724095205}
-        m_MethodName: SetActive
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
     m_TypeName: HTC.UnityPlugin.Vive.VivePoseTracker+UnityEventBool, Assembly-CSharp,
       Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
 --- !u!114 &2006434404
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/ModeManager.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/ModeManager.cs
@@ -24,7 +24,7 @@ public enum Mode
 
         private void Awake()
         {
-            SwitchMode(initMode);
+            EnterMode(initMode);
         }
 
         public void SwitchToTeleportMode() { SwitchMode(Mode.Teleport); }
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/TooltipMenu.asset b/Assets/HTC.UnityPlugin/ViveInputUtility/Examples/10.ControllerTooltips/TooltipMenu.asset
@@ -13,5 +13,5 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_buttonList: 0400000000000000
   m_dataList:
-  - labelText: Cancel
+  - labelText: Close Menu
   - labelText: Select
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/Editor/TooltipRenderDataAssetBaseEditor.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/Editor/TooltipRenderDataAssetBaseEditor.cs
@@ -103,26 +103,18 @@ public override void OnInspectorGUI()
         private void ShowAddTriggerMenu()
         {
             var menu = new GenericMenu();
-            var displayedNames = new List<GUIContent>(btnEnumInfo.displayedLength);
-            var displayedValues = new List<int>(btnEnumInfo.displayedLength);
-            for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)
+            foreach(var ev in visibleInList.EnumValues)
             {
-                var v = btnEnumInfo.displayedValues[i];
-                displayedNames.Add(new GUIContent(btnEnumInfo.displayedNames[i]));
-                displayedValues.Add(v);
-            }
-            for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)
-            {
-                var value = btnEnumInfo.displayedValues[i];
-                //if (value == (int)ControllerButton.None) { continue; }
-                var name = btnEnumInfo.displayedNames[i];
-                if (visibleInList[value])
+                var button = ev.Key;
+                var visible = ev.Value;
+                var name = visibleInList.EnumName((int)button);
+                if (visible)
                 {
                     menu.AddDisabledItem(new GUIContent(name));
                 }
                 else
                 {
-                    menu.AddItem(new GUIContent(name), false, OnAddNewSelected, value);
+                    menu.AddItem(new GUIContent(name), false, OnAddNewSelected, (int)button);
                 }
             }
             menu.ShowAsContext();
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/TooltipRendererBase.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ControllerTooltip/TooltipRendererBase.cs
@@ -27,8 +27,7 @@ public bool TryGetValidTooltipRig(ControllerButton button, out TooltipRig rig)
             if (!EnumArrayBase<ControllerButton>.StaticIsValidIndex((int)button)) { return false; }
 
             var model = VRModule.GetDeviceState(m_viveRole.GetDeviceIndex()).deviceModel;
-
-            TooltipRigAsset rigSetAsset = null;
+            var rigSetAsset = (TooltipRigAsset)null;
             if (m_customTooltipRigSet != null)
             {
                 rigSetAsset = m_customTooltipRigSet[(int)model];
@@ -89,41 +88,42 @@ private void OnDeviceIndexChanged(uint deviceIndex)
         {
             if (dataStateArray == null) { return; }
 
-            for (ControllerButton i = EnumArrayBase<ControllerButton>.StaticMin, imax = EnumArrayBase<ControllerButton>.StaticMax; i <= imax; ++i)
+            foreach (var ev in dataStateArray.EnumValues)
             {
-                var state = dataStateArray[(int)i];
+                var button = ev.Key;
+                var state = ev.Value;
                 if (!state.isValid) { continue; }
 
                 TooltipRig rig;
-                var shouldShow = TryGetValidTooltipRig(i, out rig);
+                var shouldShow = TryGetValidTooltipRig(button, out rig);
                 var wasVisible = state.isVisible;
 
                 if (wasVisible)
                 {
                     if (shouldShow)
                     {
-                        OnShowTooltip(i, rig, state.data, true);
+                        OnShowTooltip(button, rig, state.data, true);
                     }
                     else
                     {
-                        dataStateArray[(int)i] = new DataState()
+                        dataStateArray[(int)button] = new DataState()
                         {
                             state = State.Hidden,
                             data = state.data,
                         };
-                        OnHideTooltip(i);
+                        OnHideTooltip(button);
                     }
                 }
                 else
                 {
                     if (shouldShow)
                     {
-                        dataStateArray[(int)i] = new DataState()
+                        dataStateArray[(int)button] = new DataState()
                         {
                             state = State.Visible,
                             data = state.data,
                         };
-                        OnShowTooltip(i, rig, state.data, false);
+                        OnShowTooltip(button, rig, state.data, false);
                     }
                 }
             }
@@ -166,15 +166,17 @@ public void SetTooltipData(IEnumerator<KeyValuePair<ControllerButton, TRenderDat
                 }
             }
 
-            for (ControllerButton i = EnumArrayBase<ControllerButton>.StaticMin, imax = EnumArrayBase<ControllerButton>.StaticMax; i <= imax; ++i)
+            foreach (var ev in btnVisibleTmp.EnumValues)
             {
-                if (btnVisibleTmp[(int)i])
+                var button = ev.Key;
+                var wasSet = ev.Value;
+                if (wasSet)
                 {
-                    btnVisibleTmp[(int)i] = false;
+                    btnVisibleTmp[(int)button] = false;
                 }
                 else
                 {
-                    ResetTooltipData(i);
+                    ResetTooltipData(button);
                 }
             }
         }
@@ -186,7 +188,6 @@ public void SetTooltipData(ControllerButton button, TRenderData data)
 
             TooltipRig rig;
             var shouldShow = TryGetValidTooltipRig(button, out rig);
-
             dataStateArray[(int)button] = new DataState()
             {
                 state = shouldShow ? State.Visible : State.Hidden,
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveInput/ViveInput.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveInput/ViveInput.cs
@@ -33,6 +33,7 @@ public enum ButtonEventType
     /// </summary>
     public enum ControllerButton
     {
+        [InvalidEnumArrayIndex]
         None = -1,
 
         // classic buttons

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ static EnumArrayBase()`
`399`	`399`	`continue; // length out of range`
`400`	`400`	`}`
`401`	`401`	`StaticMinInt = vi;`
	`402`	`+ StaticMin = ve;`
`402`	`403`	`}`
`403`	`404`	`else if (vi > StaticMaxInt)`
`404`	`405`	`{`
`@@ -408,6 +409,7 @@ static EnumArrayBase()`
`408`	`409`	`continue; // length out of range`
`409`	`410`	`}`
`410`	`411`	`StaticMaxInt = vi;`
	`412`	`+ StaticMax = ve;`
`411`	`413`	`}`
`412`	`414`	`}`
`413`	`415`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public enum Mode`
`24`	`24`
`25`	`25`	`private void Awake()`
`26`	`26`	`{`
`27`		`- SwitchMode(initMode);`
	`27`	`+ EnterMode(initMode);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void SwitchToTeleportMode() { SwitchMode(Mode.Teleport); }`
Original file line number	Diff line number	Diff line change
`@@ -103,26 +103,18 @@ public override void OnInspectorGUI()`
`103`	`103`	`private void ShowAddTriggerMenu()`
`104`	`104`	`{`
`105`	`105`	`var menu = new GenericMenu();`
`106`		`- var displayedNames = new List<GUIContent>(btnEnumInfo.displayedLength);`
`107`		`- var displayedValues = new List<int>(btnEnumInfo.displayedLength);`
`108`		`- for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)`
	`106`	`+ foreach(var ev in visibleInList.EnumValues)`
`109`	`107`	`{`
`110`		`- var v = btnEnumInfo.displayedValues[i];`
`111`		`- displayedNames.Add(new GUIContent(btnEnumInfo.displayedNames[i]));`
`112`		`- displayedValues.Add(v);`
`113`		`- }`
`114`		`- for (int i = 0, imax = btnEnumInfo.displayedLength; i < imax; ++i)`
`115`		`- {`
`116`		`- var value = btnEnumInfo.displayedValues[i];`
`117`		`- //if (value == (int)ControllerButton.None) { continue; }`
`118`		`- var name = btnEnumInfo.displayedNames[i];`
`119`		`- if (visibleInList[value])`
	`108`	`+ var button = ev.Key;`
	`109`	`+ var visible = ev.Value;`
	`110`	`+ var name = visibleInList.EnumName((int)button);`
	`111`	`+ if (visible)`
`120`	`112`	`{`
`121`	`113`	`menu.AddDisabledItem(new GUIContent(name));`
`122`	`114`	`}`
`123`	`115`	`else`
`124`	`116`	`{`
`125`		`- menu.AddItem(new GUIContent(name), false, OnAddNewSelected, value);`
	`117`	`+ menu.AddItem(new GUIContent(name), false, OnAddNewSelected, (int)button);`
`126`	`118`	`}`
`127`	`119`	`}`
`128`	`120`	`menu.ShowAsContext();`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public bool TryGetValidTooltipRig(ControllerButton button, out TooltipRig rig)`
`27`	`27`	`if (!EnumArrayBase<ControllerButton>.StaticIsValidIndex((int)button)) { return false; }`
`28`	`28`
`29`	`29`	`var model = VRModule.GetDeviceState(m_viveRole.GetDeviceIndex()).deviceModel;`
`30`		`-`
`31`		`- TooltipRigAsset rigSetAsset = null;`
	`30`	`+ var rigSetAsset = (TooltipRigAsset)null;`
`32`	`31`	`if (m_customTooltipRigSet != null)`
`33`	`32`	`{`
`34`	`33`	`rigSetAsset = m_customTooltipRigSet[(int)model];`
`@@ -89,41 +88,42 @@ private void OnDeviceIndexChanged(uint deviceIndex)`
`89`	`88`	`{`
`90`	`89`	`if (dataStateArray == null) { return; }`
`91`	`90`
`92`		`- for (ControllerButton i = EnumArrayBase<ControllerButton>.StaticMin, imax = EnumArrayBase<ControllerButton>.StaticMax; i <= imax; ++i)`
	`91`	`+ foreach (var ev in dataStateArray.EnumValues)`
`93`	`92`	`{`
`94`		`- var state = dataStateArray[(int)i];`
	`93`	`+ var button = ev.Key;`
	`94`	`+ var state = ev.Value;`
`95`	`95`	`if (!state.isValid) { continue; }`
`96`	`96`
`97`	`97`	`TooltipRig rig;`
`98`		`- var shouldShow = TryGetValidTooltipRig(i, out rig);`
	`98`	`+ var shouldShow = TryGetValidTooltipRig(button, out rig);`
`99`	`99`	`var wasVisible = state.isVisible;`
`100`	`100`
`101`	`101`	`if (wasVisible)`
`102`	`102`	`{`
`103`	`103`	`if (shouldShow)`
`104`	`104`	`{`
`105`		`- OnShowTooltip(i, rig, state.data, true);`
	`105`	`+ OnShowTooltip(button, rig, state.data, true);`
`106`	`106`	`}`
`107`	`107`	`else`
`108`	`108`	`{`
`109`		`- dataStateArray[(int)i] = new DataState()`
	`109`	`+ dataStateArray[(int)button] = new DataState()`
`110`	`110`	`{`
`111`	`111`	`state = State.Hidden,`
`112`	`112`	`data = state.data,`
`113`	`113`	`};`
`114`		`- OnHideTooltip(i);`
	`114`	`+ OnHideTooltip(button);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`	`else`
`118`	`118`	`{`
`119`	`119`	`if (shouldShow)`
`120`	`120`	`{`
`121`		`- dataStateArray[(int)i] = new DataState()`
	`121`	`+ dataStateArray[(int)button] = new DataState()`
`122`	`122`	`{`
`123`	`123`	`state = State.Visible,`
`124`	`124`	`data = state.data,`
`125`	`125`	`};`
`126`		`- OnShowTooltip(i, rig, state.data, false);`
	`126`	`+ OnShowTooltip(button, rig, state.data, false);`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -166,15 +166,17 @@ public void SetTooltipData(IEnumerator<KeyValuePair<ControllerButton, TRenderDat`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- for (ControllerButton i = EnumArrayBase<ControllerButton>.StaticMin, imax = EnumArrayBase<ControllerButton>.StaticMax; i <= imax; ++i)`
	`169`	`+ foreach (var ev in btnVisibleTmp.EnumValues)`
`170`	`170`	`{`
`171`		`- if (btnVisibleTmp[(int)i])`
	`171`	`+ var button = ev.Key;`
	`172`	`+ var wasSet = ev.Value;`
	`173`	`+ if (wasSet)`
`172`	`174`	`{`
`173`		`- btnVisibleTmp[(int)i] = false;`
	`175`	`+ btnVisibleTmp[(int)button] = false;`
`174`	`176`	`}`
`175`	`177`	`else`
`176`	`178`	`{`
`177`		`- ResetTooltipData(i);`
	`179`	`+ ResetTooltipData(button);`
`178`	`180`	`}`
`179`	`181`	`}`
`180`	`182`	`}`
`@@ -186,7 +188,6 @@ public void SetTooltipData(ControllerButton button, TRenderData data)`
`186`	`188`
`187`	`189`	`TooltipRig rig;`
`188`	`190`	`var shouldShow = TryGetValidTooltipRig(button, out rig);`
`189`		`-`
`190`	`191`	`dataStateArray[(int)button] = new DataState()`
`191`	`192`	`{`
`192`	`193`	`state = shouldShow ? State.Visible : State.Hidden,`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public enum ButtonEventType`
`33`	`33`	`/// </summary>`
`34`	`34`	`public enum ControllerButton`
`35`	`35`	`{`
	`36`	`+ [InvalidEnumArrayIndex]`
`36`	`37`	`None = -1,`
`37`	`38`
`38`	`39`	`// classic buttons`