From b40f670198758b2db898ea85117494a288f5be14 Mon Sep 17 00:00:00 2001 From: Malcolm Nixon Date: Thu, 29 Feb 2024 19:36:27 -0500 Subject: [PATCH] Updated to Godot-XR-Tools 4.3.1 (#37) --- addons/godot-xr-tools/VERSIONS.md | 8 +++ .../godot-xr-tools/audio/surface_audio.tscn | 6 +- addons/godot-xr-tools/effects/vignette.tscn | 3 +- .../hands/materials/african_hands.material | Bin 1072 -> 0 bytes .../hands/materials/african_hands.tres | 8 +++ .../african_hands_realistic.material | Bin 1125 -> 0 bytes .../materials/african_hands_realistic.tres | 12 ++++ .../hands/materials/caucasian_hand.material | Bin 1068 -> 0 bytes .../hands/materials/caucasian_hand.tres | 8 +++ .../caucasian_hands_realistic.material | Bin 1113 -> 0 bytes .../materials/caucasian_hands_realistic.tres | 12 ++++ .../hands/materials/cleaning_glove.material | Bin 1121 -> 0 bytes .../hands/materials/cleaning_glove.tres | 14 ++++ .../glove_african_dark_camo.material | Bin 1121 -> 0 bytes .../materials/glove_african_dark_camo.tres | 14 ++++ .../glove_african_green_camo.material | Bin 1127 -> 0 bytes .../materials/glove_african_green_camo.tres | 14 ++++ .../glove_caucasian_dark_camo.material | Bin 1127 -> 0 bytes .../materials/glove_caucasian_dark_camo.tres | 14 ++++ .../glove_caucasian_green_camo.material | Bin 1123 -> 0 bytes .../materials/glove_caucasian_green_camo.tres | 14 ++++ .../hands/materials/labglove.material | Bin 1116 -> 0 bytes .../hands/materials/labglove.tres | 14 ++++ .../hands/model/Hand_Glove_L.gltf.import | 2 - .../hands/model/Hand_Glove_R.gltf.import | 2 - .../hands/model/Hand_Glove_low_L.gltf.import | 2 - .../hands/model/Hand_Glove_low_R.gltf.import | 2 - .../hands/model/Hand_Nails_L.gltf.import | 2 - .../hands/model/Hand_Nails_R.gltf.import | 2 - .../hands/model/Hand_Nails_low_L.gltf.import | 2 - .../hands/model/Hand_Nails_low_R.gltf.import | 2 - .../hands/model/Hand_low_L.gltf.import | 2 - .../hands/model/Hand_low_R.gltf.import | 2 - .../hands/model/hand_l.gltf.import | 2 - .../hands/model/hand_r.gltf.import | 2 - .../hands/poses/hand_pose_settings.gd | 17 ++++- .../scenes/highpoly/left_fullglove_hand.tscn | 4 +- .../highpoly/left_fullglove_physics_hand.tscn | 4 +- .../hands/scenes/highpoly/left_hand.tscn | 4 +- .../scenes/highpoly/left_physics_hand.tscn | 4 +- .../highpoly/left_physics_tac_glove.tscn | 4 +- .../hands/scenes/highpoly/left_tac_glove.tscn | 4 +- .../scenes/highpoly/right_fullglove_hand.tscn | 4 +- .../right_fullglove_physics_hand.tscn | 4 +- .../hands/scenes/highpoly/right_hand.tscn | 4 +- .../scenes/highpoly/right_physics_hand.tscn | 4 +- .../highpoly/right_physics_tac_glove.tscn | 4 +- .../scenes/highpoly/right_tac_glove.tscn | 4 +- .../scenes/lowpoly/left_fullglove_low.tscn | 4 +- .../hands/scenes/lowpoly/left_hand_low.tscn | 4 +- .../lowpoly/left_physics_fullglove_low.tscn | 4 +- .../scenes/lowpoly/left_physics_hand_low.tscn | 4 +- .../lowpoly/left_physics_tac_glove_low.tscn | 4 +- .../scenes/lowpoly/left_tac_glove_low.tscn | 4 +- .../scenes/lowpoly/right_fullglove_low.tscn | 4 +- .../hands/scenes/lowpoly/right_hand_low.tscn | 4 +- .../lowpoly/right_physics_fullglove_low.tscn | 4 +- .../lowpoly/right_physics_hand_low.tscn | 4 +- .../lowpoly/right_physics_tac_glove_low.tscn | 4 +- .../scenes/lowpoly/right_tac_glove_low.tscn | 4 +- .../interactables/interactable_hinge.tscn | 6 +- .../interactables/interactable_joystick.tscn | 6 +- addons/godot-xr-tools/misc/hold_button.tscn | 2 +- .../misc/vr_common_shader_cache.tscn | 4 +- .../objects/grab_points/grab_point_hand.gd | 10 ++- .../godot-xr-tools/objects/world_grab_area.gd | 2 +- .../objects/world_grab_area.tscn | 2 + addons/godot-xr-tools/player/player_body.gd | 4 +- addons/godot-xr-tools/plugin.cfg | 2 +- addons/godot-xr-tools/plugin.gd | 2 + addons/godot-xr-tools/staging/staging.gd | 65 +++++++++--------- addons/godot-xr-tools/staging/staging.tscn | 2 +- addons/godot-xr-tools/xr/start_xr.tscn | 1 - 73 files changed, 257 insertions(+), 129 deletions(-) delete mode 100644 addons/godot-xr-tools/hands/materials/african_hands.material create mode 100644 addons/godot-xr-tools/hands/materials/african_hands.tres delete mode 100644 addons/godot-xr-tools/hands/materials/african_hands_realistic.material create mode 100644 addons/godot-xr-tools/hands/materials/african_hands_realistic.tres delete mode 100644 addons/godot-xr-tools/hands/materials/caucasian_hand.material create mode 100644 addons/godot-xr-tools/hands/materials/caucasian_hand.tres delete mode 100644 addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.material create mode 100644 addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.tres delete mode 100644 addons/godot-xr-tools/hands/materials/cleaning_glove.material create mode 100644 addons/godot-xr-tools/hands/materials/cleaning_glove.tres delete mode 100644 addons/godot-xr-tools/hands/materials/glove_african_dark_camo.material create mode 100644 addons/godot-xr-tools/hands/materials/glove_african_dark_camo.tres delete mode 100644 addons/godot-xr-tools/hands/materials/glove_african_green_camo.material create mode 100644 addons/godot-xr-tools/hands/materials/glove_african_green_camo.tres delete mode 100644 addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material create mode 100644 addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres delete mode 100644 addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material create mode 100644 addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres delete mode 100644 addons/godot-xr-tools/hands/materials/labglove.material create mode 100644 addons/godot-xr-tools/hands/materials/labglove.tres diff --git a/addons/godot-xr-tools/VERSIONS.md b/addons/godot-xr-tools/VERSIONS.md index 6cf6d6f..104eeca 100644 --- a/addons/godot-xr-tools/VERSIONS.md +++ b/addons/godot-xr-tools/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/audio/surface_audio.tscn b/addons/godot-xr-tools/audio/surface_audio.tscn index 6499771..81fdcb9 100644 --- a/addons/godot-xr-tools/audio/surface_audio.tscn +++ b/addons/godot-xr-tools/audio/surface_audio.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://b2jqxp1f47qnu"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://addons/godot-xr-tools/audio/surface_audio.gd" id="1"] +[ext_resource path="res://addons/godot-xr-tools/audio/surface_audio.gd" type="Script" id=1] [node name="SurfaceAudio" type="Node"] -script = ExtResource("1") +script = ExtResource( 1 ) diff --git a/addons/godot-xr-tools/effects/vignette.tscn b/addons/godot-xr-tools/effects/vignette.tscn index 304a637..3ac97d3 100644 --- a/addons/godot-xr-tools/effects/vignette.tscn +++ b/addons/godot-xr-tools/effects/vignette.tscn @@ -6,11 +6,10 @@ [sub_resource type="ArrayMesh" id="ArrayMesh_yyajy"] _surfaces = [{ "aabb": AABB(-2, -2, 0, 4, 4, 1e-05), -"format": 34359742465, +"format": 4097, "index_count": 192, "index_data": PackedByteArray(32, 0, 33, 0, 1, 0, 32, 0, 1, 0, 0, 0, 33, 0, 34, 0, 2, 0, 33, 0, 2, 0, 1, 0, 34, 0, 35, 0, 3, 0, 34, 0, 3, 0, 2, 0, 35, 0, 36, 0, 4, 0, 35, 0, 4, 0, 3, 0, 36, 0, 37, 0, 5, 0, 36, 0, 5, 0, 4, 0, 37, 0, 38, 0, 6, 0, 37, 0, 6, 0, 5, 0, 38, 0, 39, 0, 7, 0, 38, 0, 7, 0, 6, 0, 39, 0, 40, 0, 8, 0, 39, 0, 8, 0, 7, 0, 40, 0, 41, 0, 9, 0, 40, 0, 9, 0, 8, 0, 41, 0, 42, 0, 10, 0, 41, 0, 10, 0, 9, 0, 42, 0, 43, 0, 11, 0, 42, 0, 11, 0, 10, 0, 43, 0, 44, 0, 12, 0, 43, 0, 12, 0, 11, 0, 44, 0, 45, 0, 13, 0, 44, 0, 13, 0, 12, 0, 45, 0, 46, 0, 14, 0, 45, 0, 14, 0, 13, 0, 46, 0, 47, 0, 15, 0, 46, 0, 15, 0, 14, 0, 47, 0, 48, 0, 16, 0, 47, 0, 16, 0, 15, 0, 48, 0, 49, 0, 17, 0, 48, 0, 17, 0, 16, 0, 49, 0, 50, 0, 18, 0, 49, 0, 18, 0, 17, 0, 50, 0, 51, 0, 19, 0, 50, 0, 19, 0, 18, 0, 51, 0, 52, 0, 20, 0, 51, 0, 20, 0, 19, 0, 52, 0, 53, 0, 21, 0, 52, 0, 21, 0, 20, 0, 53, 0, 54, 0, 22, 0, 53, 0, 22, 0, 21, 0, 54, 0, 55, 0, 23, 0, 54, 0, 23, 0, 22, 0, 55, 0, 56, 0, 24, 0, 55, 0, 24, 0, 23, 0, 56, 0, 57, 0, 25, 0, 56, 0, 25, 0, 24, 0, 57, 0, 58, 0, 26, 0, 57, 0, 26, 0, 25, 0, 58, 0, 59, 0, 27, 0, 58, 0, 27, 0, 26, 0, 59, 0, 60, 0, 28, 0, 59, 0, 28, 0, 27, 0, 60, 0, 61, 0, 29, 0, 60, 0, 29, 0, 28, 0, 61, 0, 62, 0, 30, 0, 61, 0, 30, 0, 29, 0, 62, 0, 63, 0, 31, 0, 62, 0, 31, 0, 30, 0, 63, 0, 32, 0, 0, 0, 63, 0, 0, 0, 31, 0), "primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), "vertex_count": 64, "vertex_data": PackedByteArray(0, 0, 128, 63, 0, 0, 0, 0, 0, 0, 0, 0, 190, 20, 123, 63, 194, 197, 71, 190, 0, 0, 0, 0, 94, 131, 108, 63, 22, 239, 195, 190, 0, 0, 0, 0, 49, 219, 84, 63, 218, 57, 14, 191, 0, 0, 0, 0, 243, 4, 53, 63, 243, 4, 53, 191, 0, 0, 0, 0, 218, 57, 14, 63, 49, 219, 84, 191, 0, 0, 0, 0, 21, 239, 195, 62, 94, 131, 108, 191, 0, 0, 0, 0, 196, 197, 71, 62, 190, 20, 123, 191, 0, 0, 0, 0, 46, 189, 59, 179, 0, 0, 128, 191, 0, 0, 0, 0, 194, 197, 71, 190, 190, 20, 123, 191, 0, 0, 0, 0, 20, 239, 195, 190, 95, 131, 108, 191, 0, 0, 0, 0, 217, 57, 14, 191, 50, 219, 84, 191, 0, 0, 0, 0, 243, 4, 53, 191, 243, 4, 53, 191, 0, 0, 0, 0, 50, 219, 84, 191, 217, 57, 14, 191, 0, 0, 0, 0, 94, 131, 108, 191, 23, 239, 195, 190, 0, 0, 0, 0, 191, 20, 123, 191, 193, 197, 71, 190, 0, 0, 0, 0, 0, 0, 128, 191, 46, 189, 187, 51, 0, 0, 0, 0, 191, 20, 123, 191, 189, 197, 71, 62, 0, 0, 0, 0, 94, 131, 108, 191, 21, 239, 195, 62, 0, 0, 0, 0, 48, 219, 84, 191, 219, 57, 14, 63, 0, 0, 0, 0, 244, 4, 53, 191, 242, 4, 53, 63, 0, 0, 0, 0, 221, 57, 14, 191, 47, 219, 84, 63, 0, 0, 0, 0, 26, 239, 195, 190, 94, 131, 108, 63, 0, 0, 0, 0, 198, 197, 71, 190, 190, 20, 123, 63, 0, 0, 0, 0, 46, 222, 76, 50, 0, 0, 128, 63, 0, 0, 0, 0, 200, 197, 71, 62, 190, 20, 123, 63, 0, 0, 0, 0, 27, 239, 195, 62, 93, 131, 108, 63, 0, 0, 0, 0, 215, 57, 14, 63, 51, 219, 84, 63, 0, 0, 0, 0, 242, 4, 53, 63, 245, 4, 53, 63, 0, 0, 0, 0, 49, 219, 84, 63, 219, 57, 14, 63, 0, 0, 0, 0, 95, 131, 108, 63, 21, 239, 195, 62, 0, 0, 0, 0, 191, 20, 123, 63, 188, 197, 71, 62, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 0, 190, 20, 251, 63, 194, 197, 199, 190, 0, 0, 0, 0, 94, 131, 236, 63, 22, 239, 67, 191, 0, 0, 0, 0, 49, 219, 212, 63, 218, 57, 142, 191, 0, 0, 0, 0, 243, 4, 181, 63, 243, 4, 181, 191, 0, 0, 0, 0, 218, 57, 142, 63, 49, 219, 212, 191, 0, 0, 0, 0, 21, 239, 67, 63, 94, 131, 236, 191, 0, 0, 0, 0, 196, 197, 199, 62, 190, 20, 251, 191, 0, 0, 0, 0, 46, 189, 187, 179, 0, 0, 0, 192, 0, 0, 0, 0, 194, 197, 199, 190, 190, 20, 251, 191, 0, 0, 0, 0, 20, 239, 67, 191, 95, 131, 236, 191, 0, 0, 0, 0, 217, 57, 142, 191, 50, 219, 212, 191, 0, 0, 0, 0, 243, 4, 181, 191, 243, 4, 181, 191, 0, 0, 0, 0, 50, 219, 212, 191, 217, 57, 142, 191, 0, 0, 0, 0, 94, 131, 236, 191, 23, 239, 67, 191, 0, 0, 0, 0, 191, 20, 251, 191, 193, 197, 199, 190, 0, 0, 0, 0, 0, 0, 0, 192, 46, 189, 59, 52, 0, 0, 0, 0, 191, 20, 251, 191, 189, 197, 199, 62, 0, 0, 0, 0, 94, 131, 236, 191, 21, 239, 67, 63, 0, 0, 0, 0, 48, 219, 212, 191, 219, 57, 142, 63, 0, 0, 0, 0, 244, 4, 181, 191, 242, 4, 181, 63, 0, 0, 0, 0, 221, 57, 142, 191, 47, 219, 212, 63, 0, 0, 0, 0, 26, 239, 67, 191, 94, 131, 236, 63, 0, 0, 0, 0, 198, 197, 199, 190, 190, 20, 251, 63, 0, 0, 0, 0, 46, 222, 204, 50, 0, 0, 0, 64, 0, 0, 0, 0, 200, 197, 199, 62, 190, 20, 251, 63, 0, 0, 0, 0, 27, 239, 67, 63, 93, 131, 236, 63, 0, 0, 0, 0, 215, 57, 142, 63, 51, 219, 212, 63, 0, 0, 0, 0, 242, 4, 181, 63, 245, 4, 181, 63, 0, 0, 0, 0, 49, 219, 212, 63, 219, 57, 142, 63, 0, 0, 0, 0, 95, 131, 236, 63, 21, 239, 67, 63, 0, 0, 0, 0, 191, 20, 251, 63, 188, 197, 199, 62, 0, 0, 0, 0) }] diff --git a/addons/godot-xr-tools/hands/materials/african_hands.material b/addons/godot-xr-tools/hands/materials/african_hands.material deleted file mode 100644 index e132a8f9927be8ecd626d5da45a15df232111d77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1072 zcmV-01kd|YQ$s@n000005C8ys3IG5Y1ONaiwJ-f(dkJ+Q0Ol}_H(*cF0Wc9T1Yv~? z;{loy#Di=?c1m6*DK(S!mPyKqAG-d5CETYTX8~}T#m9wEs~@DOxe!VLdjNO_lUvI!%uF5zE93X=;aE8xcJaaiItpEh4yJ;T(u4 z07GzKxvifgMu3z+#05A2F;7)_ylmPaVh86ZT`Li9@XJPFwh&Yv_p`5S;I6J=9Bz$I zPMylqyZyG^wpk`uz_K+v$;3g9n?GA0qYi9c_V$_6P=#qdfXXRyyzbi+5jk2jA|}A4 zydej?&;-|JB#x4HKuek_=6pjS$b4VDnWm zbuOFq!SN}3X={X}T;7=%3z}U1Z@b_&#G7ZF_Pd1E|J9B!j_>kL8JCaVvK0ZJWGp)$ z3LrpEfM^3mj}EAzRWV)_DC#2KNFXAB6!EC&pb$ewTE_Bq1c<{@Vr0U=f(h-#j1?G= zaZdvX^<0q4w7oLo5mzpoh%@HT&`*YE#Z1HJi0QKr`6`tQResw(+|Su6OZ%M;-Yq{(v5u4mfY_*Utx?EK%}831lo|s-0z#Oo zT0IiLgExH))<1>CptT5vn_?`iAuMmocv)WuT>Rst0O9}boK+p0JE&$`*KNt-&j zcNmLI6u_q}4@)>=!~IH2)=0O+97ZZ!{@EYe9i8Rb^aB?W4@NX@;NB7!#hcd%*bl=Tc8yW9Z{P0ckWK-A0DJ&} z0Eu#UB=?s`H$6*jAWXRpI)uiJR5nkK97or~bm7I{^Aj@+_DYv;xppI!i=nhwZgY1D zE=93yY|gO%?m*5RTl!40yZgA5*JkaOIu{GMgpegm<%vHnD&CZ;BlhgOlW=#=AyAQ{ z#ETm|Zrq)K8{uJ5J0DM+FiCND3vR$&m%&|ZY^h}~2@RpV+?@#Ht8^Sp9KsDD46lcx2U>tDfmY+K~35a*#!+nORVx#JKsfvvCr+PTi)z5tLG%P6W4D zCdTTnP~KewsQK;`oU8DcxAJg98>eMN}2o)jSikEx0Iot zR%XvQ`2=K1R_jUm}G^L8Fv9j?h4d64xMY+xqwMlamdBp0f_MdMvERA z4xk8uBr-HaEa1?gbQeEQm_(}-Clx75Z0v{tGE#C6YaB$RW0RD=>tc3dsI(odc*PgP zOU0M@H*{vh^WvxCjMu_S1%#)G8)0GbO?=YDSuJ%1V|o#~7x18Jr;g z&@$&ENw!1Bgr|h1f-3z%v56#=If){$3Cz5CfK?*5NilysbTUoqvVYK!H*LyX>PsIBr_#|zwR+PB9S==m4_3kge9H8d0raMuQvwtTs_;fvo-fHvJ->K z2#pUtSBATyj2ongCBqtk9~%}9sFsPn!PMWNch*0{c9$|C#B(!bnbMF%#6Kvj#IuoX zBYXjbViG8P;1O47LWBzqz74lxKP@c)+(>6w$6YK3sS@M{RNv6chXKvrzslN5jZ~h( zz1dhjA`w1*@c4ic+it)#tEQ#}@^HI?lAo7D-I+*^lc!zXF;x(GRp=3M72$4`B)w~A z1(y4PoBJKyM;8vJ1-QZJGqBhV6T^MHO$iK2DMSH5*M+bpPKtYYR>b4!qL-RT8GjYR r+#V`g#=-@~Dy@0$@)H=LjT_fm^&h%xNq?N8C^v=x2Z6H#Qd2`ied!B* diff --git a/addons/godot-xr-tools/hands/materials/african_hands_realistic.tres b/addons/godot-xr-tools/hands/materials/african_hands_realistic.tres new file mode 100644 index 0000000..edb492c --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/african_hands_realistic.tres @@ -0,0 +1,12 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://26qy0lwlws4a"] + +[ext_resource type="Texture2D" uid="uid://dk8o82rjww802" path="res://addons/godot-xr-tools/hands/textures/african_realistic_baseColor.png" id="1_seyus"] +[ext_resource type="Texture2D" uid="uid://b6tgv6ucbgv3r" path="res://addons/godot-xr-tools/hands/textures/hands_normal.png" id="2_s3yd2"] +[ext_resource type="Texture2D" uid="uid://h3sjbnu6uplb" path="res://addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png" id="3_p3lxw"] + +[resource] +albedo_texture = ExtResource("1_seyus") +orm_texture = ExtResource("3_p3lxw") +normal_enabled = true +normal_scale = 0.25 +normal_texture = ExtResource("2_s3yd2") diff --git a/addons/godot-xr-tools/hands/materials/caucasian_hand.material b/addons/godot-xr-tools/hands/materials/caucasian_hand.material deleted file mode 100644 index a0cfb2e337a2269a2409ac447650ece8cacbcfe2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1068 zcmV+{1k?LcQ$s@n000005C8yv3IG5U1ONaiwJ-f(ehF0|0G4ozHDFKD0dRCB!^mI| z1fjzb53&i_DS4UXj_9=aPEt<%(DnFZJt@rN5doK3KGC2lu2Ii4QKxzUcmR6<_fDgm zo~14irrZVnLE}Oyo2NqzqpM-M(DC>D#EgQylJhOsE~IktlNQTe?k?jhie+PShW&Sk z;M}pLkCNRT##LUMwOi_3OylxFmMoPg{up8v+pj#-7&XboM541g^3b(C*VA6 zSk%r(508%!cbDJ>+y%KJGG9?ZgdD+!PVPgtY zc;!S>Wn;GN{8c6ri9{k8Ynv&p(ec#CaGUmjI>WGr3DjA^O%q5%;`kg;{9K!ip`$n! zyuxO(F(e9?cjm=HDu)01Twp43=Np#&E}`?EX~-AIb$ONz!%t0@fp8J-Vq;4!105eD zK9WI)%h0)&nF^F-5PtyRhbYAcg%&Q9?&7D%2ee9Y5+Rw;0tE;bncy1MGIXTlk{GI^ zf>1#m;)|gJ@nwDt9btH0+(4Z1S_pw~@a#Ab5fXO+?whtM5Mg4 zgN_-dYDSuJYNa(JC??HQ3eMxMrT-gI8oZ)7ie%1^pKQ$0@SZRNGB*iHvPX)rO(E)?fMH4 zDoMcau|!9Hnf%&Ck5`5!o2@s+1qpYnBGz1AG=qRF#Zn~k)V;?Lc+vOlg9ijC25+je$RQ$s^bwfsT= diff --git a/addons/godot-xr-tools/hands/materials/caucasian_hand.tres b/addons/godot-xr-tools/hands/materials/caucasian_hand.tres new file mode 100644 index 0000000..83ec6ab --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/caucasian_hand.tres @@ -0,0 +1,8 @@ +[gd_resource type="ORMMaterial3D" load_steps=3 format=3 uid="uid://dy6nhifvvmm73"] + +[ext_resource type="Texture2D" uid="uid://c506svon268ms" path="res://addons/godot-xr-tools/hands/textures/caucasian_baseColor.png" id="1_si4on"] +[ext_resource type="Texture2D" uid="uid://h3sjbnu6uplb" path="res://addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png" id="2_agvfk"] + +[resource] +albedo_texture = ExtResource("1_si4on") +orm_texture = ExtResource("2_agvfk") diff --git a/addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.material b/addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.material deleted file mode 100644 index 2f7b83a3ee6f803e6387d0d13959a54529c3a2c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1113 zcmV-f1g85^Q$s@n000005C8zv3IG5>1ONaiwJ-f((+RyH05-CcIY3p?0Yg!R<0((c z#!)N`2g6Z^8X;t-5|c^pEhMsclJW$8=^eXI8f{UC5k_v@%v9UVtY)TKn*x3Sd;ov| zdAYlhd&{Gno~1SrrrZWyLgPj%o2N&Pqw8V1(Bkj;i5UiaCCj&5yOGMpP+Bavxw`~+ zqF6RIXV`yt3(g%|`b@IB1G$seX6=?b7Yn(BkR?myi9anW-ju2%_UyZ(aCgqNi5ogt z4jeG^ z)m@>yI|oqn-6=R{Ig}u_#)}^t4yYi3 zDKa%gFzo1|bQeEKN}^SY6N?Z8c=)gpgF}ORSo3fq9h;=|T^F+xLv>UUDvDElF|<&8 znZHA4Iy^6aD9(5-q)Kn4@jkz~3baXt(?ZDzD3*R{||C$ErZxSOx$ zD*b@qsDY_b$PCd)Qjk>A7(fC-m@1m`62Nmg$AXR-#%e~Ia%yE71IHNNy)5mMln>;b z)RBcR4Gsmk6xtBa0=W!JG0=VuM~SxRWM;S38A9Ct>=p!AMG{^o2ZKY?sz!gFkjnQ^ zP15vrl7QOhNZuS00V%x9>_k!B3FQBF-~x-`!(T`eD^(=QLuZ3sb=C4(v_Q8*trudV z*Zb1Ou&TiYK3Ljh7_9=}a$sT8Uk=eNW7c}6L*+RUE(ohp3K?R{Fuk4jW$53WTnIck z!n|-scl!)S1YwS&LU96@v`Hy&o}Y^2>0JZ*v>xo~*+w2#xlCLcXXDe;3{%WIaQhb_ zikOD5XUGBq&Gp!!n8G%=oTyAqg?#GIsCeHu#);#a3ipAAymqN_?ENa)iK8mUaf z4z61`ecWt)Y1(jlqn+^t)de}|HiGqlS`L-_FQ+&9kE|K5Ip>^gdIvodslkUjk0=1Z zHu^0ssX=OqJX~H$m2dc1?c9^g>IqzYcm&bD+4icqoOWqS&U$OkM3(A-5-!ug3cFcw zE8qm8ug%gU0#5glWJ>-}=N`pnUEj>ck<@$4nSj49g_D}7GS&-j-xf`n>3`)#uWQ@5 f`!q=)abs8O$A`kT8b3}^lpA}XSHdj;Qd2`icq9k9 diff --git a/addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.tres b/addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.tres new file mode 100644 index 0000000..95a6b5d --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/caucasian_hands_realistic.tres @@ -0,0 +1,12 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://rwfrc1fdcjsj"] + +[ext_resource type="Texture2D" uid="uid://n1xq4cm67o07" path="res://addons/godot-xr-tools/hands/textures/caucasian_realistic_baseColor.png" id="1_c8nm1"] +[ext_resource type="Texture2D" uid="uid://b6tgv6ucbgv3r" path="res://addons/godot-xr-tools/hands/textures/hands_normal.png" id="2_ax2k6"] +[ext_resource type="Texture2D" uid="uid://h3sjbnu6uplb" path="res://addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png" id="3_6wg12"] + +[resource] +albedo_texture = ExtResource("1_c8nm1") +orm_texture = ExtResource("3_6wg12") +normal_enabled = true +normal_scale = 0.25 +normal_texture = ExtResource("2_ax2k6") diff --git a/addons/godot-xr-tools/hands/materials/cleaning_glove.material b/addons/godot-xr-tools/hands/materials/cleaning_glove.material deleted file mode 100644 index 798d37d62ee6b1e30323c7907a2c47d72085f473..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1121 zcmV-n1fKg+Q$s@n000005C8z?3IG5}1ONaiwJ-f(<_Y~F0JiaxIY3p?0Vl@i>wuJX zo+20-uLmSb6GF&NQ;vFN5}sSboG*Fl%ixRJ`{>CyA(vM^nE@%Q}1EQ7t$QkvyDwUA6&6(DC@zlt0oA!VD^Y8~u z)VaY;m`LQr5lW!=xi%TYiyCS03j4_pIZ^1mGdmelG5l9Z1Je_~yoF`ISLpnII&vp+ zb)Kb#;isniOgIg0CrnzHq=^`J8!%iT$&o`xfCqO5)`eh^h?7L2jJUfCcL$)os6ax6 zj~zNncpzySHgE*7pmY~MOH86widm!?J$O_e1LQ2MbvTiZPD%`~g;AX1i{XXh%lsT# z!{K?ch2o6YLJDPsXNp5naq&%C70_T}I+9HHBTfs$PMaES$#pG!(&iOX4R`a^T&3R# z;h6@2~W!G@b#2TaD z0w0<4mm?GI8l03}DQ+Q!2xQ5WB13zM8Ks7p6PDdfCrWY4$FxXR71+CS4nhtsmwHm3 z)FR|hWV3X2%j{TD-ihRaZQw$X;fmKvk|MxB*moaNSlcDmP2xo2S&;=* zpv>hO*cUe*cN&}~{}ogkV8tmsa{S~e_1vyFqicoP_>jzAIWzGSy0Co{QO0(m?OULU nGX-1$>UnJ(_nF2EpxIb!eSg$mi}mAlLfIG)3w#M7|6yNkQ3`+negJ>~ ztP)1Q)q;p5_>Z$Kz0+-=Oxl`s2%Rlb`dmF?Y?tG9<>T-AiQOf8rRSfn)*_{gp|qT~ z1`!cpMmg<#?y?^d6`*^*^cZ!B2!fg4=IxhSmkU9K(y3GBi9fYe+>)w}*i`}|GQ_|( z0MO_m(ugPkO@L^*t)D4Ul&C<&1^9s&j>}JP8;gLLY%M!qda6spOGqC?9N~PWjAh~w zehFQ;F$9^%{p{-+xT|}dh#TaSRi`%fZXeo)wp%J!&=P8P6ibvGH-EN1P9xa5?d`V+ zN*Sm104}G=@wzXhh$sRzBVqz%%c10eS)zd2(PQ)(VB@qW-v`J`o0iElHMfi5e%@A_ z+V6DmZu#kp^|TbT>|MlArVF=&hy$K#O@zm+Ez3qQ>#`uFJYRzOzmMEm+2_@KkT}_?KN0ErU%4XUi6_w39bCW@p%m0Nm zxUKl}j?;dh(E86h@+R_a-f1ODR+K1*5h!lp*ieB)48#Bp5DjFItruC+WFi6)D;|qeCpvaY1cs`I@36YD#f(*VgK|WiB-A__&PJczB@Wo(G0frAp^Y zF4Z>6q!w<@#3#O7J`-=u-=Q%bo)4ua9_qd zx{t;JR&xL3`e=VneZ--?<}pQVidVE?!k&$$Z2me8Nhw=+vPkdUc?8|`F!(98%8BDy zOsqYVzG}WT)g(<{BMFv0N0!Znc^6@W?M}_z$)w%w<3f{BirSH+QtB@1!_F`Hd3ohE z#sVIOvM5pIua`&@!Md{7O|T-8J6gqt`_zV^zgz^AjG5?JB2;oDBC>E$l%gQ^8K&bD zvkZBh>^TR^9;OEd-u1^h(wDjWlI%o7ij{L@ctR4crk@Q6=E|@~S`+Fpfm5~028?|k z7A$)@$K9@oC4v~ho(>C$H27nOVk&J^IbO<{?=~4hTcmEp<8+^FvJ;{ zaG3^G*d1dUgA?$dx6-@Ptd7=orMQovY0&`D(v&*4E!4&0Mzo``$okyT@^dZrI)L)weV6)Zx{46_m?#?6nNjZ=f`)NT43L8;~G zL~x5`Vyx~8<=vS;&38v~&T=R{U?)|$?C3Z73@-DuCszo^D>IA9F*Pr%w8;-jzwyB{ z<(4tj)5?uH&mx8}v2Z_kN1$b@KxpL5u4WWAW?>dyxuU7EFY#oYn;P@~8X zl0`(ui5Wmh41vKTgbk&;_=%Ddtx}xab2}fVj*AQd+KnJP4y=1vKA#4`Iy43)Nn zDOY%(i(h;()LeX-e?xCJJTHDO&Uh`nTtIlDI1`u_-?Wv14JM{1$#g&Bd>D4x+-OU# zYoU``ULoCZH($*Sfa0i;twD%}W+W*{N{s!rzjv2<(jA+U!E2#_z z-@!}G*M?~qEf{1d+U5K$iA}7S2MYaE;HAebcH>P21xCv3OGdB3lp`WWnS9}0P!kP! zgQwV5u0URx3H0(3Le2M9O^Wxrl7Osp1l(LyuM-wn@6zM$ksRzEt`9Q!F&arQrA|b> z*ZFim|5#q@SitU37>Y#(dNZ^EtW0--f;FBjL%R-c4@~*}-6HSGSZF=-LX|@zq!1QF zNnD5_ZgHIA%aF0{+)gArW~K!AWxa}{m6;!`zn>^e2$Bt%XEEa3^c;YyRRMeCn*9#b zI3-lJZf5B5WEb^2Zp(_`%EQR_c34!b@fJH4re?#}S?|oeE0+l#&t=APrXjOnKYXd4 zXJc+!+z%1lBmnQRBfM)7gnK$4IJcG`mlnJ?&&W`hyBGkvBnTpa8lh_b0%#Tb6F2jk zq$x*R#h}zg%YHiWumKVio$*AdDyNn3aI}JyU*+`f%q9oP`(52wF;v;hdQMy?aHmQG zJ+`BP4gLVjbw40SH!dCwocj4KDk7J|bRTQ|WKR1KEWqtLzc$NBcZ-LL_~kD8zR8v8 tSN-E^qktJ#E?}#0?Ev>oVHT&^C~9rK)Lp0N2Yf<-F&bi>&JI#jLqis)2|)k= diff --git a/addons/godot-xr-tools/hands/materials/glove_african_green_camo.tres b/addons/godot-xr-tools/hands/materials/glove_african_green_camo.tres new file mode 100644 index 0000000..db87ba6 --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/glove_african_green_camo.tres @@ -0,0 +1,14 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://txs6yqlmnpi2"] + +[ext_resource type="Texture2D" uid="uid://bidphehpipwhg" path="res://addons/godot-xr-tools/hands/textures/glove_african_green_camo.png" id="1_cinrp"] +[ext_resource type="Texture2D" uid="uid://bw8rmigwt5pr4" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" id="2_64ndb"] +[ext_resource type="Texture2D" uid="uid://d2iocwfr47kqp" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png" id="3_lwjmv"] + +[resource] +albedo_texture = ExtResource("1_cinrp") +orm_texture = ExtResource("3_lwjmv") +normal_enabled = true +normal_scale = 0.25 +normal_texture = ExtResource("2_64ndb") +ao_light_affect = 0.05 +ao_on_uv2 = true diff --git a/addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material b/addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material deleted file mode 100644 index 41019dfdc5e28b89d2eb248c9fa096dafbd3662e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1127 zcmV-t1ep6$Q$s@n000005C8!E3IG641ONaiwJ-f({Ru5105&t0HXv8h0RXsx5C8!H z47r36@QgtSAv;Y)CMl7Z$lgiHQ=U4iJc7?HHAs;;biDGW?o*?`U?&BF0Dl0202=*P z3?iD~TcBm>ovza|DRa^#bh1e4bM@$Xc0q1eTKru>KPfIoXyokCwL)$m8YOgSr~#w|$qt0v1Hmm- zx^%AOay?a)Dk+8;L~)8QmlldM=Ks)|56_DsiaTB_DHIc~EKo%y#=mW4K$FR>iMnMU zu|h68G1cr#zH8-^Hot8HfZ(WMtx*UK(MVE|l+pn}0z#N0T0Ih=b2-O?jv2<(j5Otx zmC|ruzB{^)W5HJ9fAafiJx6{-Lwn{iMQ)0>Xaj{ktESxib%K&ojPYcW-g@UTy8W^7 z6K<6c$+PHKdoX>~d~3f+nqDIkEO(9!n+yIf!VcSg&A*e9cH4^!4MrJiM3P#mJ5gVB ze(9%6Bd>uL@Gz9UL?Qor379yn>u}u;RwTJcs~EV?ZCLxuM?lP&-JYdFC0`;U3kO9h z5@MfWI!^J+kk?6_Q!w^3y)y8wKhBZf%-tzTPP9^>oJEEwWZ>%hS%6@w%=Sn(fe#Zb zRjq8m*y~~4vfE+Y?L{m($N=u?uz*a1D|Q&Bl13HB%bfXc3lkzSrwhwG4KYCcgR<&m zHl`(R5F{{?uz`P#)U9>|xFqsC+^+nWv<-QyI7Cl~nXU&O4F&JLUWd!euTF{7 ztv!|-Vh>EXOoJ-!j$j&r6GWfdLJbNWEyu-_prHae3(vY_F?)(s*yqVFKBNm;YO-%w tFLB>IdOkz`^@w7v|8V2er@+LGsur5R#I=Jdz)=($XMupt)d5mdLqlIR7_|TZ diff --git a/addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres b/addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres new file mode 100644 index 0000000..4182be6 --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres @@ -0,0 +1,14 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://dogla70w8hvo8"] + +[ext_resource type="Texture2D" uid="uid://c7jutkax2fd1k" path="res://addons/godot-xr-tools/hands/textures/glove_caucasian_dark_camo.png" id="1_cyild"] +[ext_resource type="Texture2D" uid="uid://bw8rmigwt5pr4" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" id="2_2k7pb"] +[ext_resource type="Texture2D" uid="uid://d2iocwfr47kqp" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png" id="3_6vkcl"] + +[resource] +albedo_texture = ExtResource("1_cyild") +orm_texture = ExtResource("3_6vkcl") +normal_enabled = true +normal_scale = 0.25 +normal_texture = ExtResource("2_2k7pb") +ao_light_affect = 0.05 +ao_on_uv2 = true diff --git a/addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material b/addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material deleted file mode 100644 index 4b4146d896ed35885ae3a953c602df2df25d3bf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmV-p1f2U)Q$s@n000005C8x&3jhF11ONaiwJ-f(G71eM0G4u-HZWDv0YDX>1P=`k zMjc$Fu_lC&ohBiZ+?z;b?wub9yyM#hv~wLzvm}r8SIrV-*W9nDi=d(v0TgDCAf`Z z+1Q+6|J^M(cWmi3$?h)XHm}XvEp;v?atR?zmdX=jJhE!cRnPPxZAg1j`GQ5LnN=`RV%+@L**HD8PTi)z5tKGhCxTln z6JvE(DDTbz)O>de&RGs62<#*ammR$(zrk6a_T(Djc%@}AIi}`il{6WetMnToJX3B- zLp`n3sPimh2vdgpxjO4mnY1d1tn0NX779p$$w={PGXW zey`B^?{wsr$kp;JABLY=C`?|MWQP(gdidaQ!Gw*w03&w?avbF1?f?|PL1Vy+7&S1c z@Ekx|1cM+MlXpTtldRfH-fhWDX3 z#TUa1#h3X#w8q2p;)mjl*Fp+qgy)J&QGxMITN%(`VoH)s_an}SVW&-vw&c1NI%)F? zsfN4x27uzIfvrIZ4b4bWkd)E^KmtM-Bcgf|U}HJRf{q!+)Qrd|r=X0aG92H*OTE{I zkQXf)2)Ll!OoGkxv9PtKC{ZMk9Rk6y9>BJ#h}9|Bta^55Ou@O*ZlrB zi~&r!z)_Sm#z0ojEdf$fLqnTA4@v+4 diff --git a/addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres b/addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres new file mode 100644 index 0000000..500978a --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres @@ -0,0 +1,14 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://f2uhcqq8s2jx"] + +[ext_resource type="Texture2D" uid="uid://dgkfppran5j1f" path="res://addons/godot-xr-tools/hands/textures/glove_caucasian_green_camo.png" id="1_hy1aq"] +[ext_resource type="Texture2D" uid="uid://bw8rmigwt5pr4" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" id="2_iwp46"] +[ext_resource type="Texture2D" uid="uid://d2iocwfr47kqp" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png" id="3_gyrju"] + +[resource] +albedo_texture = ExtResource("1_hy1aq") +orm_texture = ExtResource("3_gyrju") +normal_enabled = true +normal_scale = 0.25 +normal_texture = ExtResource("2_iwp46") +ao_light_affect = 0.05 +ao_on_uv2 = true diff --git a/addons/godot-xr-tools/hands/materials/labglove.material b/addons/godot-xr-tools/hands/materials/labglove.material deleted file mode 100644 index 29dbbe8f44984044396955533e1fb3a2c8e19910..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1116 zcmV-i1f%;>Q$s@n000005C8z+3IG5^1ONaiwJ-f(;0e_s0QRwyI6zg>0mH#CG`8h7 zG!Wwqs{?RV2_a;sDaa)E77`&lNjag8UwugNVfYSW0UK<4GgGx@R$x?aZPm78-rRs=1`|c>*-E$i{$l$SJ z2aOzeC*V|wSk%tP7A;I%+}(m3a2Jb>Ew#)=p&^u)yK}(!DxU`vk8ndM!}}oEH120t z_P{;a#S(FgJhE!cRnPPxZAg1jxq?NgnN=`RV%+@L**H14PTi)z5tKHT&I7ktCdTTn zP~KewsQK;^+_M}?5co+JE<1WnK7(^C?a4L5@k(bgIi}`il{ERCm^X%&O5V{Ar-@ag)}fd@ylCS_IriS|ED8& zB3I{GS{Qz6y3d5u;07foFia9fjXMq)E}Zb;<41r8cLru0l&V3ALLqT?7w!%~lTo1r z3n4&$m;iC2Z{X-L#DdaY{A^(oty27A#0(oHIyS@zau(J;l%%7R62oh8a4Aml#qdJ$ zWquE>@$kIZLUG1xA%#N1GsUT>#Q3JI3TQAfB}u0H5vPS=r%jEvh@ja4f+Z zh~Lp3hjV`;9S$0dltn2GA;1EXc$1=`Jz9$rMaGF`@1PS!+~$cE%TmSPF2n)%q32Kg zh$o`*JyetQUbiHm?HqxdV=4rNmzkX?%AJS&+b%8yGJJU3BzdW_q8xSh=jxv!uk9Ad zJJdnpC0e~(+61d)FHpzQA*0c12bUQZd4CCrwu~9>nHnnD5}_=t6s0PN9f&D8EtVmP z-@DLwInul~$h-K2BN{V@U6GvtOC+QY0MECCBlN}r9as;0dTOH%Yj!47Mv5`uX`U(c zCb(@yNGz5i>>09vKyx{EG^UUZ7H315>8=73vN5L_tCPkqf&S{G(r06BTja_K91{BY zgCdn{n1t&#rx!QtFPk>5Zv@UbpmjkGx=pYipjJZVe$VNR=_6^z)tqwfHVuQOiPZMP zf=2{6vF(0OOKWgif*%elMg9#P%bf{wIX%6L504NnHo0Dd%WN;LlBnnJ>|qfN`Kip{AV0!#7T~Do=jqDnNadAK!wPz%2n%Q$s^pa|Xiz diff --git a/addons/godot-xr-tools/hands/materials/labglove.tres b/addons/godot-xr-tools/hands/materials/labglove.tres new file mode 100644 index 0000000..0457b68 --- /dev/null +++ b/addons/godot-xr-tools/hands/materials/labglove.tres @@ -0,0 +1,14 @@ +[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://ds2dpvbpht0ea"] + +[ext_resource type="Texture2D" uid="uid://d4gbpgjwjuovb" path="res://addons/godot-xr-tools/hands/textures/labglove_baseColor.png" id="1_iocxe"] +[ext_resource type="Texture2D" uid="uid://dt6k4nuvpo38o" path="res://addons/godot-xr-tools/hands/textures/glove_normal.png" id="2_4tkm6"] +[ext_resource type="Texture2D" uid="uid://yslwgnpbpeen" path="res://addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png" id="3_voiob"] + +[resource] +albedo_texture = ExtResource("1_iocxe") +orm_texture = ExtResource("3_voiob") +normal_enabled = true +normal_scale = 0.1 +normal_texture = ExtResource("2_4tkm6") +clearcoat_enabled = true +ao_light_affect = 1.0 diff --git a/addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import index ac26307..1314ffb 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import index 6bb5437..8c12245 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf.import index 1daeb3d..6fb44fe 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf.import index 61667fe..31c5355 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import index b845079..fb4f1ce 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import index b30506a..d198397 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Nails_low_L.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Nails_low_L.gltf.import index ddd426c..40d4e92 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Nails_low_L.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Nails_low_L.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf.import b/addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf.import index 561edee..53fea66 100644 --- a/addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import b/addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import index db27d98..44b7650 100644 --- a/addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import b/addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import index a35d186..dcf37b5 100644 --- a/addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import +++ b/addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/hand_l.gltf.import b/addons/godot-xr-tools/hands/model/hand_l.gltf.import index 90a575c..326d084 100644 --- a/addons/godot-xr-tools/hands/model/hand_l.gltf.import +++ b/addons/godot-xr-tools/hands/model/hand_l.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/model/hand_r.gltf.import b/addons/godot-xr-tools/hands/model/hand_r.gltf.import index 32df37f..1f91a8d 100644 --- a/addons/godot-xr-tools/hands/model/hand_r.gltf.import +++ b/addons/godot-xr-tools/hands/model/hand_r.gltf.import @@ -22,7 +22,6 @@ meshes/generate_lods=true meshes/create_shadow_meshes=true meshes/light_baking=1 meshes/lightmap_texel_size=0.2 -meshes/force_disable_compression=false skins/use_named_skins=true animation/import=true animation/fps=30 @@ -30,5 +29,4 @@ animation/trimming=false animation/remove_immutable_tracks=true import_script/path="" _subresources={} -gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/addons/godot-xr-tools/hands/poses/hand_pose_settings.gd b/addons/godot-xr-tools/hands/poses/hand_pose_settings.gd index 355a2a9..f3c170f 100644 --- a/addons/godot-xr-tools/hands/poses/hand_pose_settings.gd +++ b/addons/godot-xr-tools/hands/poses/hand_pose_settings.gd @@ -1,3 +1,4 @@ +@tool @icon("res://addons/godot-xr-tools/editor/icons/hand.svg") class_name XRToolsHandPoseSettings extends Resource @@ -10,7 +11,19 @@ extends Resource ## Hand-open pose -@export var open_pose : Animation +@export var open_pose : Animation : set = set_open_pose ## Hand-closed pose -@export var closed_pose : Animation +@export var closed_pose : Animation : set = set_closed_pose + + +# Called when the open pose is changed +func set_open_pose(p_open_pose : Animation) -> void: + open_pose = p_open_pose + emit_changed() + + +# Called when the closed pose is changed +func set_closed_pose(p_closed_pos : Animation) -> void: + closed_pose = p_closed_pos + emit_changed() diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_hand.tscn index bed1f5a..6d431b2 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_hand.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://dhaqth6q5yw4n" path="res://addons/godot-xr-tools/hands/model/hand_l.gltf" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_x4lr3"] -[ext_resource type="Material" uid="uid://ba02jnd2dswyn" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.material" id="4"] +[ext_resource type="Material" uid="uid://cdb40djkihelq" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.tres" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ej4yx"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_rtx6p") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_y01rx") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_physics_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_physics_hand.tscn index 9dbc3cb..e4da32d 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_physics_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_fullglove_physics_hand.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_0aa1r"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://bhiiya7ow6h8v" path="res://addons/godot-xr-tools/hands/materials/labglove.material" id="5"] +[ext_resource type="Material" uid="uid://ds2dpvbpht0ea" path="res://addons/godot-xr-tools/hands/materials/labglove.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="9"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2frkw"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_g5ps2") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_v8isy") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_hand.tscn index d82794f..0325ede 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_hand.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_k56uy"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="5"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="6"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_x12eo"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_cxcnq") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_yn70n") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_hand.tscn index 9cb3b9d..dba6341 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_hand.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_fye1l"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="5"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="9"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5nt68"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_40ncn") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_fjpy6") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_tac_glove.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_tac_glove.tscn index 05886c7..4a39db2 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_tac_glove.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_physics_tac_glove.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://the6y7swe6j0" path="res://addons/godot-xr-tools/hands/animations/left/AnimationPlayer.tscn" id="2"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_rnhp7"] -[ext_resource type="Material" uid="uid://dy4ya7w0k18ds" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material" id="4"] +[ext_resource type="Material" uid="uid://dogla70w8hvo8" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres" id="4"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="5"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="6"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_2ih7n") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_02eq5") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("6") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/left_tac_glove.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/left_tac_glove.tscn index 473f3ae..767e626 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/left_tac_glove.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/left_tac_glove.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_s33di"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="4"] -[ext_resource type="Material" uid="uid://b718ylp68nhtc" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material" id="5"] +[ext_resource type="Material" uid="uid://f2uhcqq8s2jx" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres" id="5"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qtjek"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_kjpaa") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_kisbg") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_hand.tscn index e6c1a10..8be1038 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_hand.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bxipj7hyjwy6f" path="res://addons/godot-xr-tools/hands/animations/right/AnimationPlayer.tscn" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_xmpie"] -[ext_resource type="Material" uid="uid://ba02jnd2dswyn" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.material" id="4"] +[ext_resource type="Material" uid="uid://cdb40djkihelq" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.tres" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_coci4"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_gm5ny") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_3o6s4") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_physics_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_physics_hand.tscn index c3f588f..93e1357 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_physics_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_fullglove_physics_hand.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_23oai"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://bhiiya7ow6h8v" path="res://addons/godot-xr-tools/hands/materials/labglove.material" id="5"] +[ext_resource type="Material" uid="uid://ds2dpvbpht0ea" path="res://addons/godot-xr-tools/hands/materials/labglove.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_sbg56"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_4mwbe") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_x7ees") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_hand.tscn index 5768f69..c0bfea7 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_hand.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bxipj7hyjwy6f" path="res://addons/godot-xr-tools/hands/animations/right/AnimationPlayer.tscn" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_lydk3"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="4"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_vm3m2"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_0hd6d") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_okkj6") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn index c6c3e86..21b0c3b 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_hand.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_gqplw"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="5"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_y3mf2"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_4bb4h") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_b8ks0") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_tac_glove.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_tac_glove.tscn index 8733951..94d85d2 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_tac_glove.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_physics_tac_glove.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://w7th3d2hl7b5" path="res://addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf" id="2"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_h0fv3"] -[ext_resource type="Material" uid="uid://dy4ya7w0k18ds" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material" id="4"] +[ext_resource type="Material" uid="uid://dogla70w8hvo8" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres" id="4"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="5"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="6"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_dc0m1") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_guoth") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("6") diff --git a/addons/godot-xr-tools/hands/scenes/highpoly/right_tac_glove.tscn b/addons/godot-xr-tools/hands/scenes/highpoly/right_tac_glove.tscn index f965cca..a24cb0d 100644 --- a/addons/godot-xr-tools/hands/scenes/highpoly/right_tac_glove.tscn +++ b/addons/godot-xr-tools/hands/scenes/highpoly/right_tac_glove.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_3ih8a"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="4"] -[ext_resource type="Material" uid="uid://b718ylp68nhtc" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material" id="5"] +[ext_resource type="Material" uid="uid://f2uhcqq8s2jx" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres" id="5"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_r46i5"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_4vdom") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_hef27") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_fullglove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_fullglove_low.tscn index 857aa11..c6b9c94 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_fullglove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_fullglove_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_wyae6"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="5"] -[ext_resource type="Material" uid="uid://ba02jnd2dswyn" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.material" id="6"] +[ext_resource type="Material" uid="uid://cdb40djkihelq" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qtto3"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_470u2") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_fhgyt") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_hand_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_hand_low.tscn index 489522c..ff5a126 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_hand_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_hand_low.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://the6y7swe6j0" path="res://addons/godot-xr-tools/hands/animations/left/AnimationPlayer.tscn" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_ry7qg"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="4"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ar6i3"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_c3h37") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_ihxeh") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_fullglove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_fullglove_low.tscn index 5e9ec96..c40fe0e 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_fullglove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_fullglove_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_4017m"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://bhiiya7ow6h8v" path="res://addons/godot-xr-tools/hands/materials/labglove.material" id="5"] +[ext_resource type="Material" uid="uid://ds2dpvbpht0ea" path="res://addons/godot-xr-tools/hands/materials/labglove.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_28vdf"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_fvmpw") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_a1c3t") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_hand_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_hand_low.tscn index 7425e45..9840188 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_hand_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_hand_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_t17lq"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="5"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_c4qn1"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_3l13i") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_ms3kw") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_tac_glove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_tac_glove_low.tscn index a8f1436..8eb73b7 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_tac_glove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_physics_tac_glove_low.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bnx4hithcij6y" path="res://addons/godot-xr-tools/hands/model/Hand_Glove_low_L.gltf" id="2"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_oehre"] -[ext_resource type="Material" uid="uid://dy4ya7w0k18ds" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material" id="4"] +[ext_resource type="Material" uid="uid://dogla70w8hvo8" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres" id="4"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="5"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="6"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_vkt4w") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_1yhw8") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftPhysicsHand" type="Node3D"] script = ExtResource("6") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/left_tac_glove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/left_tac_glove_low.tscn index 93dc1f1..3838fc3 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/left_tac_glove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/left_tac_glove_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dertgu7k8alls" path="res://addons/godot-xr-tools/hands/poses/pose_default_left.tres" id="3_iq5xt"] [ext_resource type="AnimationNodeBlendTree" uid="uid://dl8yf7ipqotd1" path="res://addons/godot-xr-tools/hands/animations/left/hand_blend_tree.tres" id="4"] -[ext_resource type="Material" uid="uid://b718ylp68nhtc" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material" id="5"] +[ext_resource type="Material" uid="uid://f2uhcqq8s2jx" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres" id="5"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_a8arv"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_csu2l") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_akg52") nodes/Trigger/position = Vector2(-360, 20) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="LeftHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_fullglove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_fullglove_low.tscn index 41d3a74..ab77db5 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_fullglove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_fullglove_low.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bxipj7hyjwy6f" path="res://addons/godot-xr-tools/hands/animations/right/AnimationPlayer.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://cjrac51wst3tu" path="res://addons/godot-xr-tools/hands/model/Hand_low_R.gltf" id="2"] -[ext_resource type="Material" uid="uid://ba02jnd2dswyn" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.material" id="3"] +[ext_resource type="Material" uid="uid://cdb40djkihelq" path="res://addons/godot-xr-tools/hands/materials/cleaning_glove.tres" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_r4xyu"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="6"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_l50hj") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_vrc3g") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("4") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn index 5fb2a85..caa274f 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_hand_low.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://dunu03tc5vdbh" path="res://addons/godot-xr-tools/hands/model/Hand_Nails_low_R.gltf" id="2"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_f67ka"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="4"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="6"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mbwcx"] @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_covtt") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_h5uio") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_fullglove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_fullglove_low.tscn index cea83ba..96a6072 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_fullglove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_fullglove_low.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bxipj7hyjwy6f" path="res://addons/godot-xr-tools/hands/animations/right/AnimationPlayer.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://cjrac51wst3tu" path="res://addons/godot-xr-tools/hands/model/Hand_low_R.gltf" id="2"] -[ext_resource type="Material" uid="uid://bhiiya7ow6h8v" path="res://addons/godot-xr-tools/hands/materials/labglove.material" id="3"] +[ext_resource type="Material" uid="uid://ds2dpvbpht0ea" path="res://addons/godot-xr-tools/hands/materials/labglove.tres" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_e8slj"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="4"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="6"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_1fjc2") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_ai2qv") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("4") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_hand_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_hand_low.tscn index 7c3951a..d910d04 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_hand_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_hand_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_b86a5"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="4"] -[ext_resource type="Material" uid="uid://dbvge3quu3bju" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.material" id="5"] +[ext_resource type="Material" uid="uid://dy6nhifvvmm73" path="res://addons/godot-xr-tools/hands/materials/caucasian_hand.tres" id="5"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="7"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_d2moa"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_l0mk4") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_it0su") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_tac_glove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_tac_glove_low.tscn index 59ee070..79d5383 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_tac_glove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_physics_tac_glove_low.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://csgsp0wuw8ucy" path="res://addons/godot-xr-tools/hands/model/Hand_Glove_low_R.gltf" id="2"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_xodao"] -[ext_resource type="Material" uid="uid://dy4ya7w0k18ds" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.material" id="4"] +[ext_resource type="Material" uid="uid://dogla70w8hvo8" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_dark_camo.tres" id="4"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand_physics_bone.gd" id="5"] [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/physics_hand.gd" id="6"] @@ -37,7 +37,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_8kdoe") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_5qnsq") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightPhysicsHand" type="Node3D"] script = ExtResource("6") diff --git a/addons/godot-xr-tools/hands/scenes/lowpoly/right_tac_glove_low.tscn b/addons/godot-xr-tools/hands/scenes/lowpoly/right_tac_glove_low.tscn index 0e2decc..f0d2ba8 100644 --- a/addons/godot-xr-tools/hands/scenes/lowpoly/right_tac_glove_low.tscn +++ b/addons/godot-xr-tools/hands/scenes/lowpoly/right_tac_glove_low.tscn @@ -5,7 +5,7 @@ [ext_resource type="Script" path="res://addons/godot-xr-tools/hands/hand.gd" id="3"] [ext_resource type="Resource" uid="uid://dmpjtk0l8vh6v" path="res://addons/godot-xr-tools/hands/poses/pose_default_right.tres" id="3_2wryo"] [ext_resource type="AnimationNodeBlendTree" uid="uid://m85b1gogdums" path="res://addons/godot-xr-tools/hands/animations/right/hand_blend_tree.tres" id="4"] -[ext_resource type="Material" uid="uid://b718ylp68nhtc" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.material" id="5"] +[ext_resource type="Material" uid="uid://f2uhcqq8s2jx" path="res://addons/godot-xr-tools/hands/materials/glove_caucasian_green_camo.tres" id="5"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jjiin"] animation = &"Grip" @@ -36,7 +36,7 @@ nodes/OpenHand/node = SubResource("AnimationNodeAnimation_4o3a2") nodes/OpenHand/position = Vector2(-600, 100) nodes/Trigger/node = SubResource("AnimationNodeBlend2_5v4fm") nodes/Trigger/position = Vector2(-360, 40) -node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"] +node_connections = [&"output", 0, &"Grip", &"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1"] [node name="RightHand" type="Node3D"] script = ExtResource("3") diff --git a/addons/godot-xr-tools/interactables/interactable_hinge.tscn b/addons/godot-xr-tools/interactables/interactable_hinge.tscn index 36bda8e..11e5ed8 100644 --- a/addons/godot-xr-tools/interactables/interactable_hinge.tscn +++ b/addons/godot-xr-tools/interactables/interactable_hinge.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://bguuwkl5g8rmw"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://addons/godot-xr-tools/interactables/interactable_hinge.gd" id="1"] +[ext_resource path="res://addons/godot-xr-tools/interactables/interactable_hinge.gd" type="Script" id=1] [node name="InteractableHinge" type="Spatial"] -script = ExtResource("1") +script = ExtResource( 1 ) diff --git a/addons/godot-xr-tools/interactables/interactable_joystick.tscn b/addons/godot-xr-tools/interactables/interactable_joystick.tscn index f1bd060..1dcd9a4 100644 --- a/addons/godot-xr-tools/interactables/interactable_joystick.tscn +++ b/addons/godot-xr-tools/interactables/interactable_joystick.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://cvb8dcj5yvey4"] +[gd_scene load_steps=2 format=2] -[ext_resource type="Script" path="res://addons/godot-xr-tools/interactables/interactable_joystick.gd" id="1"] +[ext_resource path="res://addons/godot-xr-tools/interactables/interactable_joystick.gd" type="Script" id=1] [node name="InteractableJoystick" type="Spatial"] -script = ExtResource("1") +script = ExtResource( 1 ) diff --git a/addons/godot-xr-tools/misc/hold_button.tscn b/addons/godot-xr-tools/misc/hold_button.tscn index 84f9aaa..2e69092 100644 --- a/addons/godot-xr-tools/misc/hold_button.tscn +++ b/addons/godot-xr-tools/misc/hold_button.tscn @@ -10,9 +10,9 @@ resource_local_to_scene = true render_priority = 0 shader = ExtResource("2") shader_parameter/albedo = Color(1, 1, 1, 1) -shader_parameter/value = 0.2 shader_parameter/fade = 0.05 shader_parameter/radius = 0.8 +shader_parameter/value = 0.2 shader_parameter/width = 0.2 [node name="HoldButton" type="Node3D"] diff --git a/addons/godot-xr-tools/misc/vr_common_shader_cache.tscn b/addons/godot-xr-tools/misc/vr_common_shader_cache.tscn index 7a3c973..8c9ab26 100644 --- a/addons/godot-xr-tools/misc/vr_common_shader_cache.tscn +++ b/addons/godot-xr-tools/misc/vr_common_shader_cache.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://dtpttn1rq1df6"] +[gd_scene load_steps=8 format=3] [ext_resource type="Script" path="res://addons/godot-xr-tools/misc/vr_common_shader_cache.gd" id="1"] -[ext_resource type="Material" uid="uid://bk72wfw25ff0v" path="res://addons/godot-xr-tools/materials/teleport.tres" id="2_6822k"] +[ext_resource type="Material" path="res://addons/godot-xr-tools/materials/teleport.tres" id="2_6822k"] [ext_resource type="Material" path="res://addons/godot-xr-tools/materials/target.tres" id="3_agvdv"] [ext_resource type="Material" path="res://addons/godot-xr-tools/materials/capsule.tres" id="4_gxjsg"] [ext_resource type="Material" path="res://addons/godot-xr-tools/materials/pointer.tres" id="5_12251"] diff --git a/addons/godot-xr-tools/objects/grab_points/grab_point_hand.gd b/addons/godot-xr-tools/objects/grab_points/grab_point_hand.gd index 7cc0ef1..45833ae 100644 --- a/addons/godot-xr-tools/objects/grab_points/grab_point_hand.gd +++ b/addons/godot-xr-tools/objects/grab_points/grab_point_hand.gd @@ -107,8 +107,16 @@ func _set_hand(new_value : Hand) -> void: func _set_hand_pose(new_value : XRToolsHandPoseSettings) -> void: + # Unsubscribe from the old hand-pose changed signal + if Engine.is_editor_hint() and hand_pose: + hand_pose.changed.disconnect(_update_editor_preview) + + # Save the hand pose hand_pose = new_value - if Engine.is_editor_hint(): + + # Update the editor preview + if Engine.is_editor_hint() and hand_pose: + hand_pose.changed.connect(_update_editor_preview) _update_editor_preview() diff --git a/addons/godot-xr-tools/objects/world_grab_area.gd b/addons/godot-xr-tools/objects/world_grab_area.gd index f3180e7..4a68aeb 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 925abaa..341346f 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/addons/godot-xr-tools/player/player_body.gd b/addons/godot-xr-tools/player/player_body.gd index 7bba58c..6dc9fd9 100644 --- a/addons/godot-xr-tools/player/player_body.gd +++ b/addons/godot-xr-tools/player/player_body.gd @@ -347,9 +347,9 @@ func request_jump(skip_jump_velocity := false): if !on_ground: return - # Skip if our vertical velocity is not essentially the same as the ground + # Skip if we have any vertical velocity with regards to the ground-plane var ground_relative := velocity - ground_velocity - if abs(ground_relative.dot(up_player)) > 0.01: + if abs(ground_relative.dot(ground_vector)) > 0.01: return # Skip if jump disabled on this ground diff --git a/addons/godot-xr-tools/plugin.cfg b/addons/godot-xr-tools/plugin.cfg index d8bf9c4..fedd843 100644 --- a/addons/godot-xr-tools/plugin.cfg +++ b/addons/godot-xr-tools/plugin.cfg @@ -3,5 +3,5 @@ name="Godot XR Tools" description="Godot XR Tools plugin" author="Bastiaan Olij and Contributors" -version="4.3.0" +version="4.3.1" script="plugin.gd" diff --git a/addons/godot-xr-tools/plugin.gd b/addons/godot-xr-tools/plugin.gd index 317c2a5..c310c7b 100644 --- a/addons/godot-xr-tools/plugin.gd +++ b/addons/godot-xr-tools/plugin.gd @@ -40,6 +40,7 @@ func _define_project_setting( func _enable_openxr() -> void: ProjectSettings.set("xr/openxr/enabled", true) ProjectSettings.set("xr/shaders/enabled", true) + ProjectSettings.save() func _set_physics_layers() -> void: @@ -55,6 +56,7 @@ func _set_physics_layers() -> void: ProjectSettings.set("layer_names/3d_physics/layer_21", "Pointable Objects") ProjectSettings.set("layer_names/3d_physics/layer_22", "Hand Pose Areas") ProjectSettings.set("layer_names/3d_physics/layer_23", "UI Objects") + ProjectSettings.save() func _on_xr_tools_menu_pressed(id : int) -> void: diff --git a/addons/godot-xr-tools/staging/staging.gd b/addons/godot-xr-tools/staging/staging.gd index a826222..2a82ced 100644 --- a/addons/godot-xr-tools/staging/staging.gd +++ b/addons/godot-xr-tools/staging/staging.gd @@ -146,13 +146,14 @@ func load_scene(p_scene_path : String, user_data = null) -> void: if !xr_camera: return - if current_scene: - # Start by unloading our scene + # Start the threaded loading of the scene. If the scene is already cached + # then this will finish immediately with THREAD_LOAD_LOADED + ResourceLoader.load_threaded_request(p_scene_path) - # Let the scene know we're about to remove it + # If a current scene is visible then fade it out and unload it. + if current_scene: + # Report pre-exiting and remove the scene signals current_scene.scene_pre_exiting(user_data) - - # Remove signals _remove_signals(current_scene) # Fade to black @@ -169,6 +170,11 @@ func load_scene(p_scene_path : String, user_data = null) -> void: current_scene.queue_free() current_scene = null + # If a continue-prompt is desired or the new scene has not finished + # loading, then switch to the loading screen. + if prompt_for_continue or \ + ResourceLoader.load_threaded_get_status(p_scene_path) != ResourceLoader.THREAD_LOAD_LOADED: + # Make our loading screen visible again and reset some stuff xr_origin.set_process_internal(true) xr_origin.current = true @@ -186,15 +192,9 @@ func load_scene(p_scene_path : String, user_data = null) -> void: _tween.tween_method(set_fade, 1.0, 0.0, 1.0) await _tween.finished - # Load the new scene - var new_scene : PackedScene - if ResourceLoader.has_cached(p_scene_path): - # Load cached scene - new_scene = ResourceLoader.load(p_scene_path) - else: - # Start the loading in a thread - ResourceLoader.load_threaded_request(p_scene_path) - + # If the loading screen is visible then show the progress and optionally + # wait for the continue. Once done fade out the loading screen. + if $LoadingScreen.visible: # Loop waiting for the scene to load var res : ResourceLoader.ThreadLoadStatus while true: @@ -218,29 +218,25 @@ func load_scene(p_scene_path : String, user_data = null) -> void: # Terminate with a non-zero error code to indicate failure get_tree().quit(1) - # Get the loaded scene - new_scene = ResourceLoader.load_threaded_get(p_scene_path) - - # Wait for user to be ready - if prompt_for_continue: - $LoadingScreen.enable_press_to_continue = true - await $LoadingScreen.continue_pressed + # Wait for user to be ready + if prompt_for_continue: + $LoadingScreen.enable_press_to_continue = true + await $LoadingScreen.continue_pressed - # Fade to black - if _tween: - _tween.kill() - _tween = get_tree().create_tween() - _tween.tween_method(set_fade, 0.0, 1.0, 1.0) - await _tween.finished + # Fade to black + if _tween: + _tween.kill() + _tween = get_tree().create_tween() + _tween.tween_method(set_fade, 0.0, 1.0, 1.0) + await _tween.finished - # Hide our loading screen - $LoadingScreen.follow_camera = false - $LoadingScreen.visible = false + # Hide our loading screen + $LoadingScreen.follow_camera = false + $LoadingScreen.visible = false + xr_origin.set_process_internal(false) - # Turn off internal process on our FPController, the internal process - # of our XROrigin3D will submit its positioning data to the XRServer. - # With two XROrigin3D nodes we'll get competing data. - xr_origin.set_process_internal(false) + # Get the loaded scene + var new_scene : PackedScene = ResourceLoader.load_threaded_get(p_scene_path) # Setup our new scene current_scene = new_scene.instantiate() @@ -260,6 +256,7 @@ func load_scene(p_scene_path : String, user_data = null) -> void: _tween.tween_method(set_fade, 1.0, 0.0, 1.0) await _tween.finished + # Report new scene visible current_scene.scene_visible(user_data) scene_visible.emit(current_scene, user_data) diff --git a/addons/godot-xr-tools/staging/staging.tscn b/addons/godot-xr-tools/staging/staging.tscn index 3b683c9..d78690b 100644 --- a/addons/godot-xr-tools/staging/staging.tscn +++ b/addons/godot-xr-tools/staging/staging.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bqumugyvkct4r" path="res://addons/godot-xr-tools/staging/loading_screen.tscn" id="2"] [ext_resource type="Environment" uid="uid://ckiwtcdsam7ed" path="res://addons/godot-xr-tools/staging/staging_env.tres" id="3_40x3a"] [ext_resource type="Shader" path="res://addons/godot-xr-tools/staging/fade.gdshader" id="4"] -[ext_resource type="PackedScene" uid="uid://dtpttn1rq1df6" path="res://addons/godot-xr-tools/misc/vr_common_shader_cache.tscn" id="5"] +[ext_resource type="PackedScene" path="res://addons/godot-xr-tools/misc/vr_common_shader_cache.tscn" id="5"] [ext_resource type="PackedScene" uid="uid://clc5dre31iskm" path="res://addons/godot-xr-tools/xr/start_xr.tscn" id="6_balvx"] [sub_resource type="QuadMesh" id="4"] diff --git a/addons/godot-xr-tools/xr/start_xr.tscn b/addons/godot-xr-tools/xr/start_xr.tscn index fc156c5..4ef8287 100644 --- a/addons/godot-xr-tools/xr/start_xr.tscn +++ b/addons/godot-xr-tools/xr/start_xr.tscn @@ -4,7 +4,6 @@ [node name="StartXR" type="Node"] script = ExtResource("1_ljt1b") -physics_rate_multiplier = 1.0 [node name="EnterWebXR" type="CanvasLayer" parent="."] visible = false