Merge pull request #1098 from BastiaanOlij/openxr_hand_tracking_demo_settings

Updated hand tracking demo based on Godot changes in PR 95153

Author: aaronfranke

xr/openxr_hand_tracking_demo/README.md

@@ -8,7 +8,7 @@ Renderer: Compatibility
 
 > [!NOTE]
 >
-> This demo requires Godot 4.3 or later
+> This demo requires Godot 4.4 or later
 
 ## Screenshots
 

xr/openxr_hand_tracking_demo/hand_controller.gd.uid

@@ -0,0 +1 @@
+uid://djo0o7s7ix543

xr/openxr_hand_tracking_demo/hand_info.gd

@@ -2,6 +2,7 @@ extends Node3D
 
 @export_enum("Left", "Right") var hand : int = 0
 
+@export var fallback_mesh : Node3D
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
@@ -43,17 +44,23 @@ func _process(delta):
 	if hand_tracker:
 		text += "\nHand tracker found\n"
 
-		if hand_tracker.has_tracking_data:
-			if hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_UNKNOWN:
-				text += "- Source: unknown\n"
-			elif hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_UNOBSTRUCTED:
-				text += "- Source: optical hand tracking\n"
-			elif hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_CONTROLLER:
-				text += "- Source: inferred from controller\n"
-			else:
-				text += "- Source: %d\n" % [ hand_tracker.hand_tracking_source ]
+		# Report data source specified
+		if hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_UNKNOWN:
+			text += "- Source: unknown\n"
+		elif hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_UNOBSTRUCTED:
+			text += "- Source: optical hand tracking\n"
+		elif hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_CONTROLLER:
+			text += "- Source: inferred from controller\n"
+		elif hand_tracker.hand_tracking_source == XRHandTracker.HAND_TRACKING_SOURCE_NOT_TRACKED:
+			text += "- Source: no source\n"
 		else:
-			text += "- No tracking data\n"
+			text += "- Source: %d\n" % [ hand_tracker.hand_tracking_source ]
+
+		# If we're not tracking, show our fallback mesh on our controller tracking.
+		# If we're also not controller tracking, we can't show anything.
+		# Note: this is only a sphere in this example.
+		if fallback_mesh:
+			fallback_mesh.visible = not hand_tracker.has_tracking_data
 	else:
 		text += "\nNo hand tracker found!\n"
 

xr/openxr_hand_tracking_demo/hand_mesh.gd.uid

@@ -0,0 +1 @@
+uid://dxi1173oqpsr5

xr/openxr_hand_tracking_demo/main.tscn

@@ -1,16 +1,16 @@
-[gd_scene load_steps=17 format=3 uid="uid://br3bss6kac8pa"]
+[gd_scene load_steps=18 format=3 uid="uid://br3bss6kac8pa"]
 
 [ext_resource type="PackedScene" uid="uid://d22k0sp2hinew" path="res://assets/gltf/LeftHandHumanoid.gltf" id="2_3hxem"]
 [ext_resource type="Script" uid="uid://dpqdbsepdkd4h" path="res://start_vr.gd" id="2_5rtkn"]
 [ext_resource type="PackedScene" uid="uid://dlswhmq6s52gu" path="res://assets/gltf/RightHandHumanoid.gltf" id="3_oifi1"]
 [ext_resource type="PackedScene" uid="uid://byif52d1xkl3u" path="res://pickup/pickup_handler.tscn" id="3_sg1io"]
 [ext_resource type="Texture2D" uid="uid://b1waowk6l76ap" path="res://assets/images/pattern.png" id="4_3x0ea"]
 [ext_resource type="PackedScene" uid="uid://dtabh705qyufu" path="res://hand_info.tscn" id="5_wlhtu"]
-[ext_resource type="Script" path="res://hand_controller.gd" id="6_e5cto"]
+[ext_resource type="Script" uid="uid://djo0o7s7ix543" path="res://hand_controller.gd" id="6_e5cto"]
 [ext_resource type="PackedScene" uid="uid://hanl00aqvu7u" path="res://objects/table.tscn" id="6_rfmma"]
 [ext_resource type="PackedScene" uid="uid://cerkxyasq8t8b" path="res://objects/box.tscn" id="7_6sqt7"]
-[ext_resource type="Script" path="res://hand_mesh.gd" id="7_yj2fr"]
-[ext_resource type="Script" path="res://xr_hand_fallback_modifier_3d.gd" id="8_gdsnk"]
+[ext_resource type="Script" uid="uid://dxi1173oqpsr5" path="res://hand_mesh.gd" id="7_yj2fr"]
+[ext_resource type="Script" uid="uid://bnt74t168r248" path="res://xr_hand_fallback_modifier_3d.gd" id="8_gdsnk"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_eyx45"]
 sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1)
@@ -35,6 +35,10 @@ size = Vector2(1000, 1000)
 subdivide_width = 10
 subdivide_depth = 10
 
+[sub_resource type="SphereMesh" id="SphereMesh_d5x0p"]
+radius = 0.01
+height = 0.02
+
 [node name="Main" type="Node3D"]
 
 [node name="StartVR" type="Node3D" parent="."]
@@ -76,12 +80,14 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.13752, 0.941084, 0)
 [node name="Box03" parent="Table" instance=ExtResource("7_6sqt7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0746718, 1.06282, 0)
 
-[node name="LeftHandInfo" parent="Table" instance=ExtResource("5_wlhtu")]
+[node name="LeftHandInfo" parent="Table" node_paths=PackedStringArray("fallback_mesh") instance=ExtResource("5_wlhtu")]
 transform = Transform3D(0.939693, -0.085635, 0.331126, 0, 0.968147, 0.25038, -0.34202, -0.23528, 0.909761, -0.713026, 0.8718, -0.309953)
+fallback_mesh = NodePath("../../XROrigin3D/LeftHandController/FullbackMesh")
 
-[node name="RightHandInfo" parent="Table" instance=ExtResource("5_wlhtu")]
+[node name="RightHandInfo" parent="Table" node_paths=PackedStringArray("fallback_mesh") instance=ExtResource("5_wlhtu")]
 transform = Transform3D(0.939693, 0.085635, -0.331126, 0, 0.968147, 0.25038, 0.34202, -0.23528, 0.909761, 0.278022, 0.8718, -0.381943)
 hand = 1
+fallback_mesh = NodePath("../../XROrigin3D/RightHandController/FullbackMesh")
 
 [node name="XROrigin3D" type="XROrigin3D" parent="."]
 
@@ -95,6 +101,9 @@ pose = &"palm_pose"
 show_when_tracked = true
 script = ExtResource("6_e5cto")
 
+[node name="FullbackMesh" type="MeshInstance3D" parent="XROrigin3D/LeftHandController"]
+mesh = SubResource("SphereMesh_d5x0p")
+
 [node name="PickupHandler" parent="XROrigin3D/LeftHandController" instance=ExtResource("3_sg1io")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.05, 0, 0)
 pickup_action = "pickup"
@@ -106,6 +115,10 @@ pose = &"palm_pose"
 show_when_tracked = true
 script = ExtResource("6_e5cto")
 
+[node name="FullbackMesh" type="MeshInstance3D" parent="XROrigin3D/RightHandController"]
+mesh = SubResource("SphereMesh_d5x0p")
+skeleton = NodePath("../../LeftHandController")
+
 [node name="PickupHandler" parent="XROrigin3D/RightHandController" instance=ExtResource("3_sg1io")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.05, 0, 0)
 pickup_action = "pickup"