Update to v1.10.0

* New Features
  - SteamVR Plugin v2.0/v2.1 support
  - [SteamVR New Input System support](https://github.com/ViveSoftware/ViveInputUtility-Unity/wiki/SteamVR-Input-System-Support)

* Improvement
  - Now compatible with Google VR SDK v1.170.0
  - Add ControllerAxis.Joystick for Windows Mixed Reality Motion Controller
  - Extend ControllerButton alias
    - BKey (Menu)
    - BkeyTouch (MenuTouch)
    - Bumper (Axis3)
    - BumperTouch (Axis3Touch)
  - Add ControllerButton.DPadXXX virtual buttons (simulated from trackpad/thumbstick values)
    - DPadLeft
    - DPadLeftTouch
    - DPadUp
    - DPadUpTouch
    - DPadRight
    - DPadRightTouch
    - DPadDown
    - DPadDownTouch
    - DPadUpperLeft
    - DPadUpperLeftTouch
    - DPadUpperRight
    - DPadUpperRightTouch
    - DPadLowerRight
    - DPadLowerRightTouch
    - DPadLowerLeft
    - DPadLowerLeftTouch

* Known Issues
  - When working with SteamVR Plugin v2, VIU can get poses or send vibration pulses for all connected devices, but only able to connect button inputs from up to 2 Vive Controllers or 10 Vive Trackers (due to the limitation of SteamVR input sources). If you know how to work around, please let us know.

Author: lawwong

.gitignore

@@ -23,6 +23,8 @@ Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VIUProjectSettings.asset.
 
 *.cfg
 *.log
+*.json
+*.vrmanifest
 
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/

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

@@ -36,6 +36,7 @@ public class ReqMethodInfo
 
             public string symbol = string.Empty;
             public string[] reqTypeNames = null;
+            public string[] reqAnyTypeNames = null;
             public string[] reqFileNames = null;
             public ReqFieldInfo[] reqFields = null;
             public ReqMethodInfo[] reqMethods = null;
@@ -61,6 +62,14 @@ public void FindRequiredTypesInAssembly(Assembly assembly)
                     }
                 }
 
+                if (reqAnyTypeNames != null)
+                {
+                    foreach (var name in reqAnyTypeNames)
+                    {
+                        TryAddTypeFromAssembly(name, assembly);
+                    }
+                }
+
                 if (reqFields != null)
                 {
                     foreach (var field in reqFields)
@@ -113,6 +122,22 @@ public bool Validate()
                     }
                 }
 
+                if (reqAnyTypeNames != null)
+                {
+                    var found = false;
+
+                    foreach (var name in reqAnyTypeNames)
+                    {
+                        if (s_foundTypes.ContainsKey(name))
+                        {
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if (!found) { return false; }
+                }
+
                 if (reqFields != null)
                 {
                     foreach (var field in reqFields)
@@ -174,8 +199,8 @@ static VRModuleManagerEditor()
             s_symbolReqList.Add(new SymbolRequirement()
             {
                 symbol = "VIU_STEAMVR",
-                reqTypeNames = new string[] { "SteamVR" },
-                reqFileNames = new string[] { "SteamVR.cs" },
+                reqTypeNames = new string[] { "Valve.VR.OpenVR" },
+                reqFileNames = new string[] { "openvr_api.cs" },
             });
 
             s_symbolReqList.Add(new SymbolRequirement()
@@ -238,6 +263,18 @@ static VRModuleManagerEditor()
                 reqFileNames = new string[] { "openvr_api.cs" },
             });
 
+            s_symbolReqList.Add(new SymbolRequirement()
+            {
+                symbol = "VIU_STEAMVR_2_0_0_OR_NEWER",
+                reqTypeNames = new string[] { "Valve.VR.SteamVR" },
+            });
+
+            s_symbolReqList.Add(new SymbolRequirement()
+            {
+                symbol = "VIU_STEAMVR_2_1_0_OR_NEWER",
+                reqTypeNames = new string[] { "Valve.VR.SteamVR_ActionSet_Manager" },
+            });
+
             s_symbolReqList.Add(new SymbolRequirement()
             {
                 symbol = "VIU_OCULUSVR",
@@ -252,6 +289,13 @@ static VRModuleManagerEditor()
                 reqFileNames = new string[] { "GvrUnitySdkVersion.cs" },
             });
 
+            s_symbolReqList.Add(new SymbolRequirement()
+            {
+                symbol = "VIU_GOOGLEVR_1_150_0_NEWER",
+                reqTypeNames = new string[] { "GvrControllerInputDevice" },
+                reqFileNames = new string[] { "GvrControllerInputDevice.cs" },
+            });
+
             s_symbolReqList.Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVEVR",
@@ -282,7 +326,7 @@ static VRModuleManagerEditor()
                 },
                 reqFileNames = new string[] { "wvr.cs" },
             });
-            
+
             s_symbolReqList.Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVEVR_2_1_0_OR_NEWER",
@@ -395,6 +439,8 @@ public static AssetDeleteResult OnWillDeleteAsset(string assetPath, RemoveAssetO
 
             foreach (var symbolReq in s_symbolReqList)
             {
+                if (symbolReq == null || symbolReq.reqFileNames == null) { continue; }
+
                 foreach (var reqFileName in symbolReq.reqFileNames)
                 {
                     if (isDir)

Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs

@@ -18,11 +18,10 @@ private static void EnforceInputManagerBindings()
             try
             {
                 var axisObj = new Axis();
-                for (int i = 0; i < UnityEngineVRModule.ButtonAxisID.Count; ++i)
+                for (int i = 0, imax = UnityEngineVRModule.GetUnityAxisCount(); i < imax; ++i)
                 {
-                    axisObj.name = UnityEngineVRModule.ButtonAxisName.Index(i);
-                    axisObj.axis = UnityEngineVRModule.ButtonAxisID.Index(i);
-                    axisObj.invert = axisObj.axis == UnityEngineVRModule.ButtonAxisID.LPadY || axisObj.axis == UnityEngineVRModule.ButtonAxisID.RPadY;
+                    axisObj.name = UnityEngineVRModule.GetUnityAxisNameByIndex(i);
+                    axisObj.axis = UnityEngineVRModule.GetUnityAxisIdByIndex(i) - 1;
                     BindAxis(axisObj);
                 }
             }