From 6d99d8af1bc6da558867703297787385e40f9996 Mon Sep 17 00:00:00 2001 From: teatov Date: Tue, 8 Oct 2024 01:53:51 +1000 Subject: [PATCH] rename `AnimAdvanceIndicator` --- scenes/units/abstract/unit.tscn | 4 +++- scripts/units/unit.gd | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scenes/units/abstract/unit.tscn b/scenes/units/abstract/unit.tscn index c3a1cb7..582f03c 100644 --- a/scenes/units/abstract/unit.tscn +++ b/scenes/units/abstract/unit.tscn @@ -43,5 +43,7 @@ aabb = AABB(-0.25, 0, -0.25, 0.5, 0.5, 0.5) [node name="UiOrigin" type="Marker3D" parent="."] -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +[node name="AnimAdvanceIndicator" type="MeshInstance3D" parent="."] +transform = Transform3D(0.438547, 0, 0, 0, 0.438547, 0, 0, 0, 0.438547, 0, 0.906638, 0) +visible = false mesh = SubResource("BoxMesh_hvf81") diff --git a/scripts/units/unit.gd b/scripts/units/unit.gd index 08b674c..bc8d270 100644 --- a/scripts/units/unit.gd +++ b/scripts/units/unit.gd @@ -20,6 +20,7 @@ var advance_anim_delta_accum: float = 0 @onready var nav_agent: NavigationAgent3D = $NavigationAgent3D @onready var ui_origin: Node3D = $UiOrigin @onready var animation_tree: AnimationTree = $AnimationTree +@onready var anim_advance_indicator: VisualInstance3D = $AnimAdvanceIndicator @onready var visibility_notifier: VisibleOnScreenNotifier3D = ( $VisibleOnScreenNotifier3D ) @@ -32,8 +33,10 @@ func _ready() -> void: assert(visibility_notifier != null, "visibility_notifier missing!") assert(ui_origin != null, "ui_origin missing!") assert(main_camera != null, "main_camera missing!") + assert(anim_advance_indicator != null, "anim_advance_indicator missing!") super._ready() + anim_advance_indicator.visible = false if spawn_pos != null and spawn_pos != Vector3.ZERO: global_position = spawn_pos @@ -107,9 +110,8 @@ func _animate(delta: float) -> void: SelectionManager.advance_anim_step ) var frame := Engine.get_frames_drawn() - var ass: MeshInstance3D = $MeshInstance3D var advance := (frame + get_instance_id()) % advance_anim_step == 0 - ass.visible = advance and DebugManager.enabled + anim_advance_indicator.visible = advance and DebugManager.enabled if advance: animation_tree.advance(advance_anim_delta_accum) advance_anim_delta_accum = 0