Fix hand tracking mesh skeleton setup

m4gr3d · Mar 12, 2024 · 4183003 · 4183003
1 parent 067e700
commit 4183003
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/common/src/main/cpp/classes/openxr_fb_hand_tracking_mesh.cpp b/common/src/main/cpp/classes/openxr_fb_hand_tracking_mesh.cpp
@@ -37,18 +37,20 @@
 using namespace godot;
 
 void OpenXRFbHandTrackingMesh::setup_hand_mesh(Hand p_hand) {
+	if (p_hand != hand) {
+		return;
+	}
+
 	ERR_FAIL_COND_MSG(skeleton != nullptr, "OpenXRFbHandTrackingMesh skeleton has already been set up");
 
-	if (p_hand == hand) {
-		skeleton = memnew(Skeleton3D);
-		OpenXRFbHandTrackingMeshExtensionWrapper::get_singleton()->construct_skeleton(p_hand, skeleton);
-		add_child(skeleton);
+	skeleton = memnew(Skeleton3D);
+	OpenXRFbHandTrackingMeshExtensionWrapper::get_singleton()->construct_skeleton(p_hand, skeleton);
+	add_child(skeleton);
 
-		mesh_instance = memnew(MeshInstance3D);
-		mesh_instance->set_mesh(OpenXRFbHandTrackingMeshExtensionWrapper::get_singleton()->get_mesh(p_hand));
-		mesh_instance->set_material_override(material);
-		skeleton->add_child(mesh_instance);
-	}
+	mesh_instance = memnew(MeshInstance3D);
+	mesh_instance->set_mesh(OpenXRFbHandTrackingMeshExtensionWrapper::get_singleton()->get_mesh(p_hand));
+	mesh_instance->set_material_override(material);
+	skeleton->add_child(mesh_instance);
 
 	XRHandModifier3D *parent = Object::cast_to<XRHandModifier3D>(get_parent());
 	if (parent) {