Character animations hold club correctly

This commit is contained in:
Rob Kelly 2024-11-10 15:31:07 -07:00
parent 13a09cd90c
commit edcf497277
9 changed files with 569 additions and 587 deletions

Binary file not shown.

View File

@ -5,4 +5,4 @@ resource_name = "Shirt"
cull_mode = 2
albedo_color = Color(0.724308, 0.441148, 0.908673, 1)
subsurf_scatter_enabled = true
subsurf_scatter_strength = 0.05
subsurf_scatter_strength = 0.02

View File

@ -5,4 +5,4 @@ resource_name = "ShirtAccent"
cull_mode = 2
albedo_color = Color(0.818613, 0.876482, 0.906635, 1)
subsurf_scatter_enabled = true
subsurf_scatter_strength = 0.05
subsurf_scatter_strength = 0.02

View File

@ -5,5 +5,5 @@ resource_name = "Skin"
albedo_color = Color(0.905882, 0.760784, 0.690196, 1)
roughness = 0.892982
subsurf_scatter_enabled = true
subsurf_scatter_strength = 0.15
subsurf_scatter_strength = 0.1
subsurf_scatter_skin_mode = true

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,23 @@
[gd_scene load_steps=14 format=3 uid="uid://1s3gywmoi20e"]
[gd_scene load_steps=18 format=3 uid="uid://1s3gywmoi20e"]
[ext_resource type="PackedScene" uid="uid://ha6jxf4v5845" path="res://assets/models/characters/gfolf_girl/gfolf_girl.gltf" id="1_j80rr"]
[ext_resource type="Script" path="res://src/characters/character_controller.gd" id="2_7o84v"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fokhu"]
albedo_color = Color(0.226707, 0.226707, 0.226707, 1)
[sub_resource type="BoxMesh" id="BoxMesh_363n0"]
material = SubResource("StandardMaterial3D_fokhu")
size = Vector3(0.1, 3.7, 0.1)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_bnr0u"]
albedo_color = Color(0.29219, 0.29219, 0.29219, 1)
metallic = 1.0
[sub_resource type="BoxMesh" id="BoxMesh_oll6x"]
material = SubResource("StandardMaterial3D_bnr0u")
size = Vector3(0.1, 0.3, 0.5)
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f1ltw"]
animation = &"downswing"
@ -88,6 +103,24 @@ bones/22/scale = Vector3(1, 1, 1)
bones/23/rotation = Quaternion(0.000222673, 0.707107, 0.707107, -0.000222504)
bones/23/scale = Vector3(1, 1, 1)
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Armature/Skeleton3D" index="6"]
transform = Transform3D(0.716166, -0.649102, 0.256463, 0.299879, 0.617999, 0.726739, -0.630221, -0.443557, 0.637242, 2.07189, 5.03856, -0.632428)
bone_name = "Hand.R"
bone_idx = 11
[node name="RightHandGrip" type="Node3D" parent="Armature/Skeleton3D/BoneAttachment3D" index="0"]
unique_name_in_owner = true
transform = Transform3D(0.934826, 0.266239, -0.23498, -0.336326, 0.876157, -0.345298, 0.113948, 0.401823, 0.908599, -0.0340219, 0.535822, -0.0310692)
[node name="DebugClub" type="MeshInstance3D" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.205, 0)
mesh = SubResource("BoxMesh_363n0")
skeleton = NodePath("../..")
[node name="MeshInstance3D" type="MeshInstance3D" parent="Armature/Skeleton3D/BoneAttachment3D/RightHandGrip/DebugClub" index="0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.705, 0.3)
mesh = SubResource("BoxMesh_oll6x")
[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
tree_root = SubResource("AnimationNodeStateMachine_yepp7")
anim_player = NodePath("../AnimationPlayer")

View File

@ -1,4 +1,4 @@
[gd_scene load_steps=28 format=3 uid="uid://cy7t2tc4y3b4"]
[gd_scene load_steps=25 format=3 uid="uid://cy7t2tc4y3b4"]
[ext_resource type="Script" path="res://src/player/shot_setup/shot_setup.gd" id="1_r6ei4"]
[ext_resource type="PackedScene" uid="uid://dfttci386ohip" path="res://src/player/physics_ball/physics_ball.tscn" id="2_1i5j5"]
@ -15,16 +15,6 @@ top_radius = 0.02
bottom_radius = 0.02
height = 1.0
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a4xnf"]
albedo_color = Color(0.374139, 0.374139, 0.374139, 1)
[sub_resource type="BoxMesh" id="BoxMesh_lxyoo"]
material = SubResource("StandardMaterial3D_a4xnf")
size = Vector3(0.1, 3.5, 0.1)
[sub_resource type="BoxMesh" id="BoxMesh_akqxt"]
size = Vector3(0.4, 0.3, 0.1)
[sub_resource type="Animation" id="Animation_ug2a7"]
length = 0.001
tracks/0/type = "value"
@ -438,46 +428,7 @@ skeleton = NodePath("../..")
unique_name_in_owner = true
[node name="GfolfGirl" parent="PlayerPivot" instance=ExtResource("3_e4aur")]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.5, 0, 0)
[node name="Skeleton3D" parent="PlayerPivot/GfolfGirl/Armature" index="0"]
bones/2/rotation = Quaternion(-0.0810866, 1.18817e-07, -9.66627e-09, 0.996707)
bones/3/rotation = Quaternion(0.109598, 5.74113e-14, 2.61301e-08, 0.993976)
bones/4/rotation = Quaternion(-0.378114, -0.327388, -0.582774, 0.640486)
bones/5/rotation = Quaternion(0.016166, 0.00322388, -0.0373428, 0.999167)
bones/6/rotation = Quaternion(-0.0278617, 0.563825, -0.0134439, 0.825315)
bones/7/position = Vector3(2.5177, 0.946917, -0.235743)
bones/7/rotation = Quaternion(0.0351418, 0.076921, -0.71429, 0.694721)
bones/8/position = Vector3(0.0273073, -0.885686, -1.18049)
bones/9/rotation = Quaternion(-0.37636, 0.32557, 0.583804, 0.641506)
bones/10/rotation = Quaternion(0.0161656, -0.00322384, 0.037342, 0.999167)
bones/11/rotation = Quaternion(-0.0277614, -0.56142, 0.0134281, 0.826956)
bones/12/position = Vector3(-2.5177, 0.946917, -0.235744)
bones/12/rotation = Quaternion(0.0351417, -0.0769212, 0.71429, 0.694721)
bones/13/position = Vector3(-0.028872, -0.905219, -0.835685)
bones/14/rotation = Quaternion(-0.0450049, 0.0679843, 0.995348, -0.0513393)
bones/15/rotation = Quaternion(-0.0580143, 0.0014095, -0.0404488, 0.997495)
bones/16/rotation = Quaternion(-0.00817251, -0.0457521, -0.0136595, 0.998826)
bones/17/rotation = Quaternion(0.0450049, 0.0679843, 0.995348, 0.0513393)
bones/18/rotation = Quaternion(-0.0580143, -0.0014095, 0.0404488, 0.997495)
bones/19/rotation = Quaternion(-0.00817251, 0.0457521, 0.0136595, 0.998826)
bones/20/rotation = Quaternion(-0.000314788, 0, 1, 0)
bones/22/rotation = Quaternion(0.000314788, 0, 1, 0)
bones/23/rotation = Quaternion(0.000222673, 0.707107, 0.707107, -0.000222504)
[node name="BoneAttachment3D" type="BoneAttachment3D" parent="PlayerPivot/GfolfGirl/Armature/Skeleton3D" index="6"]
transform = Transform3D(-0.032255, -0.494868, -0.86837, -0.513716, -0.737067, 0.439123, -0.857354, 0.460259, -0.230448, 0.416005, 2.8741, 1.08901)
bone_name = "Hand.L"
bone_idx = 6
[node name="DebugClub" type="MeshInstance3D" parent="PlayerPivot/GfolfGirl/Armature/Skeleton3D/BoneAttachment3D"]
transform = Transform3D(0.941929, 0.139721, 0.305369, -0.2349, 0.92398, 0.301799, -0.239987, -0.356004, 0.903144, 0.235638, 1.63192, -0.18638)
mesh = SubResource("BoxMesh_lxyoo")
skeleton = NodePath("../../../../../..")
[node name="MeshInstance3D" type="MeshInstance3D" parent="PlayerPivot/GfolfGirl/Armature/Skeleton3D/BoneAttachment3D/DebugClub"]
transform = Transform3D(0.9996, 0.0279221, -0.00443532, -0.0279577, 0.999576, -0.0081374, 0.00420608, 0.00825825, 0.999957, -0.250483, 1.65129, -0.00358486)
mesh = SubResource("BoxMesh_akqxt")
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -0.555968, 0, 0.0999683)
[node name="Direction" type="Node3D" parent="."]
unique_name_in_owner = true
@ -696,5 +647,3 @@ grow_vertical = 1
[node name="HUDAnimation" type="AnimationPlayer" parent="ShotUI"]
[connection signal="sleeping_state_changed" from="BallPoint/PhysicsBall" to="." method="_on_physics_ball_sleeping_state_changed"]
[editable path="PlayerPivot/GfolfGirl"]