From 3b1139923b21ba236c7383e2e4fd9ea20dc6053d Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Wed, 20 Dec 2023 21:59:24 -0500 Subject: [PATCH] Fix world-grab movement Fix world-grab movement to work with two-handed pickup changes. Fix world-grab default area collision settings. Update versions.md to include recent fixes. --- VERSIONS.md | 8 ++++++++ addons/godot-xr-tools/objects/world_grab_area.gd | 2 +- addons/godot-xr-tools/objects/world_grab_area.tscn | 2 ++ scenes/world_grab_demo/world_grab_demo.tscn | 2 -- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/VERSIONS.md b/VERSIONS.md index 6cf6d6fd..104eeca3 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -1,3 +1,11 @@ +# 4.3.1 +- Fix saving project when using plugin-tools to set physics layers or enable OpenXR +- Fix updating the editor-preview hand-pose +- Fix jumping on slopes +- Fix material warnings by converting binary .material files to .tres files +- Fix staging to use threaded loading while starting the fade +- Fix broken world-grab script + # 4.3.0 - Upgraded project to Godot 4.1 as the new minimum version. - Added reporting of stage load errors. diff --git a/addons/godot-xr-tools/objects/world_grab_area.gd b/addons/godot-xr-tools/objects/world_grab_area.gd index f3180e7b..4a68aeb9 100644 --- a/addons/godot-xr-tools/objects/world_grab_area.gd +++ b/addons/godot-xr-tools/objects/world_grab_area.gd @@ -40,7 +40,7 @@ func request_highlight(_from, _on) -> void: pass # Called by XRToolsFunctionPickup when this is picked up by a controller -func pick_up(by: Node3D, _with_controller: XRController3D) -> void: +func pick_up(by: Node3D) -> void: # Get the ID to save the grab handle under var id = by.get_instance_id() diff --git a/addons/godot-xr-tools/objects/world_grab_area.tscn b/addons/godot-xr-tools/objects/world_grab_area.tscn index 925abaae..341346f5 100644 --- a/addons/godot-xr-tools/objects/world_grab_area.tscn +++ b/addons/godot-xr-tools/objects/world_grab_area.tscn @@ -3,4 +3,6 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/objects/world_grab_area.gd" id="1_uxhq5"] [node name="WorldGrabArea" type="Area3D"] +collision_layer = 262144 +collision_mask = 524288 script = ExtResource("1_uxhq5") diff --git a/scenes/world_grab_demo/world_grab_demo.tscn b/scenes/world_grab_demo/world_grab_demo.tscn index 541b6906..fd62dfe8 100644 --- a/scenes/world_grab_demo/world_grab_demo.tscn +++ b/scenes/world_grab_demo/world_grab_demo.tscn @@ -183,8 +183,6 @@ body_forward_mix = 0.0 [node name="WorldGrabAreaZeroG" parent="." index="2" instance=ExtResource("8_ochso")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0) -collision_layer = 262144 -collision_mask = 524288 gravity_space_override = 3 gravity = 0.0 linear_damp = 1.0