From 359f9402bcc8a4e2bb2cd8eb18c8a6574053fed2 Mon Sep 17 00:00:00 2001 From: teatov Date: Thu, 27 Feb 2025 03:11:08 +1000 Subject: [PATCH] externalize player override animations --- resources/animations/player_animations.tres | 37 +++++++++++++++++ scenes/player.tscn | 45 +++------------------ 2 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 resources/animations/player_animations.tres diff --git a/resources/animations/player_animations.tres b/resources/animations/player_animations.tres new file mode 100644 index 0000000..746fcb5 --- /dev/null +++ b/resources/animations/player_animations.tres @@ -0,0 +1,37 @@ +[gd_resource type="AnimationLibrary" load_steps=3 format=3 uid="uid://81cl401rtu7a"] + +[sub_resource type="Animation" id="Animation_ni72j"] +resource_name = "+idle_L" +length = 1.2 +loop_mode = 1 +tracks/0/type = "animation" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Model/AnimationPlayer") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"clips": PackedStringArray("+idle_L"), +"times": PackedFloat32Array(0) +} + +[sub_resource type="Animation" id="Animation_tn82g"] +resource_name = "+idle_R" +length = 1.2 +loop_mode = 1 +tracks/0/type = "animation" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Model/AnimationPlayer") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"clips": PackedStringArray("+idle_R"), +"times": PackedFloat32Array(0) +} + +[resource] +_data = { +"+idle_L": SubResource("Animation_ni72j"), +"+idle_R": SubResource("Animation_tn82g") +} diff --git a/scenes/player.tscn b/scenes/player.tscn index 36159de..94697e4 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=3 uid="uid://b73y71y3efmv"] +[gd_scene load_steps=31 format=3 uid="uid://b73y71y3efmv"] [ext_resource type="Script" path="res://scripts/player/player.gd" id="1_xt3i8"] [ext_resource type="Material" uid="uid://cc18ee0wbfoud" path="res://resources/materials/debug/debug_player.tres" id="2_0p422"] @@ -7,46 +7,11 @@ [ext_resource type="Script" path="res://scripts/player/player_animator.gd" id="4_adlgp"] [ext_resource type="Script" path="res://scripts/effects/discrete_animation_player.gd" id="4_i3gf3"] [ext_resource type="Material" uid="uid://bdi02rpvdukem" path="res://resources/materials/debug/debug_attack.tres" id="4_ll2ct"] +[ext_resource type="AnimationLibrary" uid="uid://81cl401rtu7a" path="res://resources/animations/player_animations.tres" id="5_y0ods"] [ext_resource type="Script" path="res://scripts/effects/bone_to_flatten.gd" id="6_cumn2"] [ext_resource type="Script" path="res://scripts/effects/bone_flattener.gd" id="6_iug5b"] [ext_resource type="PackedScene" uid="uid://c8gqrealje3o" path="res://scenes/effects/shadow_decal.tscn" id="9_vgb3d"] -[sub_resource type="Animation" id="Animation_ni72j"] -resource_name = "+idle_L" -length = 1.2 -loop_mode = 1 -tracks/0/type = "animation" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Model/AnimationPlayer") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": PackedStringArray("+idle_L"), -"times": PackedFloat32Array(0) -} - -[sub_resource type="Animation" id="Animation_tn82g"] -resource_name = "+idle_R" -length = 1.2 -loop_mode = 1 -tracks/0/type = "animation" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Model/AnimationPlayer") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"clips": PackedStringArray("+idle_R"), -"times": PackedFloat32Array(0) -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_0haon"] -_data = { -"+idle_L": SubResource("Animation_ni72j"), -"+idle_R": SubResource("Animation_tn82g") -} - [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_tes4q"] animation = &"+idle_L" @@ -156,7 +121,7 @@ bones/6/rotation = Quaternion(-0.0323581, 2.46001e-07, 8.00608e-09, 0.999476) bones/7/rotation = Quaternion(0.123965, -2.40098e-07, -2.92456e-09, 0.992287) bones/7/scale = Vector3(1, 1, 1) bones/8/rotation = Quaternion(-0.0917916, -2.67583e-15, 2.18848e-08, 0.995778) -bones/9/position = Vector3(-0.0738634, 0.0117958, 0.0815997) +bones/9/position = Vector3(-0.074, 0.011816, 0.0814253) bones/9/rotation = Quaternion(1.15202e-07, 0.707107, 0.707107, -5.33851e-08) bones/9/scale = Vector3(1, 1, 1) bones/21/rotation = Quaternion(0.19747, 0.678974, 0.678974, -0.19747) @@ -170,7 +135,7 @@ bones/45/scale = Vector3(1, 1, 1) bones/46/rotation = Quaternion(-0.0181733, 2.38379e-07, 1.14098e-08, 0.999835) bones/47/rotation = Quaternion(-1.20807e-07, 0.993087, -0.117383, 7.85287e-07) bones/49/rotation = Quaternion(-0.034235, -3.57418e-07, 8.86969e-08, 0.999414) -bones/50/rotation = Quaternion(-0.0863678, -0.701812, -0.701812, 0.0863678) +bones/50/rotation = Quaternion(-0.0339231, -0.706293, -0.706293, 0.0339231) bones/51/rotation = Quaternion(0.403888, -2.98082e-07, -3.85178e-07, 0.914808) bones/51/scale = Vector3(1, 1, 1) bones/52/rotation = Quaternion(-0.512846, 3.82068e-07, 4.27952e-07, 0.858481) @@ -301,7 +266,7 @@ script = ExtResource("4_i3gf3") [node name="OverrideAnimationPlayer" type="AnimationPlayer" parent="."] libraries = { -"": SubResource("AnimationLibrary_0haon") +"": ExtResource("5_y0ods") } [node name="AnimationTree" type="AnimationTree" parent="." node_paths=PackedStringArray("player")]