Skip to content

Commit

Permalink
Updated to Godot-XR-Tools 4.3.1 (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
Malcolmnixon authored Mar 1, 2024
1 parent 696d14c commit b40f670
Show file tree
Hide file tree
Showing 73 changed files with 257 additions and 129 deletions.
8 changes: 8 additions & 0 deletions addons/godot-xr-tools/VERSIONS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions addons/godot-xr-tools/audio/surface_audio.tscn
Original file line number Diff line number Diff line change
@@ -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 )
3 changes: 1 addition & 2 deletions addons/godot-xr-tools/effects/vignette.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}]
Expand Down
Binary file not shown.
8 changes: 8 additions & 0 deletions addons/godot-xr-tools/hands/materials/african_hands.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[gd_resource type="ORMMaterial3D" load_steps=3 format=3 uid="uid://bde1c58rcajee"]

[ext_resource type="Texture2D" uid="uid://cs7m7m0k2506g" path="res://addons/godot-xr-tools/hands/textures/african_baseColor.png" id="1_dn1i6"]
[ext_resource type="Texture2D" uid="uid://h3sjbnu6uplb" path="res://addons/godot-xr-tools/hands/textures/hands_occlusionRoughnessMetallic.png" id="2_di2ux"]

[resource]
albedo_texture = ExtResource("1_dn1i6")
orm_texture = ExtResource("2_di2ux")
Binary file not shown.
12 changes: 12 additions & 0 deletions addons/godot-xr-tools/hands/materials/african_hands_realistic.tres
Original file line number Diff line number Diff line change
@@ -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")
Binary file not shown.
8 changes: 8 additions & 0 deletions addons/godot-xr-tools/hands/materials/caucasian_hand.tres
Original file line number Diff line number Diff line change
@@ -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")
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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")
Binary file not shown.
14 changes: 14 additions & 0 deletions addons/godot-xr-tools/hands/materials/cleaning_glove.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://cdb40djkihelq"]

[ext_resource type="Texture2D" uid="uid://dv711ytktesj2" path="res://addons/godot-xr-tools/hands/textures/cleaning_glove_baseColor.png" id="1_k2x02"]
[ext_resource type="Texture2D" uid="uid://dt6k4nuvpo38o" path="res://addons/godot-xr-tools/hands/textures/glove_normal.png" id="2_uiqlw"]
[ext_resource type="Texture2D" uid="uid://yslwgnpbpeen" path="res://addons/godot-xr-tools/hands/textures/glove_occlusionRoughnessMetallic.png" id="3_8ux4v"]

[resource]
albedo_texture = ExtResource("1_k2x02")
orm_texture = ExtResource("3_8ux4v")
normal_enabled = true
normal_scale = 0.1
normal_texture = ExtResource("2_uiqlw")
clearcoat_enabled = true
ao_light_affect = 1.0
Binary file not shown.
14 changes: 14 additions & 0 deletions addons/godot-xr-tools/hands/materials/glove_african_dark_camo.tres
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[gd_resource type="ORMMaterial3D" load_steps=4 format=3 uid="uid://di8q50ljmjoar"]

[ext_resource type="Texture2D" uid="uid://cocorrka3dtq3" path="res://addons/godot-xr-tools/hands/textures/glove_african_dark_camo.png" id="1_5khcc"]
[ext_resource type="Texture2D" uid="uid://bw8rmigwt5pr4" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_normal.png" id="2_qghm4"]
[ext_resource type="Texture2D" uid="uid://d2iocwfr47kqp" path="res://addons/godot-xr-tools/hands/textures/glove_fingerless_occlusionRoughnessMetallic.png" id="3_dt1up"]

[resource]
albedo_texture = ExtResource("1_5khcc")
orm_texture = ExtResource("3_dt1up")
normal_enabled = true
normal_scale = 0.25
normal_texture = ExtResource("2_qghm4")
ao_light_affect = 0.05
ao_on_uv2 = true
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
Binary file not shown.
14 changes: 14 additions & 0 deletions addons/godot-xr-tools/hands/materials/labglove.tres
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_Glove_L.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_Glove_R.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_Nails_L.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_Nails_R.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_low_L.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/Hand_low_R.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/hand_l.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
2 changes: 0 additions & 2 deletions addons/godot-xr-tools/hands/model/hand_r.gltf.import
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,11 @@ 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
animation/trimming=false
animation/remove_immutable_tracks=true
import_script/path=""
_subresources={}
gltf/naming_version=0
gltf/embedded_image_handling=1
17 changes: 15 additions & 2 deletions addons/godot-xr-tools/hands/poses/hand_pose_settings.gd
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
@tool
@icon("res://addons/godot-xr-tools/editor/icons/hand.svg")
class_name XRToolsHandPoseSettings
extends Resource
Expand All @@ -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()
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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")
Expand Down
Loading

0 comments on commit b40f670

Please sign in to comment.