Add Wave hand tracking & render model support option to VIUSettings

lawwong · lawwong · commit 763198a90617 · 2021-12-08T05:23:54.000+08:00
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs
@@ -219,6 +219,22 @@ public WaveVRSymbolRequirementCollection()
                 },
                 reqFileNames = new string[] { "wvr.cs" },
             });
+
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_WAVEVR_HAND_TRACKING_CHECK",
+                reqMethods = new SymbolRequirement.ReqMethodInfo[]
+                {
+                    new SymbolRequirement.ReqMethodInfo()
+                    {
+                        typeName = "Wave.XR.BuildCheck.CheckIfHandTrackingEnabled",
+                        name = "ValidateEnabled",
+                        argTypeNames = new string[0],
+                        bindingAttr = BindingFlags.Public | BindingFlags.Static,
+                    }
+                },
+                reqFileNames = new string[] { "WaveXRBuildCheck.cs" },
+            });
         }
     }
 }
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs
@@ -51,7 +51,7 @@ public override bool shouldActive
                 get
                 {
 #if (VIU_WAVEXR_ESSENCE_CONTROLLER_MODEL || VIU_WAVEXR_ESSENCE_RENDERMODEL) && UNITY_ANDROID
-                    return true;
+                    return VIUSettings.enableWaveXRRenderModel;
 #else
                     return false;
 #endif
diff --git a/Assets/HTC.UnityPlugin/VRModule/Submodules/WaveHandTrackingSubmodule.cs b/Assets/HTC.UnityPlugin/VRModule/Submodules/WaveHandTrackingSubmodule.cs
@@ -43,8 +43,7 @@ public void Fetch()
         private GestureActivator gestureActivator = GestureActivator.Default;
         private uint leftDeviceIndex = VRModule.INVALID_DEVICE_INDEX;
         private uint rightDeviceIndex = VRModule.INVALID_DEVICE_INDEX;
-        private static WVR_HandTrackerType preferredTrackerType =
-            VRModuleSettings.enableWaveNaturalHand ? WVR_HandTrackerType.WVR_HandTrackerType_Natural : WVR_HandTrackerType.WVR_HandTrackerType_Electronic;
+        private static WVR_HandTrackerType preferredTrackerType = WVR_HandTrackerType.WVR_HandTrackerType_Natural;
         private static WVR_HandModelType showElectronicHandWithController =
             VRModuleSettings.showWaveElectronicHandWithController ?
             WVR_HandModelType.WVR_HandModelType_WithController : WVR_HandModelType.WVR_HandModelType_WithoutController;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/HTC.ViveInputUtility.Editor.asmdef b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/HTC.ViveInputUtility.Editor.asmdef
@@ -1,6 +1,5 @@
 {
     "name": "HTC.ViveInputUtility.Editor",
-    "rootNamespace": "",
     "references": [
         "HTC.ViveInputUtility",
         "HTC.ViveInputUtility.UPMRegistryTool.Editor",
@@ -12,7 +11,13 @@
         "Oculus.VR",
         "Oculus.VR.Editor",
         "Unity.XR.OpenXR",
-        "Unity.XR.OpenXR.Editor"
+        "Unity.XR.OpenXR.Editor",
+        "Wave.XRSDK",
+        "Wave.XRSDK.Editor",
+        "Wave.Essence",
+        "Wave.Essence.Editor",
+        "Wave.Native",
+        "Wave.Native.Editor"
     ],
     "includePlatforms": [
         "Editor"
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -64,6 +64,8 @@ public static partial class VIUSettingsEditor
         public const string URL_WAVE_VR_PLUGIN = "https://developer.vive.com/resources/knowledgebase/wave-sdk/";
         public const string URL_WAVE_VR_6DOF_SUMULATOR_USAGE_PAGE = "https://github.com/ViveSoftware/ViveInputUtility-Unity/wiki/Wave-VR-6-DoF-Controller-Simulator";
         private const string WAVE_XR_PACKAGE_NAME = "com.htc.upm.wave.xrsdk";
+        private const string WAVE_XR_PACKAGE_NATIVE_NAME = "com.htc.upm.wave.native";
+        private const string WAVE_XR_PACKAGE_ESSENCE_NAME = "com.htc.upm.wave.essence";
 
         public static bool canSupportWaveVR
         {
@@ -190,16 +192,16 @@ public override bool support
 
             public override void OnPreferenceGUI()
             {
-                const string title = "WaveVR";
+                const string title = "Wave XR";
+                const float wvrToggleWidth = 226f;
                 if (canSupport)
                 {
                     var wasSupported = support;
-                    support = m_foldouter.ShowFoldoutButtonOnToggleEnabled(new GUIContent(title, "VIVE Focus, VIVE Focus Plus"), wasSupported);
+                    support = m_foldouter.ShowFoldoutButtonOnToggleEnabled(new GUIContent(title, "VIVE Focus, VIVE Flow"), wasSupported);
                     s_symbolChanged |= wasSupported != support;
                 }
                 else
                 {
-                    const float wvrToggleWidth = 226f;
                     GUILayout.BeginHorizontal();
                     Foldouter.ShowFoldoutBlank();
 
@@ -256,27 +258,100 @@ public override void OnPreferenceGUI()
                         EditorGUI.indentLevel += 2;
 
                         EditorGUILayout.BeginHorizontal();
+                        {
+                            EditorGUIUtility.labelWidth = 230;
+                            var style = new GUIStyle(GUI.skin.textField) { alignment = TextAnchor.MiddleLeft };
+                            VIUSettings.waveVRAndroidManifestPath = EditorGUILayout.DelayedTextField(new GUIContent("Customized AndroidManifest Path:", "Default path: " + defaultAndroidManifestPath),
+                                                    VIUSettings.waveVRAndroidManifestPath, style);
 
-                        EditorGUIUtility.labelWidth = 230;
-                        var style = new GUIStyle(GUI.skin.textField) { alignment = TextAnchor.MiddleLeft };
-                        VIUSettings.waveVRAndroidManifestPath = EditorGUILayout.DelayedTextField(new GUIContent("Customized AndroidManifest Path:", "Default path: " + defaultAndroidManifestPath),
-                                                VIUSettings.waveVRAndroidManifestPath, style);
-                        if (GUILayout.Button("Open", new GUILayoutOption[] { GUILayout.Width(44), GUILayout.Height(18) }))
+                            s_guiChanged |= EditorGUI.EndChangeCheck();
+                            if (GUILayout.Button("Open", new GUILayoutOption[] { GUILayout.Width(44), GUILayout.Height(18) }))
+                            {
+                                VIUSettings.waveVRAndroidManifestPath = EditorUtility.OpenFilePanel("Select AndroidManifest.xml", string.Empty, "xml");
+                            }
+                            EditorGUI.BeginChangeCheck();
+                        }
+                        EditorGUILayout.EndHorizontal();
+
+                        EditorGUILayout.BeginHorizontal();
                         {
-                            VIUSettings.waveVRAndroidManifestPath = EditorUtility.OpenFilePanel("Select AndroidManifest.xml", string.Empty, "xml");
+                            if (!string.IsNullOrEmpty(VIUSettings.waveVRAndroidManifestPath) && !File.Exists(VIUSettings.waveVRAndroidManifestPath))
+                            {
+                                EditorGUILayout.HelpBox("File does not existed!", MessageType.Warning);
+                            }
                         }
+                        EditorGUILayout.EndHorizontal();
 
+                        const string enableWaveXRRenderModelTitle = "Enable Wave XR Render Model";
+                        EditorGUILayout.BeginHorizontal();
+#if VIU_WAVEXR_ESSENCE_CONTROLLER_MODEL || VIU_WAVEXR_ESSENCE_RENDERMODEL
+                        VIUSettings.enableWaveXRRenderModel = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveXRRenderModelTitle, VIUSettings.ENABLE_WAVE_XR_RENDER_MODEL_TOOLTIP), VIUSettings.enableWaveXRRenderModel);
+#else
+                        GUI.enabled = false;
+                        EditorGUILayout.ToggleLeft(new GUIContent(enableWaveXRRenderModelTitle, VIUSettings.ENABLE_WAVE_XR_RENDER_MODEL_TOOLTIP + ". Required Wave XR Plugin Essence"), false, GUILayout.ExpandWidth(true));
+                        GUI.enabled = true;
+                        
+                        s_guiChanged |= EditorGUI.EndChangeCheck();
+                        if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))
+                        {
+                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            {
+                                ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
+                            }
+
+                            if (!PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_ESSENCE_NAME))
+                            {
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);
+                            }
+
+                            VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;
+                        }
                         EditorGUI.BeginChangeCheck();
+#endif
                         EditorGUILayout.EndHorizontal();
 
+                        const string enableWaveHandTrackingTitle = "Enable Wave Hand Tracking";
                         EditorGUILayout.BeginHorizontal();
-
-                        if (!string.IsNullOrEmpty(VIUSettings.waveVRAndroidManifestPath) && !File.Exists(VIUSettings.waveVRAndroidManifestPath))
+#if VIU_WAVEVR_HAND_TRACKING_CHECK
                         {
-                            EditorGUILayout.HelpBox("File does not existed!", MessageType.Warning);
+                            var supported = Wave.XR.BuildCheck.CheckIfHandTrackingEnabled.ValidateEnabled() && VRModuleSettings.activateWaveHandTrackingSubmodule;
+                            var shouldSupport = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveHandTrackingTitle), supported);
+                            if (supported != shouldSupport)
+                            {
+                                Wave.XR.BuildCheck.CheckIfHandTrackingEnabled.PerformAction(shouldSupport);
+                                VRModuleSettings.activateWaveHandTrackingSubmodule = shouldSupport;
+                            }
                         }
+#else
+                        GUI.enabled = false;
+                        EditorGUILayout.ToggleLeft(new GUIContent(enableWaveHandTrackingTitle, "Wave XR Plugin Essence required."), false, GUILayout.ExpandWidth(true));
+                        GUI.enabled = true;
 
+                        s_guiChanged |= EditorGUI.EndChangeCheck();
+                        if (GUILayout.Button(new GUIContent("Update Wave XR Plugin", "Update " + WAVE_XR_PACKAGE_NAME + " to lateast version"), GUILayout.ExpandWidth(false)))
+                        {
+                            if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
+                            {
+                                ManifestUtils.AddRegistry(RegistryToolSettings.Instance().Registry);
+                            }
+
+                            if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_ESSENCE_NAME))
+                            {
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);
+                            }
+                            else if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NATIVE_NAME))
+                            {
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);
+                            }
+                            else
+                            {
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NAME);
+                            }
+
+                            VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;
+                        }
                         EditorGUI.BeginChangeCheck();
+#endif
                         EditorGUILayout.EndHorizontal();
 
                         VIUSettings.waveVRAddVirtualArmTo3DoFController = EditorGUILayout.ToggleLeft(new GUIContent("Add Virtual Arm for 3 Dof Controller"), VIUSettings.waveVRAddVirtualArmTo3DoFController);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUSettingsPartials/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUSettingsPartials/WaveVRSettings.cs
@@ -6,6 +6,8 @@ namespace HTC.UnityPlugin.Vive
 {
     public partial class VIUSettings : ScriptableObject
     {
+        public const string ENABLE_WAVE_XR_RENDER_MODEL_TOOLTIP = "Use render model proivded by Wave runtime";
+
         public const bool ACTIVATE_WAVE_VR_MODULE_DEFAULT_VALUE = true;
         public const bool SIMULATE_WAVE_VR_6DOF_CONTROLLER_DEFAULT_VALUE = false;
         public const bool WAVE_VR_ADD_VIRTUAL_ARM_TO_3DOF_CONTROLLER = true;
@@ -14,6 +16,7 @@ public partial class VIUSettings : ScriptableObject
         public static readonly Vector3 WAVE_VR_VIRTUAL_ARM_EXTENSION_OFFSET_DEFAULT_VALUE = new Vector3(-0.13f, 0.14f, 0.08f);
         public static readonly Vector3 WAVE_VR_VIRTUAL_WRIST_REST_POSITION_DEFAULT_VALUE = new Vector3(0.0f, 0.0f, 0.35f);
         public static readonly Vector3 WAVE_VR_VIRTUAL_HAND_REST_POSITION_DEFAULT_VALUE = new Vector3(0.0f, 0.0f, 0.05f);
+        public const bool ENABLE_WAVE_XR_RENDER_MODEL_DEFAULT_VALUE = true;
 
         [SerializeField]
         private bool m_activateWaveVRModule = ACTIVATE_WAVE_VR_MODULE_DEFAULT_VALUE;
@@ -33,6 +36,8 @@ public partial class VIUSettings : ScriptableObject
         private Vector3 m_waveVRVirtualHandRestPosition = WAVE_VR_VIRTUAL_HAND_REST_POSITION_DEFAULT_VALUE;
         [SerializeField]
         private string m_waveVRAndroidManifestPath = string.Empty;
+        [SerializeField, Tooltip(ENABLE_WAVE_XR_RENDER_MODEL_TOOLTIP)]
+        private bool m_enableWaveXRRenderModel = ENABLE_WAVE_XR_RENDER_MODEL_DEFAULT_VALUE;
 
         public static bool activateWaveVRModule { get { return Instance == null ? ACTIVATE_WAVE_VR_MODULE_DEFAULT_VALUE : s_instance.m_activateWaveVRModule; } set { if (Instance != null) { Instance.m_activateWaveVRModule = value; } } }
         public static bool simulateWaveVR6DofController { get { return Instance == null ? SIMULATE_WAVE_VR_6DOF_CONTROLLER_DEFAULT_VALUE : s_instance.m_simulateWaveVR6DoFController; } set { if (Instance != null) { Instance.m_simulateWaveVR6DoFController = value; } } }
@@ -43,5 +48,6 @@ public partial class VIUSettings : ScriptableObject
         public static Vector3 waveVRVirtualWristRestPosition { get { return Instance == null ? WAVE_VR_VIRTUAL_WRIST_REST_POSITION_DEFAULT_VALUE : s_instance.m_waveVRVirtualWristRestPosition; } set { if (Instance != null) { Instance.m_waveVRVirtualWristRestPosition = value; } } }
         public static Vector3 waveVRVirtualHandRestPosition { get { return Instance == null ? WAVE_VR_VIRTUAL_HAND_REST_POSITION_DEFAULT_VALUE : s_instance.m_waveVRVirtualHandRestPosition; } set { if (Instance != null) { Instance.m_waveVRVirtualHandRestPosition = value; } } }
         public static string waveVRAndroidManifestPath { get { return Instance == null ? string.Empty : s_instance.m_waveVRAndroidManifestPath; } set { if (Instance != null) { Instance.m_waveVRAndroidManifestPath = value; } } }
+        public static bool enableWaveXRRenderModel { get { return Instance == null ? ENABLE_WAVE_XR_RENDER_MODEL_DEFAULT_VALUE : s_instance.m_enableWaveXRRenderModel; } set { if (Instance != null) { Instance.m_enableWaveXRRenderModel = value; } } }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public override bool shouldActive`
`51`	`51`	`get`
`52`	`52`	`{`
`53`	`53`	`#if (VIU_WAVEXR_ESSENCE_CONTROLLER_MODEL \|\| VIU_WAVEXR_ESSENCE_RENDERMODEL) && UNITY_ANDROID`
`54`		`- return true;`
	`54`	`+ return VIUSettings.enableWaveXRRenderModel;`
`55`	`55`	`#else`
`56`	`56`	`return false;`
`57`	`57`	`#endif`