openfpsz/open-fpsz
1
0
Fork 0
mirror of https://gitlab.com/open-fpsz/open-fpsz.git synced 2026-04-26 23:05:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/broken-player-scene' into 'develop'

Browse source 
Fix broken Player scene missing Spine IK target

See merge request open-fpsz/open-fpsz!52
This commit is contained in:
Squinty 2024-04-19 10:43:00 +00:00
commit d88ce15304
3 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
entities/player/assets/vanguard.tscn
View file

@ -2,9 +2,9 @@
[ext_resource type="PackedScene" uid="uid://4naw661fqmjg" path="res://entities/player/assets/vanguard.glb" id="1_d2ik6"]
[ext_resource type="Script" path="res://entities/player/assets/vanguard.gd" id="2_c22xr"]
[ext_resource type="PackedScene" uid="uid://clq4uym4arpv3" path="res://entities/weapons/space_gun/assets/SpaceGun.glb" id="3_1d68x"]
[ext_resource type="PackedScene" uid="uid://dmkytrpsfbtlh" path="res://entities/weapons/space_gun/assets/SpaceGun.glb" id="3_1d68x"]
[sub_resource type="Animation" id="Animation_mhn14"]
[sub_resource type="Animation" id="Animation_p414c"]
resource_name = "t_pose"
length = 0.0333333
tracks/0/type = "position_3d"
@ -379,7 +379,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.354872, -0.0338185, -0.004324, 0.934293)
[sub_resource type="Animation" id="Animation_qqdab"]
[sub_resource type="Animation" id="Animation_be1cq"]
resource_name = "run_left"
length = 0.5
loop_mode = 1
@ -755,7 +755,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_q80px"]
[sub_resource type="Animation" id="Animation_o8b6w"]
resource_name = "jump_up"
length = 0.533333
tracks/0/type = "position_3d"
@ -1130,7 +1130,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_nq3cu"]
[sub_resource type="Animation" id="Animation_x4g37"]
resource_name = "idle"
length = 2.1
loop_mode = 1
@ -1506,7 +1506,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_wavlm"]
[sub_resource type="Animation" id="Animation_pknyr"]
resource_name = "run_backward"
length = 0.5
loop_mode = 1
@ -1882,7 +1882,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_px8go"]
[sub_resource type="Animation" id="Animation_fwypn"]
resource_name = "run_forward"
length = 0.5
loop_mode = 1
@ -2258,7 +2258,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_3t7lf"]
[sub_resource type="Animation" id="Animation_m61sh"]
resource_name = "run_right"
length = 0.5
loop_mode = 1
@ -2634,7 +2634,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_cwvpf"]
[sub_resource type="Animation" id="Animation_2jwt7"]
resource_name = "death"
length = 2.83333
tracks/0/type = "position_3d"
@ -3009,7 +3009,7 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="Animation" id="Animation_iawti"]
[sub_resource type="Animation" id="Animation_6cy2e"]
resource_name = "jump_loop"
loop_mode = 1
tracks/0/type = "position_3d"
@ -3384,17 +3384,17 @@ tracks/52/interp = 1
tracks/52/loop_wrap = true
tracks/52/keys = PackedFloat32Array(0, 1, 0.624011, -9.44547e-08, 0.04919, 0.779865)
[sub_resource type="AnimationLibrary" id="AnimationLibrary_cfog3"]
[sub_resource type="AnimationLibrary" id="AnimationLibrary_u6bg6"]
_data = {
"death": SubResource("Animation_cwvpf"),
"idle": SubResource("Animation_nq3cu"),
"jump": SubResource("Animation_iawti"),
"jump_up": SubResource("Animation_q80px"),
"run_backward": SubResource("Animation_wavlm"),
"run_forward": SubResource("Animation_px8go"),
"run_left": SubResource("Animation_qqdab"),
"run_right": SubResource("Animation_3t7lf"),
"t_pose": SubResource("Animation_mhn14")
"death": SubResource("Animation_2jwt7"),
"idle": SubResource("Animation_x4g37"),
"jump": SubResource("Animation_6cy2e"),
"jump_up": SubResource("Animation_o8b6w"),
"run_backward": SubResource("Animation_pknyr"),
"run_forward": SubResource("Animation_fwypn"),
"run_left": SubResource("Animation_be1cq"),
"run_right": SubResource("Animation_m61sh"),
"t_pose": SubResource("Animation_p414c")
}
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lw37l"]
@ -3531,7 +3531,7 @@ bones/124/rotation = Quaternion(0.404856, -0.0684155, -0.00791205, 0.911783)
bones/126/rotation = Quaternion(0.379454, -0.0779287, -0.0184118, 0.921739)
[node name="HandAttachment" type="BoneAttachment3D" parent="Node/Skeleton3D" index="0"]
transform = Transform3D(-0.174592, 0.0530693, 0.98321, 0.930948, 0.334134, 0.147277, -0.320708, 0.94103, -0.107742, -0.243063, 1.16434, 0.0953343)
transform = Transform3D(-0.175561, 0.0544393, 0.982962, 0.930342, 0.335686, 0.147572, -0.321933, 0.9404, -0.109581, -0.240578, 1.15696, 0.0953967)
bone_name = "mixamorigRightHand"
bone_idx = 14
@ -3551,7 +3551,7 @@ playback_default_blend_time = 0.2
[node name="AnimationTree" type="AnimationTree" parent="." index="2"]
libraries = {
"": SubResource("AnimationLibrary_cfog3")
"": SubResource("AnimationLibrary_u6bg6")
}
tree_root = SubResource("AnimationNodeBlendTree_1ok7t")
anim_player = NodePath("../AnimationPlayer")

3
entities/player/player.tscn
View file

@ -265,8 +265,9 @@ sensor = NodePath("../Sensor")
[node name="ThirdPerson" type="Node3D" parent="."]
[node name="PlayerMesh" parent="ThirdPerson" instance=ExtResource("2_beyex")]
[node name="PlayerMesh" parent="ThirdPerson" node_paths=PackedStringArray("spine_ik_target_attachment") instance=ExtResource("2_beyex")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0)
spine_ik_target_attachment = NodePath("../../SpringArm3D/SpineIKTarget")
[node name="IFFAttachment" type="Node3D" parent="ThirdPerson"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.27457, 0)

2
environments/default.tres
View file

@ -1,6 +1,6 @@
[gd_resource type="Environment" load_steps=4 format=3 uid="uid://d2ahijqqspw5f"]
[ext_resource type="Texture2D" uid="uid://odwhjbebqfcn" path="res://environments/skyboxes/kloppenheim_06_puresky_2k.exr" id="1_k44rf"]
[ext_resource type="Texture2D" uid="uid://btdbu0qbe1646" path="res://environments/skyboxes/kloppenheim_06_puresky_2k.exr" id="1_k44rf"]
[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_7tawh"]
panorama = ExtResource("1_k44rf")