Remove deadzone in pinch.

V-Sekai · Nov 14, 2024 · 272bc13 · 272bc13
1 parent 5a70c01
commit 272bc13
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/addons/procedural_3d_grid/core/xr_pinch.gd b/addons/procedural_3d_grid/core/xr_pinch.gd
@@ -193,13 +193,19 @@ func set_pivot_and_transform(hand_grab: float, prev_hand_transform: Transform3D,
 func set_pinch_pivot_and_transform(prev_hand_left_origin: Vector3, prev_hand_right_origin: Vector3, hand_left_origin: Vector3, hand_right_origin: Vector3) -> void:
 	var prev_distance = prev_hand_left_origin.distance_to(prev_hand_right_origin)
 	var current_distance = hand_left_origin.distance_to(hand_right_origin)
-	var distance_change = current_distance - prev_distance
-	var deadzone_threshold: float = 0.01
-	if abs(distance_change) > deadzone_threshold:
+
+	if current_distance > prev_distance:
+		# Zoom out
+		from_pivot = (prev_hand_left_origin + prev_hand_right_origin) / 2.0
+		to_pivot = (hand_left_origin + hand_right_origin) / 2.0
+		delta_transform = _world_grab.get_pinch_transform(prev_hand_left_origin, prev_hand_right_origin, hand_left_origin, hand_right_origin)
+	elif current_distance < prev_distance:
+		# Zoom in
 		from_pivot = (prev_hand_left_origin + prev_hand_right_origin) / 2.0
 		to_pivot = (hand_left_origin + hand_right_origin) / 2.0
 		delta_transform = _world_grab.get_pinch_transform(prev_hand_left_origin, prev_hand_right_origin, hand_left_origin, hand_right_origin)
 	else:
+		# No zoom
 		delta_transform = Transform3D()
 
 func set_orbit_pivot_and_transform(prev_hand_left_origin: Vector3, prev_hand_right_origin: Vector3, hand_left_origin: Vector3, hand_right_origin: Vector3) -> void: