diff --git a/game/modules/species/Human/models/armature_huf.tscn b/game/modules/species/Human/models/armature_huf.tscn index d43c11a2..8c4dbcaa 100644 --- a/game/modules/species/Human/models/armature_huf.tscn +++ b/game/modules/species/Human/models/armature_huf.tscn @@ -163,7 +163,7 @@ bones/27/bound_children = [ NodePath("NeckAttachment") ] visible = false [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"] -transform = Transform( 0.174179, 0.1342, -0.975526, 0.0619569, -0.990201, -0.125156, -0.982762, -0.0386409, -0.180787, 0.239269, 0.769482, -0.0109778 ) +transform = Transform( 0.166537, 0.128508, -0.977625, 0.0478394, -0.991356, -0.122164, -0.984873, -0.0264241, -0.171246, 0.236768, 0.767375, -0.00607332 ) bone_name = "left_hand" [node name="LeftHandAP" type="Spatial" parent="armature/Armature/Skeleton/LeftHandAttachment"] @@ -171,14 +171,14 @@ transform = Transform( -0.0646502, 0.683772, 0.726832, -0.148514, -0.726783, 0.6 script = ExtResource( 2 ) [node name="ShieldAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="2"] -transform = Transform( -0.0262811, 0.1126, 0.993293, -0.0475314, -0.992653, 0.11127, 0.998523, -0.0442883, 0.0314401, 0.21217, 1.00838, -0.000318941 ) +transform = Transform( -0.0184403, 0.10685, 0.994104, -0.034023, -0.993765, 0.106183, 0.99925, -0.0318643, 0.0219607, 0.211053, 1.00654, 0.00159548 ) 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.0928893, -0.0775274, -0.992653, -0.0426464, -0.995739, 0.0817594, -0.994763, 0.0499277, 0.0891874, -0.247333, 0.769155, -0.00112519 ) +transform = Transform( -0.123816, -0.0747699, -0.989484, -0.0158104, -0.996882, 0.0773075, -0.99218, 0.025216, 0.122248, -0.247354, 0.768532, 0.00305579 ) bone_name = "right_hand" [node name="RightHandAP" type="Spatial" parent="armature/Armature/Skeleton/RightHandAttachment"] @@ -194,7 +194,7 @@ transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0, 0 script = ExtResource( 2 ) [node name="NeckAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="5"] -transform = Transform( 0.999983, -0.00497196, -0.00293679, 0.00516374, 0.997578, 0.0693739, 0.00258475, -0.0693879, 0.997586, 0.000916675, 1.31463, -0.000500353 ) +transform = Transform( 0.999962, -0.008224, -0.00275978, 0.00839928, 0.99744, 0.0710206, 0.00216864, -0.0710411, 0.997471, 0.000932109, 1.31296, -0.00128597 ) bone_name = "neck" [node name="TorsoAP" type="Spatial" parent="armature/Armature/Skeleton/NeckAttachment"] @@ -202,28 +202,28 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.04, -0.09 ) script = ExtResource( 2 ) [node name="RightHipAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="6"] -transform = Transform( 0.999777, 0.0210965, 1.00065e-08, -0.0210965, 0.999777, 4.71749e-07, -5.20721e-11, -4.71855e-07, 1, 0.00411601, 0.773196, 0 ) +transform = Transform( 0.999866, 0.0163955, 7.77678e-09, -0.0163955, 0.999866, 4.71791e-07, -4.04814e-11, -4.71855e-07, 1, 0.00597917, 0.771599, 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.999777, 0.0210965, 1.00065e-08, -0.0210965, 0.999777, 4.71749e-07, -5.20721e-11, -4.71855e-07, 1, 0.00411601, 0.773196, 0 ) +transform = Transform( 0.999866, 0.0163955, 7.77678e-09, -0.0163955, 0.999866, 4.71791e-07, -4.04814e-11, -4.71855e-07, 1, 0.00597917, 0.771599, 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.999982, -0.00544783, -0.00244195, 0.00543598, 0.999974, -0.00483314, 0.00246822, 0.00481979, 0.999985, 0.00193867, 1.12704, -0.00140453 ) +transform = Transform( 0.99996, -0.00867777, -0.00202415, 0.00867132, 0.999957, -0.00318031, 0.00205166, 0.00316263, 0.999993, 0.00256003, 1.12537, -0.00187927 ) 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.999982, -0.00544783, -0.00244195, 0.00543598, 0.999974, -0.00483314, 0.00246822, 0.00481979, 0.999985, 0.00193867, 1.12704, -0.00140453 ) +transform = Transform( 0.99996, -0.00867777, -0.00202415, 0.00867132, 0.999957, -0.00318031, 0.00205166, 0.00316263, 0.999993, 0.00256003, 1.12537, -0.00187927 ) bone_name = "spine_2" [node name="LeftBackAP" type="Spatial" parent="armature/Armature/Skeleton/LeftBackAttachment"] diff --git a/game/test_weapons/shield_d.material b/game/test_weapons/shield_d.material index 180b19cb..2e623d5e 100644 Binary files a/game/test_weapons/shield_d.material and b/game/test_weapons/shield_d.material differ diff --git a/game/test_weapons/shield_d.mesh b/game/test_weapons/shield_d.mesh index 793855e6..1d972f5a 100644 Binary files a/game/test_weapons/shield_d.mesh and b/game/test_weapons/shield_d.mesh differ diff --git a/game/test_weapons/shield_d_new_material.tres b/game/test_weapons/shield_d_new_material.tres new file mode 100644 index 00000000..d764fc37 --- /dev/null +++ b/game/test_weapons/shield_d_new_material.tres @@ -0,0 +1,9 @@ +[gd_resource type="ShaderMaterial" load_steps=3 format=2] + +[ext_resource path="res://modules/core/shaders/4_standard_character_shader.tres" type="Shader" id=1] +[ext_resource path="res://test_weapons/textures/shield_d.png" type="Texture" id=2] + +[resource] +shader = ExtResource( 1 ) +shader_param/albedo = Color( 0.764706, 0.764706, 0.764706, 1 ) +shader_param/texture_albedo = ExtResource( 2 )