VR: Add action bindings for Vive Focus 3 controller

Although the HTC Vive Focus 3 controller extension is currently not
supported by any OpenXR runtimes (save for the dedicated Focus 3
runtime in developer early-access), the bindings are still useful to
have for the future.

1 files changed, 15 insertions, 7 deletions

diff --git a/viewport_vr_preview/action_map.py b/viewport_vr_preview/action_map.py
index 46b6dd65..6c62c05d 100644
--- a/viewport_vr_preview/action_map.py
+++ b/viewport_vr_preview/action_map.py
@@ -79,8 +79,11 @@ def vr_create_actions(context: bpy.context):
                 if amb.name == defaults.VRDefaultActionbindings.REVERB_G2.value:
                    if not scene.vr_actions_enable_reverb_g2:
                        continue
-                elif amb.name == defaults.VRDefaultActionbindings.COSMOS.value:
-                   if not scene.vr_actions_enable_cosmos:
+                elif amb.name == defaults.VRDefaultActionbindings.VIVE_COSMOS.value:
+                   if not scene.vr_actions_enable_vive_cosmos:
+                       continue
+                elif amb.name == defaults.VRDefaultActionbindings.VIVE_FOCUS.value:
+                   if not scene.vr_actions_enable_vive_focus:
                        continue
                 elif amb.name == defaults.VRDefaultActionbindings.HUAWEI.value:
                    if not scene.vr_actions_enable_huawei:
@@ -130,10 +133,6 @@ def register():
         default=False,
         update=vr_actions_use_gamepad_update,
     )
-    bpy.types.Scene.vr_actions_enable_cosmos = bpy.props.BoolProperty(
-        description="Enable bindings for the HTC Vive Cosmos controllers. Note that this may not be supported by all OpenXR runtimes",
-        default=False,
-    )
     bpy.types.Scene.vr_actions_enable_huawei = bpy.props.BoolProperty(
         description="Enable bindings for the Huawei controllers. Note that this may not be supported by all OpenXR runtimes",
         default=False,
@@ -142,6 +141,14 @@ def register():
         description="Enable bindings for the HP Reverb G2 controllers. Note that this may not be supported by all OpenXR runtimes",
         default=False,
     )
+    bpy.types.Scene.vr_actions_enable_vive_cosmos = bpy.props.BoolProperty(
+        description="Enable bindings for the HTC Vive Cosmos controllers. Note that this may not be supported by all OpenXR runtimes",
+        default=False,
+    )
+    bpy.types.Scene.vr_actions_enable_vive_focus = bpy.props.BoolProperty(
+        description="Enable bindings for the HTC Vive Focus 3 controllers. Note that this may not be supported by all OpenXR runtimes",
+        default=False,
+    )
 
     bpy.app.handlers.xr_session_start_pre.append(vr_create_actions)
 
@@ -149,8 +156,9 @@ def register():
 def unregister():
     del bpy.types.Scene.vr_actions_enable
     del bpy.types.Scene.vr_actions_use_gamepad
-    del bpy.types.Scene.vr_actions_enable_cosmos
     del bpy.types.Scene.vr_actions_enable_huawei
     del bpy.types.Scene.vr_actions_enable_reverb_g2
+    del bpy.types.Scene.vr_actions_enable_vive_cosmos
+    del bpy.types.Scene.vr_actions_enable_vive_focus
 
     bpy.app.handlers.xr_session_start_pre.remove(vr_create_actions)