From e986d8d488e7c1d732d2b2fdb5dc0534e43fea2b Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 10 Jul 2020 10:31:09 +0200 Subject: [PATCH] build_model is now called as deferred. --- .../species/Human/models/armature_huf.tscn | 18 +++++++++--------- game/player/CharacterSkeletonGD.gd | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/game/modules/species/Human/models/armature_huf.tscn b/game/modules/species/Human/models/armature_huf.tscn index 2c6cb74b..51eb00ff 100644 --- a/game/modules/species/Human/models/armature_huf.tscn +++ b/game/modules/species/Human/models/armature_huf.tscn @@ -147,7 +147,7 @@ viss = [ ExtResource( 1 ) ] [node name="armature" parent="." instance=ExtResource( 6 )] [node name="Skeleton" parent="armature/Armature" index="0"] -transform = Transform( 1, -6.84064e-18, 1.54087e-25, 6.84064e-18, 1, 1.05378e-42, -1.54087e-25, 0, 1, 0, 0, 0 ) +transform = Transform( 1, 4.60222e-19, -5.72812e-26, -4.60222e-19, 1, 4.16186e-43, 5.72812e-26, -3.90962e-43, 1, 0, -1.17877e-15, 0 ) bones/0/bound_children = [ NodePath("RootAttachment") ] bones/1/bound_children = [ NodePath("RightHipAttachment"), NodePath("LeftHipAttachment") ] bones/10/bound_children = [ NodePath("RightBackAttachment"), NodePath("LeftBackAttachment") ] @@ -160,7 +160,7 @@ bones/24/bound_children = [ NodePath("RightHandAttachment") ] visible = false [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"] -transform = Transform( 0.102742, 0.121361, -0.987264, 0.0573268, -0.991557, -0.115914, -0.99305, -0.0446887, -0.108835, 0.228346, 0.771445, -0.0102045 ) +transform = Transform( 0.103219, 0.115618, -0.98789, 0.0565265, -0.992234, -0.11019, -0.993045, -0.0444712, -0.108958, 0.230529, 0.767409, -0.00949661 ) bone_name = "left_hand" [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"] @@ -169,14 +169,14 @@ script = ExtResource( 2 ) positions = [ ] [node name="ShieldAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"] -transform = Transform( 0.0460429, 0.0993848, 0.993971, -0.0443354, -0.99381, 0.101413, 0.997951, -0.0487388, -0.0413565, 0.204427, 1.01063, 0.00152545 ) +transform = Transform( 0.0456361, 0.0936307, 0.994534, -0.0443996, -0.99436, 0.095621, 0.997964, -0.048524, -0.0412299, 0.207995, 1.00672, 0.00218168 ) bone_name = "left_forearm" [node name="LeftHandShield" type="Spatial" parent="armature/Armature/Skeleton/ShieldAttachment"] transform = Transform( 0.122585, 0.992132, -0.0242311, 0.987746, -0.124342, -0.0941345, -0.0964273, -0.0123912, -0.995239, 0.0157415, 0.108918, 0.0213161 ) [node name="RightHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="3"] -transform = Transform( -0.0400954, -0.0242101, -0.998884, -0.127471, -0.991364, 0.0291305, -0.991041, 0.128501, 0.0366712, -0.226341, 0.768569, -0.00640216 ) +transform = Transform( -0.0413363, -0.0342888, -0.998527, -0.126695, -0.991081, 0.0392623, -0.991096, 0.128137, 0.0366369, -0.23272, 0.769221, -0.00725112 ) bone_name = "right_hand" [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"] @@ -194,7 +194,7 @@ script = ExtResource( 2 ) positions = [ ] [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"] -transform = Transform( 0.99998, -0.00629028, -0.000312272, 0.00629784, 0.997246, 0.0731527, -0.000148758, -0.0731576, 0.99732, 0.00103962, 1.31823, 5.39597e-05 ) +transform = Transform( 0.999956, -0.00928506, -0.00113374, 0.00933786, 0.997187, 0.0730996, 0.000451846, -0.0731132, 0.997323, 0.00115525, 1.31384, 9.13832e-05 ) bone_name = "neck" [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"] @@ -203,28 +203,28 @@ script = ExtResource( 2 ) positions = [ ] [node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"] -transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 ) +transform = Transform( 0.999828, 0.018569, 8.80769e-09, -0.018569, 0.999828, 4.71773e-07, -4.58407e-11, -4.71855e-07, 1, 0.00511778, 0.772338, 0 ) bone_name = "pelvis" [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/RightHipAttachment"] transform = Transform( 0.993372, -0.0110498, 0.114411, 0.0109836, 0.999939, 0.00120905, -0.114417, 5.56017e-05, 0.993433, -0.141825, 0.176866, 0.16621 ) [node name="LeftHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="7"] -transform = Transform( 0.999504, 0.0314799, 1.49316e-08, -0.0314799, 0.999504, 4.7162e-07, -7.76685e-11, -4.71856e-07, 1, 0, 0.776724, 0 ) +transform = Transform( 0.999828, 0.018569, 8.80769e-09, -0.018569, 0.999828, 4.71773e-07, -4.58407e-11, -4.71855e-07, 1, 0.00511778, 0.772338, 0 ) bone_name = "pelvis" [node name="Spatial" type="Spatial" parent="armature/Armature/Skeleton/LeftHipAttachment"] transform = Transform( 0.99343, -0.00240871, -0.114417, 0.00240855, 0.999997, -0.000139626, 0.114417, -0.00013687, 0.993433, 0.144429, 0.18077, 0.165634 ) [node name="RightBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="8"] -transform = Transform( 0.999978, -0.00656778, 0.000273144, 0.00656962, 0.999923, -0.00103998, -0.000266317, 0.00104151, 0.999999, 0.00227172, 1.13064, -0.000141409 ) +transform = Transform( 0.999953, -0.00961525, -0.000323861, 0.00960963, 0.99986, -0.00108821, 0.000334298, 0.00108582, 0.999999, 0.00295904, 1.12627, -0.000112304 ) bone_name = "spine_2" [node name="RightBackAP" type="Spatial" parent="armature/Armature/Skeleton/RightBackAttachment"] transform = Transform( 0.999997, -0.00244424, -0.000479204, 0.00243884, 0.999966, -3.47705e-05, 0.000479292, 3.44458e-05, 1, 0.000560207, -0.00363708, -0.120332 ) [node name="LeftBackAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="9"] -transform = Transform( 0.999978, -0.00656778, 0.000273144, 0.00656962, 0.999923, -0.00103998, -0.000266317, 0.00104151, 0.999999, 0.00227172, 1.13064, -0.000141409 ) +transform = Transform( 0.999953, -0.00961525, -0.000323861, 0.00960963, 0.99986, -0.00108821, 0.000334298, 0.00108582, 0.999999, 0.00295904, 1.12627, -0.000112304 ) bone_name = "spine_2" [node name="LeftBackAP" type="Spatial" parent="armature/Armature/Skeleton/LeftBackAttachment"] diff --git a/game/player/CharacterSkeletonGD.gd b/game/player/CharacterSkeletonGD.gd index bc2c8b0d..34da79d1 100644 --- a/game/player/CharacterSkeletonGD.gd +++ b/game/player/CharacterSkeletonGD.gd @@ -120,7 +120,7 @@ func _enter_tree(): sheath(sheathed) if automatic_build: - build_model() + call_deferred("build_model") func _build_model(): if _generating: