diff --git a/assets/models/characters/batrix.glb b/assets/models/characters/batrix.glb index 63005fb..3d14fef 100644 --- a/assets/models/characters/batrix.glb +++ b/assets/models/characters/batrix.glb @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58a709e125b8da488eae0e79df1ddc6c1cc28931d999f4c68bfa2f75c220bb97 +oid sha256:906aec2060c968ce41a9b1624a57e1d410563215aa499910873b8d3c8cce93ef size 704784 diff --git a/scenes/player.tscn b/scenes/player.tscn index acfb395..36159de 100644 --- a/scenes/player.tscn +++ b/scenes/player.tscn @@ -1,15 +1,52 @@ -[gd_scene load_steps=30 format=3 uid="uid://b73y71y3efmv"] +[gd_scene load_steps=33 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"] [ext_resource type="Script" path="res://scripts/player/player_attack.gd" id="3_8pbtx"] [ext_resource type="PackedScene" uid="uid://b4q85h3ndkh5u" path="res://assets/models/characters/batrix.glb" id="3_ld2i8"] [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="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" @@ -105,9 +142,6 @@ radius = 2.0 height = 2.0 is_hemisphere = true -[sub_resource type="BoxMesh" id="BoxMesh_ti743"] -size = Vector3(5.005, 1, 5.935) - [node name="Player" type="CharacterBody3D"] collision_layer = 16 script = ExtResource("1_xt3i8") @@ -122,7 +156,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.0690518, 0.0111183, 0.0874259) +bones/9/position = Vector3(-0.0738634, 0.0117958, 0.0815997) 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) @@ -136,7 +170,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.20044, -0.678103, -0.678103, 0.20044) +bones/50/rotation = Quaternion(-0.0863678, -0.701812, -0.701812, 0.0863678) 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) @@ -263,11 +297,16 @@ cast_shadow = 0 [node name="AnimationPlayer" parent="Model" index="1"] autoplay = "RESET" +script = ExtResource("4_i3gf3") + +[node name="OverrideAnimationPlayer" type="AnimationPlayer" parent="."] +libraries = { +"": SubResource("AnimationLibrary_0haon") +} [node name="AnimationTree" type="AnimationTree" parent="." node_paths=PackedStringArray("player")] -root_node = NodePath("../Model") tree_root = SubResource("AnimationNodeBlendTree_f4bn3") -anim_player = NodePath("../Model/AnimationPlayer") +anim_player = NodePath("../OverrideAnimationPlayer") parameters/StateMachine/conditions/side_L = false parameters/StateMachine/conditions/side_R = false script = ExtResource("4_adlgp") @@ -314,8 +353,4 @@ mesh = SubResource("SphereMesh_kqbjh") [node name="ShadowDecal" parent="." instance=ExtResource("9_vgb3d")] size = Vector3(1.5, 6, 1.5) -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.590721, 0) -mesh = SubResource("BoxMesh_ti743") - [editable path="Model"]