:recycle: Combine focus and move signal

Make the process more stable.

godot/projector/focus/Focus.gd

@@ -5,6 +5,11 @@ extends Camera2D
 
 signal ended
 
+enum Transit {
+	BEAM,
+	SMOOTH,
+}
+
 @export_group("Tween caracteristics", "tween_")
 @export var tween_is_parallel: bool = false
 
@@ -26,19 +31,40 @@ var target_pos: Vector2 = Vector2.ZERO
 var target_scope: Vector2 = Vector2.ONE
 
 
-func focus_on(pos: Vector2, scalar_scale: float) -> void:
+func focus_on(pos: Vector2, scalar_scale: float, trans: Transit) -> void:
 	target_pos = pos
 	target_scope = Vector2.ONE * scalar_scale
 
+	if Transit.BEAM == trans:
+		_beam_to_focus()
+	elif Transit.SMOOTH == trans:
+		_smooth_transit_to_focus()
+	else:
+		assert(false, "Trans %s is not implemented." % trans)
+
+
+func end() -> void:
+	ended.emit()
+
+
+func get_scope() -> Vector2:
+	return _invert_vector(get_zoom())
 
-func beam_to_focus() -> void:
+
+func set_scope(new_scope: Vector2) -> void:
+	assert(new_scope.x > 0)
+	assert(new_scope.y > 0)
+	set_zoom(_invert_vector(new_scope))
+
+
+func _beam_to_focus() -> void:
 	_abort_ongoing_transit()
 
 	set_position(target_pos)
 	set_scope(target_scope)
 
 
-func transit_to_focus() -> void:
+func _smooth_transit_to_focus() -> void:
 	_abort_ongoing_transit()
 
 	var is_wider = target_scope.x > get_scope().x
@@ -50,20 +76,6 @@ func transit_to_focus() -> void:
 	tween.tween_callback(end)
 
 
-func end() -> void:
-	ended.emit()
-
-
-func get_scope() -> Vector2:
-	return _invert_vector(get_zoom())
-
-
-func set_scope(new_scope: Vector2) -> void:
-	assert(new_scope.x > 0)
-	assert(new_scope.y > 0)
-	set_zoom(_invert_vector(new_scope))
-
-
 func _abort_ongoing_transit() -> void:
 	if tween:
 		tween.kill()
@@ -73,13 +85,5 @@ func _invert_vector(vec: Vector2) -> Vector2:
 	return Vector2(1.0 / vec.x, 1.0 / vec.y)
 
 
-func _on_show_new_focus(pos: Vector2, scalar_scale: float) -> void:
-	focus_on(pos, scalar_scale)
-
-
-func _on_show_fast_move() -> void:
-	beam_to_focus()
-
-
-func _on_show_slow_move() -> void:
-	transit_to_focus()
+func _on_show_new_focus(pos: Vector2, scalar_scale: float, trans: Transit) -> void:
+	focus_on(pos, scalar_scale, trans)

godot/projector/show/Show.gd

@@ -3,9 +3,7 @@ extends Node2D
 # Manage slide cycling
 
 
-signal new_focus(pos: Vector2, scale: float)
-signal slow_move
-signal fast_move
+signal new_focus(pos: Vector2, scale: float, trans: Focus.Transit)
 
 const VOID_SLIDE_ID := -1
 
@@ -28,30 +26,28 @@ func _ready() -> void:
 
 
 func go_slowly_to_next_slide() -> void:
-	_next_slide()
-	slow_move.emit()
+	_next_slide(Focus.Transit.SMOOTH)
 
 
 func go_fast_to_next_slide() -> void:
-	_next_slide()
-	fast_move.emit()
+	_next_slide(Focus.Transit.BEAM)
 
 
-func _next_slide() -> void:
-	_next_slide_at(_next_id())
+func _next_slide(trans: Focus.Transit) -> void:
+	_next_slide_at(_next_id(), trans)
 
 
-func _next_slide_at(next_id: int) -> void:
+func _next_slide_at(next_id: int, trans: Focus.Transit) -> void:
 	_disconnect_current_slide()
 	current_id = next_id
-	current_slide = focus_slide(current_id)
+	current_slide = focus_slide(current_id, trans)
 	_connect_current_slide()
 
 
-func focus_slide(id: int) -> Slide:
+func focus_slide(id: int, trans: Focus.Transit) -> Slide:
 	var slide: Slide = slides[id]
 	slide.focus()
-	new_focus.emit(slide.get_center(), slide.get_scale().x)
+	new_focus.emit(slide.get_center(), slide.get_scale().x, trans)
 	return slide
 
 
@@ -129,8 +125,7 @@ func _unhandled_input(event: InputEvent) -> void:
 				shortest_distance = current_distance
 
 		var next_id = slides.find(nearest_slide)
-		_next_slide_at(next_id)
-		slow_move.emit()
+		_next_slide_at(next_id, Focus.Transit.SMOOTH)
 
 
 func _on_current_slide_finished() -> void:

godot/run/root.tscn

@@ -372,6 +372,4 @@ position = Vector2(17112, 7956)
 [node name="Thanks" parent="Board/Show" instance=ExtResource("78_q2k73")]
 position = Vector2(7930, 3755)
 
-[connection signal="fast_move" from="Board/Show" to="Board/Focus" method="_on_show_fast_move"]
 [connection signal="new_focus" from="Board/Show" to="Board/Focus" method="_on_show_new_focus"]
-[connection signal="slow_move" from="Board/Show" to="Board/Focus" method="_on_show_slow_move"]