Update to v1.8.2

* Bug fix
  - Fix define symbols sometimes not handle correctly when switching build target
  - Disable vr support if device list is empty
  - Add code to avoid NullReferenceException in VRModule
  - Add SetValueByIndex method to IndexedTable
  - Fix StickyGrabbable not working in certain cases

Author: lawwong

Assets/HTC.UnityPlugin/Utility/Container/IndexedTable.cs

@@ -75,20 +75,7 @@ public IndexedTable(int capacity)
             m_ValueList = new List<TValue>(capacity);
         }
 
-        public int Count
-        {
-            get
-            {
-                if (m_Dictionary.Count != m_KeyList.Count || m_Dictionary.Count != m_ValueList.Count)
-                {
-                    UnityEngine.Debug.LogWarning("m_Dictionary.Count=" + m_Dictionary.Count + " m_KeyList.Count=" + m_KeyList.Count + " m_ValueList.Count=" + m_ValueList.Count);
-                    UnityEngine.Debug.LogWarning(m_Dictionary.ToString());
-                    UnityEngine.Debug.LogWarning(m_KeyList.ToString());
-                    UnityEngine.Debug.LogWarning(m_ValueList.ToString());
-                }
-                return m_Dictionary.Count;
-            }
-        }
+        public int Count { get { return m_Dictionary.Count; } }
 
         public bool IsReadOnly { get { return false; } }
 
@@ -114,6 +101,11 @@ public TValue GetValueByIndex(int index)
             return m_ValueList[index];
         }
 
+        public void SetValueByIndex(int index, TValue value)
+        {
+            m_ValueList[index] = value;
+        }
+
         public KeyValuePair<TKey, TValue> GetKeyValuePairByIndex(int index)
         {
             return new KeyValuePair<TKey, TValue>(m_KeyList[index], m_ValueList[index]);

Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs

@@ -12,6 +12,9 @@ namespace HTC.UnityPlugin.VRModuleManagement
 {
     // This script manage define symbols used by VIU
     public class VRModuleManagerEditor : UnityEditor.AssetModificationProcessor
+#if UNITY_2017_1_OR_NEWER
+        , UnityEditor.Build.IActiveBuildTargetChanged
+#endif
     {
         private class SymbolRequirement
         {
@@ -39,6 +42,14 @@ public class ReqMethodInfo
 
             private static Dictionary<string, Type> s_foundTypes;
 
+            public static void ResetFoundTypes()
+            {
+                if (s_foundTypes != null)
+                {
+                    s_foundTypes.Clear();
+                }
+            }
+
             public void FindRequiredTypesInAssembly(Assembly assembly)
             {
                 if (reqTypeNames != null)
@@ -255,10 +266,23 @@ static VRModuleManagerEditor()
                 symbol = "VIU_BINDING_INTERFACE_SWITCH",
                 reqFileNames = new string[] { "" },
             });
+
+#if !UNITY_2017_1_OR_NEWER
+            EditorUserBuildSettings.activeBuildTargetChanged += UpdateScriptingDefineSymbols;
+#endif
         }
 
+#if UNITY_2017_1_OR_NEWER
+        public int callbackOrder { get { return 0; } }
+
+        public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
+        {
+            UpdateScriptingDefineSymbols();
+        }
+#endif
+
         [DidReloadScripts]
-        private static void UpdateScriptingDefineSymbols()
+        public static void UpdateScriptingDefineSymbols()
         {
             foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
@@ -306,9 +330,12 @@ private static void UpdateScriptingDefineSymbols()
             {
                 SetDefineSymbols(defineSymbols);
             }
+
+            SymbolRequirement.ResetFoundTypes();
         }
 
         private static bool s_delayCallRemoveRegistered;
+
         // This is called when ever an asset deleted
         // If the deleted asset include sdk files, then remove all symbols defined by VIU
         public static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetOptions option)

Assets/HTC.UnityPlugin/VRModule/Modules/SteamVRModule.cs

@@ -260,5 +260,5 @@ private static string QueryDeviceStringProperty(CVRSystem system, uint deviceInd
             return result;
         }
 #endif
-                    }
+    }
 }

Assets/HTC.UnityPlugin/VRModule/VRModuleManager.cs

@@ -89,6 +89,8 @@ protected override void OnSingletonBehaviourInitialized()
 
         private void Update()
         {
+            if (!IsInstance) { return; }
+
             m_isUpdating = true;
 
             // Get should activate module
@@ -295,13 +297,11 @@ private void DeactivateModule()
         {
             if (m_activatedModule == VRModuleActiveEnum.Uninitialized)
             {
-                Debug.LogError("activatedModule is already Uninitialized!");
                 return;
             }
 
             if (m_activatedModuleBase == null)
             {
-                Debug.LogError("activatedModule is already null!");
                 return;
             }