teatov/tli
teatov/tli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace animation state machines with blend trees

Browse Source
This commit is contained in:
Teatov 2024-10-22 10:46:20 +10:00
parent 6f34c70848
commit d38d87f0a3
5 changed files with 84 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
scenes/units/abstract/controlled_ant_unit.tscn
View File

@ -1,48 +1,50 @@
[gd_scene load_steps=15 format=3 uid="uid://lbs0vilymbum"] [gd_scene load_steps=14 format=3 uid="uid://lbs0vilymbum"]
[ext_resource type="PackedScene" uid="uid://cidd3q2tet7ku" path="res://scenes/units/abstract/controlled_unit.tscn" id="1_66kao"] [ext_resource type="PackedScene" uid="uid://cidd3q2tet7ku" path="res://scenes/units/abstract/controlled_unit.tscn" id="1_66kao"]
[ext_resource type="Script" path="res://scripts/units/abstract/controlled_ant_unit.gd" id="2_77pj2"] [ext_resource type="Script" path="res://scripts/units/abstract/controlled_ant_unit.gd" id="2_77pj2"]
[ext_resource type="PackedScene" uid="uid://bi231xk2sp410" path="res://assets/models/ant.glb" id="2_e21vo"] [ext_resource type="PackedScene" uid="uid://bi231xk2sp410" path="res://assets/models/ant.glb" id="2_e21vo"]
[ext_resource type="AudioStream" uid="uid://ds7c5gkf1mssj" path="res://assets/audio/units/ant_move.wav" id="4_80pw8"] [ext_resource type="AudioStream" uid="uid://ds7c5gkf1mssj" path="res://assets/audio/units/ant_move.wav" id="4_80pw8"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jem3o"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lip5d"]
animation = &"idle" animation = &"idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f5jro"] [sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_7c5f2"]
animation = &"walk"
[sub_resource type="AnimationNodeBlendSpace1D" id="AnimationNodeBlendSpace1D_0mwos"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_0h55w"]
blend_point_0/node = SubResource("AnimationNodeAnimation_jem3o")
blend_point_0/pos = 0.0
blend_point_1/node = SubResource("AnimationNodeAnimation_f5jro")
blend_point_1/pos = 1.0
min_space = 0.0
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_gnejs"]
animation = &"plop_down" animation = &"plop_down"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_finoi"] [sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_wsc5y"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Body", "Armature/Skeleton3D:Leg_back_mid_L", "Armature/Skeleton3D:Leg_back_mid_R", "Armature/Skeleton3D:Leg_back_root_L", "Armature/Skeleton3D:Leg_back_root_R", "Armature/Skeleton3D:Leg_back_tip_L", "Armature/Skeleton3D:Leg_back_tip_R", "Armature/Skeleton3D:Leg_front_mid_L", "Armature/Skeleton3D:Leg_front_mid_R", "Armature/Skeleton3D:Leg_front_root_L", "Armature/Skeleton3D:Leg_front_root_R", "Armature/Skeleton3D:Leg_front_tip_L", "Armature/Skeleton3D:Leg_front_tip_R", "Armature/Skeleton3D:Leg_mid_mid_L", "Armature/Skeleton3D:Leg_mid_mid_R", "Armature/Skeleton3D:Leg_mid_root_L", "Armature/Skeleton3D:Leg_mid_root_R", "Armature/Skeleton3D:Leg_mid_tip_L", "Armature/Skeleton3D:Leg_mid_tip_R"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3qepx"]
animation = &"plop_up" animation = &"plop_up"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_pwnkm"] [sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_4ftkg"]
advance_mode = 2 filter_enabled = true
filters = ["Armature/Skeleton3D:Body", "Armature/Skeleton3D:Leg_back_mid_L", "Armature/Skeleton3D:Leg_back_mid_R", "Armature/Skeleton3D:Leg_back_root_L", "Armature/Skeleton3D:Leg_back_root_R", "Armature/Skeleton3D:Leg_back_tip_L", "Armature/Skeleton3D:Leg_back_tip_R", "Armature/Skeleton3D:Leg_front_mid_L", "Armature/Skeleton3D:Leg_front_mid_R", "Armature/Skeleton3D:Leg_front_root_L", "Armature/Skeleton3D:Leg_front_root_R", "Armature/Skeleton3D:Leg_front_tip_L", "Armature/Skeleton3D:Leg_front_tip_R", "Armature/Skeleton3D:Leg_mid_mid_L", "Armature/Skeleton3D:Leg_mid_mid_R", "Armature/Skeleton3D:Leg_mid_root_L", "Armature/Skeleton3D:Leg_mid_root_R", "Armature/Skeleton3D:Leg_mid_tip_L", "Armature/Skeleton3D:Leg_mid_tip_R"]
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_67qgu"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_grmq1"]
switch_mode = 2 animation = &"walk"
advance_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_b5tcb"] [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_4gyt5"]
switch_mode = 2 graph_offset = Vector2(-327.784, 80.2142)
advance_mode = 2 nodes/idle_anim/node = SubResource("AnimationNodeAnimation_lip5d")
nodes/idle_anim/position = Vector2(-320, 80)
[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_v8drs"] nodes/locomotion_blend/node = SubResource("AnimationNodeBlend2_7c5f2")
states/locomotion/node = SubResource("AnimationNodeBlendSpace1D_0mwos") nodes/locomotion_blend/position = Vector2(-100, 120)
states/locomotion/position = Vector2(334, 100) nodes/output/position = Vector2(680, 160)
states/plop_down/node = SubResource("AnimationNodeAnimation_gnejs") nodes/plop_down_anim/node = SubResource("AnimationNodeAnimation_0h55w")
states/plop_down/position = Vector2(457, 39) nodes/plop_down_anim/position = Vector2(-40, 360)
states/plop_up/node = SubResource("AnimationNodeAnimation_finoi") nodes/plop_down_oneshot/node = SubResource("AnimationNodeOneShot_wsc5y")
states/plop_up/position = Vector2(499, 90) nodes/plop_down_oneshot/position = Vector2(180, 140)
transitions = ["Start", "locomotion", SubResource("AnimationNodeStateMachineTransition_pwnkm"), "plop_down", "locomotion", SubResource("AnimationNodeStateMachineTransition_67qgu"), "plop_up", "locomotion", SubResource("AnimationNodeStateMachineTransition_b5tcb")] nodes/plop_up_anim/node = SubResource("AnimationNodeAnimation_3qepx")
nodes/plop_up_anim/position = Vector2(260, 400)
nodes/plop_up_oneshot/node = SubResource("AnimationNodeOneShot_4ftkg")
nodes/plop_up_oneshot/position = Vector2(440, 140)
nodes/walk_anim/node = SubResource("AnimationNodeAnimation_grmq1")
nodes/walk_anim/position = Vector2(-320, 220)
node_connections = [&"locomotion_blend", 0, &"idle_anim", &"locomotion_blend", 1, &"walk_anim", &"output", 0, &"plop_up_oneshot", &"plop_down_oneshot", 0, &"locomotion_blend", &"plop_down_oneshot", 1, &"plop_down_anim", &"plop_up_oneshot", 0, &"plop_down_oneshot", &"plop_up_oneshot", 1, &"plop_up_anim"]
[sub_resource type="CylinderShape3D" id="CylinderShape3D_8admi"] [sub_resource type="CylinderShape3D" id="CylinderShape3D_8admi"]
height = 0.5 height = 0.5
@ -96,11 +98,20 @@ visible = false
[node name="NitwitMesh" parent="AntModel/Armature/Skeleton3D" index="1"] [node name="NitwitMesh" parent="AntModel/Armature/Skeleton3D" index="1"]
visible = false visible = false
[node name="AnimationPlayer" parent="AntModel" index="1"]
deterministic = true
[node name="AnimationTree" parent="." index="1"] [node name="AnimationTree" parent="." index="1"]
root_node = NodePath("../AntModel") root_node = NodePath("../AntModel")
tree_root = SubResource("AnimationNodeStateMachine_v8drs") tree_root = SubResource("AnimationNodeBlendTree_4gyt5")
anim_player = NodePath("../AntModel/AnimationPlayer") anim_player = NodePath("../AntModel/AnimationPlayer")
parameters/locomotion/blend_position = 0.023431 parameters/locomotion_blend/blend_amount = 0
parameters/plop_down_oneshot/active = false
parameters/plop_down_oneshot/internal_active = false
parameters/plop_down_oneshot/request = 0
parameters/plop_up_oneshot/active = false
parameters/plop_up_oneshot/internal_active = false
parameters/plop_up_oneshot/request = 0
[node name="CollisionShape3D" parent="." index="2"] [node name="CollisionShape3D" parent="." index="2"]
shape = SubResource("CylinderShape3D_8admi") shape = SubResource("CylinderShape3D_8admi")

56
scenes/units/aphid.tscn
View File

@ -1,39 +1,39 @@
[gd_scene load_steps=13 format=3 uid="uid://bw8cabkva3k4f"] [gd_scene load_steps=12 format=3 uid="uid://bw8cabkva3k4f"]
[ext_resource type="PackedScene" uid="uid://c70vx0utm5knp" path="res://scenes/units/abstract/unit.tscn" id="1_ghhpv"] [ext_resource type="PackedScene" uid="uid://c70vx0utm5knp" path="res://scenes/units/abstract/unit.tscn" id="1_ghhpv"]
[ext_resource type="Script" path="res://scripts/units/aphid.gd" id="2_c6sy4"] [ext_resource type="Script" path="res://scripts/units/aphid.gd" id="2_c6sy4"]
[ext_resource type="PackedScene" uid="uid://ch02ae8fj2lhh" path="res://assets/models/aphid.glb" id="2_vtmi4"] [ext_resource type="PackedScene" uid="uid://ch02ae8fj2lhh" path="res://assets/models/aphid.glb" id="2_vtmi4"]
[ext_resource type="AudioStream" uid="uid://bqt1xdorarhoi" path="res://assets/audio/units/aphid_move.wav" id="5_f4mon"] [ext_resource type="AudioStream" uid="uid://bqt1xdorarhoi" path="res://assets/audio/units/aphid_move.wav" id="5_f4mon"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f1f0e"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_vr4bn"]
animation = &"idle" animation = &"idle"
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mfl87"] [sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_6hdai"]
animation = &"walk"
[sub_resource type="AnimationNodeBlendSpace1D" id="AnimationNodeBlendSpace1D_lgt8u"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_la1j2"]
blend_point_0/node = SubResource("AnimationNodeAnimation_f1f0e")
blend_point_0/pos = 0.0
blend_point_1/node = SubResource("AnimationNodeAnimation_mfl87")
blend_point_1/pos = 1.0
min_space = 0.0
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_vx1kl"]
animation = &"plop" animation = &"plop"
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_17r08"] [sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_qspit"]
advance_mode = 2 filter_enabled = true
filters = ["Armature/Skeleton3D:Root"]
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_vqilr"] [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_g6qll"]
switch_mode = 2 animation = &"walk"
advance_mode = 2
[sub_resource type="AnimationNodeStateMachine" id="AnimationNodeStateMachine_38sa4"] [sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_a3xja"]
states/locomotion/node = SubResource("AnimationNodeBlendSpace1D_lgt8u") graph_offset = Vector2(-418.868, 27.0018)
states/locomotion/position = Vector2(333, 100) nodes/idle_anim/node = SubResource("AnimationNodeAnimation_vr4bn")
states/plop/node = SubResource("AnimationNodeAnimation_vx1kl") nodes/idle_anim/position = Vector2(-180, 100)
states/plop/position = Vector2(468, 47) nodes/locomotion_blend/node = SubResource("AnimationNodeBlend2_6hdai")
transitions = ["Start", "locomotion", SubResource("AnimationNodeStateMachineTransition_17r08"), "plop", "locomotion", SubResource("AnimationNodeStateMachineTransition_vqilr")] nodes/locomotion_blend/position = Vector2(20, 140)
nodes/output/position = Vector2(500, 160)
nodes/plop_anim/node = SubResource("AnimationNodeAnimation_la1j2")
nodes/plop_anim/position = Vector2(100, 380)
nodes/plop_oneshot/node = SubResource("AnimationNodeOneShot_qspit")
nodes/plop_oneshot/position = Vector2(300, 220)
nodes/walk_anim/node = SubResource("AnimationNodeAnimation_g6qll")
nodes/walk_anim/position = Vector2(-180, 260)
node_connections = [&"locomotion_blend", 0, &"idle_anim", &"locomotion_blend", 1, &"walk_anim", &"output", 0, &"plop_oneshot", &"plop_oneshot", 0, &"locomotion_blend", &"plop_oneshot", 1, &"plop_anim"]
[sub_resource type="SphereShape3D" id="SphereShape3D_t1vrx"] [sub_resource type="SphereShape3D" id="SphereShape3D_t1vrx"]
radius = 0.3 radius = 0.3
@ -55,11 +55,17 @@ bones/13/rotation = Quaternion(-0.235443, -0.235445, 0.666758, 0.666758)
bones/14/rotation = Quaternion(-0.235443, -0.235445, 0.666758, 0.666758) bones/14/rotation = Quaternion(-0.235443, -0.235445, 0.666758, 0.666758)
bones/15/scale = Vector3(1, 1, 1) bones/15/scale = Vector3(1, 1, 1)
[node name="AnimationPlayer" parent="AphidModel" index="1"]
deterministic = true
[node name="AnimationTree" parent="." index="1"] [node name="AnimationTree" parent="." index="1"]
root_node = NodePath("../AphidModel") root_node = NodePath("../AphidModel")
tree_root = SubResource("AnimationNodeStateMachine_38sa4") tree_root = SubResource("AnimationNodeBlendTree_a3xja")
anim_player = NodePath("../AphidModel/AnimationPlayer") anim_player = NodePath("../AphidModel/AnimationPlayer")
parameters/locomotion/blend_position = 0 parameters/locomotion_blend/blend_amount = 0.0
parameters/plop_oneshot/active = false
parameters/plop_oneshot/internal_active = false
parameters/plop_oneshot/request = 0
[node name="CollisionShape3D" parent="." index="2"] [node name="CollisionShape3D" parent="." index="2"]
shape = SubResource("SphereShape3D_t1vrx") shape = SubResource("SphereShape3D_t1vrx")

5
scripts/units/abstract/unit.gd
View File

@ -24,9 +24,6 @@ var _advance_anim_delta_accum: float = 0
@onready var nav_agent: NavigationAgent3D = $NavigationAgent3D @onready var nav_agent: NavigationAgent3D = $NavigationAgent3D
@onready var ui_origin: Node3D = $UiOrigin @onready var ui_origin: Node3D = $UiOrigin
@onready var animation_tree: AnimationTree = $AnimationTree @onready var animation_tree: AnimationTree = $AnimationTree
@onready var animation_playback: AnimationNodeStateMachinePlayback = (
animation_tree.get("parameters/playback")
)
@onready var anim_advance_indicator: VisualInstance3D = $AnimAdvanceIndicator @onready var anim_advance_indicator: VisualInstance3D = $AnimAdvanceIndicator
@onready var visibility_notifier: VisibleOnScreenNotifier3D = ( @onready var visibility_notifier: VisibleOnScreenNotifier3D = (
$VisibleOnScreenNotifier3D $VisibleOnScreenNotifier3D
@ -116,7 +113,7 @@ func _handle_animation(delta: float) -> void:
velocity.length() / _move_speed, velocity.length() / _move_speed,
delta * LOCOMOTION_CHANGE_SPEED delta * LOCOMOTION_CHANGE_SPEED
) )
animation_tree.set("parameters/locomotion/blend_position", _locomotion_value) animation_tree["parameters/locomotion_blend/blend_amount"] = _locomotion_value
_advance_anim_delta_accum += delta _advance_anim_delta_accum += delta

4
scripts/units/aphid.gd
View File

@ -88,7 +88,9 @@ func _handle_honeydew_spawn(delta: float) -> void:
_put_honeydew(new_honeydew) _put_honeydew(new_honeydew)
audio_player.play_sound(SoundManager.aphid_poop()) audio_player.play_sound(SoundManager.aphid_poop())
animation_playback.travel("plop") animation_tree["parameters/plop_oneshot/request"] = (
AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE
)
_set_spawn_timer() _set_spawn_timer()

8
scripts/units/components/gathering.gd
View File

@ -146,7 +146,9 @@ func _pick_up() -> void:
_get_nth_pile_pos(_carrying_items.size() - 1) _get_nth_pile_pos(_carrying_items.size() - 1)
).tween_finished ).tween_finished
audio_player.play_sound(SoundManager.pop()) audio_player.play_sound(SoundManager.pop())
_unit.animation_playback.travel("plop_down") _unit.animation_tree["parameters/plop_down_oneshot/request"] = (
AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE
)
await get_tree().create_timer(_pickup_interval).timeout await get_tree().create_timer(_pickup_interval).timeout
@ -171,7 +173,9 @@ func _deposit() -> void:
return return
var item := _carrying_items.pop_back() as Honeydew var item := _carrying_items.pop_back() as Honeydew
_unit.animation_playback.travel("plop_up") _unit.animation_tree["parameters/plop_up_oneshot/request"] = (
AnimationNodeOneShot.ONE_SHOT_REQUEST_FIRE
)
audio_player.play_sound(SoundManager.swoosh()) audio_player.play_sound(SoundManager.swoosh())
await item.start_tweening( await item.start_tweening(