Now with out VIU_BINDING_INTERFACE_SWITCH defined, Binding Interface can't be enabled by hotkey even that hotkey is defined in config file

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUVersionCheck.cs

@@ -30,7 +30,7 @@ private struct RepoInfo
         private static string doNotShowSetupSwitch;
 
         private readonly static string s_enableBindUISwitchInfo = "This project will enable binding interface switch! Press RightShift + B to open the binding interface in play mode.";
-        private readonly static string s_disableBindUISwitchInfo = "This project will NOT enable binding interface switch! You can only enable it manually by calling ViveRoleBindingsHelper.EnableBindingInterface() in script, or copy \"ViveInputUtility/Scripts/ViveRole/BindingInterface/BindingConfigSample/vive_role_bindings.cfg\" file into project folder before you can press RightShift + B to open the binding interface in play mode.";
+        private readonly static string s_disableBindUISwitchInfo = "This project will NOT enable binding interface switch! You can only enable it manually by calling ViveRoleBindingsHelper.EnableBindingInterface() in script.";
         private readonly static string s_enableExternalCamSwitcInfo = "This project will enable external camera switch! Press RightShift + M to toggle the quad view when external camera is enabled.";
         private readonly static string s_disableExternalCamSwitcInfo = "This project will NOT enable external camera switch! Enable the switch let you toggle the quad view by pressing RightShift + M when external camera is enabled.";
         private static bool s_waitingForCompile;
@@ -54,6 +54,7 @@ static VIUVersionCheck()
         // check vive input utility version on github
         private static void CheckVersion()
         {
+            // On Windows, PlaterSetting is stored at \HKEY_CURRENT_USER\Software\Unity Technologies\Unity Editor 5.x
             nextVersionCheckTimeKey = "ViveInputUtility." + PlayerSettings.productGUID + ".LastVersionCheckTime";
             doNotShowUpdateKey = "ViveInputUtility." + PlayerSettings.productGUID + ".DoNotShowUpdate.v{0}";
             doNotShowSetupSwitch = "ViveInputUtility." + PlayerSettings.productGUID + ".DoNotShowSetupSwitch";
@@ -168,22 +169,22 @@ public void OnGUI()
             {
                 if (toggleBindUISwithState)
                 {
-                    EditorGUILayout.HelpBox(s_enableBindUISwitchInfo, MessageType.Warning);
+                    EditorGUILayout.HelpBox(s_enableBindUISwitchInfo, MessageType.Info);
                 }
                 else
                 {
-                    EditorGUILayout.HelpBox(s_disableBindUISwitchInfo, MessageType.Warning);
+                    EditorGUILayout.HelpBox(s_disableBindUISwitchInfo, MessageType.Info);
                 }
 
                 toggleBindUISwithState = GUILayout.Toggle(toggleBindUISwithState, "Enable Binding Interface Switch");
 
                 if (toggleExCamSwithState)
                 {
-                    EditorGUILayout.HelpBox(s_enableExternalCamSwitcInfo, MessageType.Warning);
+                    EditorGUILayout.HelpBox(s_enableExternalCamSwitcInfo, MessageType.Info);
                 }
                 else
                 {
-                    EditorGUILayout.HelpBox(s_disableExternalCamSwitcInfo, MessageType.Warning);
+                    EditorGUILayout.HelpBox(s_disableExternalCamSwitcInfo, MessageType.Info);
                 }
 
                 toggleExCamSwithState = GUILayout.Toggle(toggleExCamSwithState, "Enable External Camera Switch");
@@ -223,6 +224,11 @@ public void OnGUI()
                     }
                 }
             }
+
+            if (GUILayout.Button("Close"))
+            {
+                Close();
+            }
         }
 
         private void OnDestroy()
@@ -323,7 +329,6 @@ public static void OnVIUPreferenceGUI()
             }
             else
             {
-                GUILayout.Space(30f);
                 GUILayout.Button("Re-compiling...");
             }
         }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveRole/ViveRoleBindingsHelper.cs

@@ -34,11 +34,7 @@ public struct RoleData
         public class BindingConfig
         {
             public bool apply_bindings_on_load = true;
-#if VIU_BINDING_INTERFACE_SWITCH
             public string toggle_interface_key_code = KeyCode.B.ToString(); // Default key to enable binding interface
-#else
-            public string toggle_interface_key_code = KeyCode.None.ToString(); // Default key to enable binding interface
-#endif
             public string toggle_interface_modifier = KeyCode.RightShift.ToString(); // Default key modifier to enable binding interface
             public string interface_prefab = DEFAULT_INTERFACE_PREFAB;
             public RoleData[] roles = new RoleData[0];
@@ -67,6 +63,11 @@ static ViveRoleBindingsHelper()
             SetDefaultInitGameObjectGetter(VRModule.GetInstanceGameObject);
         }
 
+        private void Awake()
+        {
+            AutoLoadConfig();
+        }
+
         [RuntimeInitializeOnLoadMethod]
         public static void AutoLoadConfig()
         {
@@ -75,12 +76,12 @@ public static void AutoLoadConfig()
 
             var configPath = AUTO_LOAD_CONFIG_PATH;
 
-            if (Active && string.IsNullOrEmpty(Instance.m_overrideConfigPath))
+            if (Active)
             {
                 configPath = Instance.m_overrideConfigPath;
             }
 
-            if (File.Exists(configPath))
+            if (!string.IsNullOrEmpty(configPath) && File.Exists(configPath))
             {
                 LoadBindingConfigFromFile(configPath);
 
@@ -97,6 +98,7 @@ public static void AutoLoadConfig()
             }
         }
 
+#if VIU_BINDING_INTERFACE_SWITCH
         private static void UpdateInterfaceKeyMonitor()
         {
             // Moniter input key to open up the binding interface
@@ -134,11 +136,6 @@ private static void UpdateInterfaceKeyMonitor()
             }
         }
 
-        private void Awake()
-        {
-            AutoLoadConfig();
-        }
-
         private void Update()
         {
             if (!IsInstance) { return; }
@@ -148,6 +145,9 @@ private void Update()
                 ToggleBindingInterface();
             }
         }
+#else
+        private static void UpdateInterfaceKeyMonitor() { }
+#endif
 
         public static VRModuleDeviceModel GetDeviceModelHint(string deviceSN)
         {