Vaillant Jeremy
60d9f614ee
Two of the five autoloads were stateless helper bundles, not the
persistent application-wide systems that the Godot 4 best-practice
guide reserves autoload slots for. Convert them to plain classes with
all-static methods so they no longer need a Node living under /root.
- scripts/Animation.gd -> scripts/game_animation.gd (renamed:
conflict with the built-in Animation class; the autoload sidestepped
it by being called GlobalAnimation). class_name GameAnimation,
every helper static. The dissolve tween now captures its target
material in a lambda closure, eliminating the current_material
member that the autoload kept as shared mutable state.
- scripts/Event.gd -> scripts/event.gd, class_name Event, every
handler static. Added Event.level_pressed(name) -> Callable for the
one place ChooseScene needed dynamic lookup of a per-level handler
(replaces the old _build_method('_on_' + name + '_pressed') +
Callable(autoload, string) reflection trick with an explicit match).
Updated call sites:
- scripts/Global.gd: animation.connect('animation_started',
Callable(Event, '...')) -> animation.animation_started.connect(
Event._loading_is_started). Same for animation_finished.
- scenes/levels/Levels.gd: GlobalAnimation.* -> GameAnimation.*;
Quit/TextureButton.connect('pressed', Callable(Event, '...')) ->
pressed.connect(Event._on_main_scene_pressed).
- scenes/UI/choose_scenes/ChooseScene.gd: per-level button connects
go through Event.level_pressed(); reset button's bound callable now
reads Event._on_reset_level.bind(...); cleanup no longer relies on
is_connected with an unbound Callable (which would never match a
bound one anyway) -- iterates reset.pressed.get_connections()
instead. Drop the now-dead _build_method helper.
Also: organise scripts/ by promoting the one-shot migration helpers
(migrate_shaders, migrate_misc, resave_scenes, devisualize_shaders,
find_visualshaders) into scripts/migration/. They are not part of
the runtime and should not be browsable next to the autoloads.
Autoload count goes 5 -> 3 (Loading, Global, Setting remain --
Setting will move to a Resource in a later refactor).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
38 lines
1.9 KiB
GDScript
38 lines
1.9 KiB
GDScript
class_name GameAnimation
|
|
|
|
# Helpers for HUD slide/warning animations and the per-item dissolve effect.
|
|
# Pure functions — no state — so no autoload is needed.
|
|
|
|
static func level_hud_slide(node: Node) -> Animation:
|
|
var animation := Animation.new()
|
|
var track_index := animation.add_track(Animation.TYPE_BEZIER)
|
|
animation.track_set_path(track_index, str(node.get_path()) + ":position:x")
|
|
animation.bezier_track_insert_key(track_index, 0.0, 0.0, Vector2(-0.25, 0), Vector2(0.031, 190.492))
|
|
animation.bezier_track_insert_key(track_index, 1.0, 170, Vector2(-0.349, 2.576), Vector2(0.25, 0))
|
|
return animation
|
|
|
|
static func level_hud_warning(node: Node) -> Animation:
|
|
var animation := Animation.new()
|
|
var track_index := animation.add_track(Animation.TYPE_BEZIER)
|
|
animation.track_set_path(track_index, str(node.get_path()) + ":position:x")
|
|
animation.bezier_track_insert_key(track_index, 0.0, 0.0, Vector2(-0.25, 0), Vector2(0, 78.1))
|
|
animation.bezier_track_insert_key(track_index, 0.2, 34.9, Vector2(-0.25, 0), Vector2(0, -66))
|
|
animation.bezier_track_insert_key(track_index, 0.4, 12.1, Vector2(0, 73.2), Vector2(0, -124.8))
|
|
animation.bezier_track_insert_key(track_index, 0.6, -41.9, Vector2(-0.095, 109.2), Vector2(0.062, -58.8))
|
|
animation.bezier_track_insert_key(track_index, 0.8, 13.3, Vector2(-0.188, 93.6), Vector2(0.196, 104.4))
|
|
animation.bezier_track_insert_key(track_index, 1.0, 0.0, Vector2(-0.155, -135.5), Vector2(0.25, 0))
|
|
return animation
|
|
|
|
# Captures `material` in the tween callback so no shared mutable state is
|
|
# needed (replaces the old `current_material` member from the autoload).
|
|
static func start_dissolve(node: Node, material: ShaderMaterial) -> void:
|
|
if material == null:
|
|
return
|
|
var tween := node.create_tween()
|
|
tween.tween_method(
|
|
func(progress: float) -> void:
|
|
material.set_shader_parameter("dissolve_amount", ease(progress, 0.4)),
|
|
0.0, 1.0, 1.5) \
|
|
.set_trans(Tween.TRANS_LINEAR) \
|
|
.set_ease(Tween.EASE_IN_OUT)
|