Update to v1.15.0

* Changes - New OpenXR support options in VIU Settings (experimental) - OpenXR Desktop - OpenXR Android for WaveXR - OpenXR Android for Oculus - Add Oculus Quest 2 controller input support
ViveSoftware · Feb 7, 2022 · 3ec6827 · 3ec6827
2 parents c2a7e59 + 54d8853
commit 3ec6827
Show file tree

Hide file tree

Showing 30 changed files with 1,534 additions and 356 deletions.
diff --git a/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Editor/VRModuleManagerEditor.cs
@@ -48,6 +48,7 @@ public class ReqMethodInfo
             }
 
             public string symbol = string.Empty;
+            public string[] symbols = null;
             public string[] reqTypeNames = null;
             public string[] reqAnyTypeNames = null;
             public string[] reqFileNames = null;
@@ -442,26 +443,66 @@ private static void DoUpdateScriptingDefineSymbols()
 
             var defineSymbols = GetDefineSymbols();
             var defineSymbolsChanged = false;
+            var validSymbols = new HashSet<string>();
+            var invalidSymbols = new HashSet<string>();
 
             foreach (var symbolReq in s_symbolReqList)
             {
                 if (symbolReq.Validate())
                 {
-                    if (!defineSymbols.Contains(symbolReq.symbol))
+                    if (!string.IsNullOrEmpty(symbolReq.symbol))
                     {
-                        defineSymbols.Add(symbolReq.symbol);
-                        defineSymbolsChanged = true;
+                        invalidSymbols.Remove(symbolReq.symbol);
+                        validSymbols.Add(symbolReq.symbol);
+                    }
+                    if (symbolReq.symbols != null)
+                    {
+                        foreach (var symbol in symbolReq.symbols)
+                        {
+                            if (!string.IsNullOrEmpty(symbol))
+                            {
+                                invalidSymbols.Remove(symbol);
+                                validSymbols.Add(symbol);
+                            }
+                        }
                     }
                 }
                 else
                 {
-                    if (defineSymbols.RemoveAll((symbol) => symbol == symbolReq.symbol) > 0)
+                    if (!string.IsNullOrEmpty(symbolReq.symbol) && !validSymbols.Contains(symbolReq.symbol))
                     {
-                        defineSymbolsChanged = true;
+                        invalidSymbols.Add(symbolReq.symbol);
+                    }
+                    if (symbolReq.symbols != null)
+                    {
+                        foreach (var symbol in symbolReq.symbols)
+                        {
+                            if (!string.IsNullOrEmpty(symbol) && !validSymbols.Contains(symbol))
+                            {
+                                invalidSymbols.Add(symbol);
+                            }
+                        }
                     }
                 }
             }
 
+            foreach (var symbol in invalidSymbols)
+            {
+                if (defineSymbols.RemoveAll((s) => s == symbol) > 0)
+                {
+                    defineSymbolsChanged = true;
+                }
+            }
+
+            foreach (var symbol in validSymbols)
+            {
+                if (!defineSymbols.Contains(symbol))
+                {
+                    defineSymbols.Add(symbol);
+                    defineSymbolsChanged = true;
+                }
+            }
+
             if (defineSymbolsChanged)
             {
                 SetDefineSymbols(defineSymbols);

diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/OculusVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/OculusVRModuleEditor.cs
@@ -61,9 +61,43 @@ public OculusVRSymbolRequirementCollection()
                 reqFileNames = new string[] { "OvrAvatarSDKManager.cs" },
             });
 
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                },
+                reqMethods = new SymbolRequirement.ReqMethodInfo[]
+                {
+                    new SymbolRequirement.ReqMethodInfo()
+                    {
+                         typeName = "OvrAvatarSDKManager",
+                         name = "RequestAvatarSpecification",
+                         argTypeNames = new string[]
+                         {
+                             "System.UInt64",
+                             "specificationCallback",
+                             "System.Boolean",
+                             "ovrAvatarAssetLevelOfDetail",
+                             "System.Boolean",
+                             "ovrAvatarLookAndFeelVersion",
+                             "ovrAvatarLookAndFeelVersion",
+                         },
+                         bindingAttr = BindingFlags.Public | BindingFlags.Instance,
+                    }
+                },
+                reqFileNames = new string[] { "OvrAvatarSDKManager.cs" },
+            });
+
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_OCULUSVR_1_36_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                },
                 reqMethods = new SymbolRequirement.ReqMethodInfo[]
                 {
                     new SymbolRequirement.ReqMethodInfo()
@@ -90,6 +124,12 @@ public OculusVRSymbolRequirementCollection()
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_OCULUSVR_1_37_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_36_0_OR_NEWER",
+                },
                 reqTypeNames = new string[] { "OVRPlugin+SystemHeadset" },
                 validateFunc = (req) =>
                 {
@@ -109,6 +149,13 @@ public OculusVRSymbolRequirementCollection()
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_OCULUSVR_16_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_36_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_37_0_OR_NEWER",
+                },
                 reqTypeNames = new string[] { "OVRPlugin+SystemHeadset" },
                 validateFunc = (req) =>
                 {
@@ -128,6 +175,14 @@ public OculusVRSymbolRequirementCollection()
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_OCULUSVR_19_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_36_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_37_0_OR_NEWER",
+                    "VIU_OCULUSVR_16_0_OR_NEWER",
+                },
                 reqTypeNames = new string[] { "OVRPlugin+SystemHeadset" },
                 validateFunc = (req) =>
                 {
@@ -143,6 +198,22 @@ public OculusVRSymbolRequirementCollection()
                 },
                 reqFileNames = new string[] { "OVRPlugin.cs" },
             });
+
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_OCULUSVR_20_0_OR_NEWER",
+                symbols = new string[]
+                {
+                    "VIU_OCULUSVR_1_32_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_35_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_36_0_OR_NEWER",
+                    "VIU_OCULUSVR_1_37_0_OR_NEWER",
+                    "VIU_OCULUSVR_16_0_OR_NEWER",
+                    "VIU_OCULUSVR_19_0_OR_NEWER",
+                },
+                reqTypeNames = new string[] { "OVRPlugin+HandState" },
+                reqFileNames = new string[] { "OVRPlugin.cs" },
+            });
         }
     }
 }
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs
@@ -151,6 +151,19 @@ public UnityEngineVRSymbolRequirementCollection()
                     "PoseControl.cs",
                 },
             });
+
+            Add(new VRModuleManagerEditor.SymbolRequirement()
+            {
+                symbol = "VIU_UIS_POSE_CONTROL",
+                reqTypeNames = new string[]
+                {
+                    "UnityEngine.InputSystem.XR.PoseControl",
+                },
+                reqFileNames = new string[]
+                {
+                    "PoseControl.cs",
+                },
+            });
         }
     }
 }
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs
@@ -39,6 +39,13 @@ public WaveVRSymbolRequirementCollection()
                 reqFileNames = new string[] { "RenderModel.cs", "ButtonEffect.cs", "ControllerTips.cs" },
             });
 
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_WAVEXR_OPENXR",
+                reqTypeNames = new string[] { "Wave.OpenXR.VIVEFocus3Feature", "Wave.OpenXR.HTCViveFocus3Profile" },
+                reqFileNames = new string[] { "VIVEOpenXRFeature.cs", "HTCViveFocus3Profile.cs" },
+            });
+
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVEVR_2_0_32_OR_NEWER",