Add Interaction Mode support for Wave XR Plugin v4.1

Author: ChengNan Yang

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

@@ -39,6 +39,25 @@ public WaveVRSymbolRequirementCollection()
                 reqFileNames = new string[] { "RenderModel.cs", "ButtonEffect.cs", "ControllerTips.cs" },
             });
 
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_WAVE_XRSDK_4_1_0_OR_NEWER",
+                reqTypeNames = new string[] { "Wave.Native.WVR_EventType" },
+                validateFunc = (req) =>
+                {
+                    Type wvrEventType;
+                    if (SymbolRequirement.s_foundTypes.TryGetValue("Wave.Native.WVR_EventType", out wvrEventType) && wvrEventType.IsEnum)
+                    {
+                        if (Enum.IsDefined(wvrEventType, "WVR_EventType_ArenaChanged"))
+                        {
+                            return true;
+                        }
+                    }
+                    return false;
+                },
+                reqFileNames = new string[] { "wvr.cs" },
+            });
+
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVE_XRSDK_3_99_31_OR_NEWER",

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

@@ -226,10 +226,16 @@ public sealed override void BeforeRenderUpdate()
             submodules.UpdateModulesDeviceConnectionAndPoses();
 
             // process hand role
+#if VIU_WAVE_XRSDK_4_1_0_OR_NEWER
+            var currentRight = submodules.GetFirstRightHandedIndex() != INVALID_DEVICE_INDEX ? submodules.GetFirstRightHandedIndex() : uxrRightIndex;
+            var currentLeft = submodules.GetFirstLeftHandedIndex() != INVALID_DEVICE_INDEX ? submodules.GetFirstLeftHandedIndex(): uxrLeftIndex;
+#else
             var currentRight = uxrRightIndex != INVALID_DEVICE_INDEX ? uxrRightIndex : submodules.GetFirstRightHandedIndex();
             var currentLeft = uxrLeftIndex != INVALID_DEVICE_INDEX ? uxrLeftIndex : submodules.GetFirstLeftHandedIndex();
+#endif
             var roleChanged = ChangeProp.Set(ref moduleRightIndex, currentRight);
             roleChanged |= ChangeProp.Set(ref moduleLeftIndex, currentLeft);
+
             if (roleChanged)
             {
                 InvokeControllerRoleChangedEvent();