refactor: remove cruft variables in ComparisonSort

The `active` and `done` variables were unnecessary and replaced with
calls to `Node::set_process_input`.

Author: danielzting

levels/comparison_sort.gd

@@ -13,8 +13,6 @@ const EFFECTS = {
 const DISABLE_TIME = 1.0
 
 var array: ArrayModel
-var active = true
-var done = false
 var moves = 0
 
 var _timer = Timer.new()
@@ -28,10 +26,11 @@ func _init(array):
     self.connect("mistake", self, "_on_ComparisonSort_mistake")
     self.connect("done", self, "_on_ComparisonSort_done")
 
+func _ready():
+    set_process_input(false)
+
 func _input(event):
     """Pass input events for checking and take appropriate action."""
-    if done or not active:
-        return
     if event.is_pressed():
         moves += 1
         return next(event.as_text())
@@ -40,20 +39,14 @@ func next(action):
     """Check the action and advance state or emit signal as needed."""
     push_error("NotImplementedError")
 
-func get_effect(i):
-    return get_effect(i)
-
-func _get_effect(i):
-    push_error("NotImplementedError")
-
 func _on_ComparisonSort_done():
-    done = true
+    set_process_input(false)
 
 func _on_ComparisonSort_mistake():
     """Disable the controls for one second."""
-    active = false
+    set_process_input(false)
     _timer.start(DISABLE_TIME)
 
 func _on_Timer_timeout():
     """Reenable the controls."""
-    active = true
+    set_process_input(true)

scripts/levels.gd

@@ -74,7 +74,6 @@ func _on_Button_focus_entered(size=_level.array.size):
         $Timer.start()
         set_process_input(true)
     _level = _get_level(get_focus_owner().text).new(ArrayModel.new(size))
-    _level.active = false
     $Preview/InfoBorder/Info/About.text = _cleanup(_level.ABOUT)
     $Preview/InfoBorder/Info/Controls.text = _cleanup(_level.CONTROLS)
     # Start over when simulation is finished

scripts/menu.gd

@@ -5,7 +5,6 @@ var _level = BogoSort.new(ArrayModel.new())
 func _ready():
     $Buttons/Start.grab_focus()
     randomize()
-    _level.active = false
     $Display.add_child(ArrayView.new(_level))
 
 func _on_Start_pressed():

scripts/play.gd

@@ -18,6 +18,7 @@ func _on_Timer_timeout():
         GlobalScene.get_param("size", ArrayModel.DEFAULT_SIZE)))
     level.connect("done", self, "_on_Level_done", [level])
     $Display.add_child(ArrayView.new(level))
+    level.set_process_input(true)
 
 func get_score():
     return stepify((OS.get_ticks_msec() - _start_time) / 1000.0, 0.001)

views/array_view.gd

@@ -14,14 +14,16 @@ var _tween = Tween.new()
 var _level: ComparisonSort
 var _rects = []
 var _positions = []
-var _pointer = null
+var _pointer = Polygon2D.new()
 var _pointer_size: int
 onready var _separation = 128 / _level.array.size
 
 func _init(level):
     _level = level
     add_child(_level) # NOTE: This is necessary for it to read input
     add_child(_tween) # NOTE: This is necessary for it to animate
+    add_child(_pointer)
+    _pointer.hide()
 
 func _ready():
     yield(get_tree(), "idle_frame")
@@ -32,6 +34,7 @@ func _ready():
     var accumulated = 0
     var x = 0
     _level.connect("mistake", get_parent(), "flash")
+    _level.connect("done", self, "_on_ComparisonSort_done")
     var width = unit_width - _separation
     var height = rect_size.y - _pointer_size * 2
     for i in range(_level.array.size):
@@ -53,28 +56,29 @@ func _ready():
         add_child(rect)
     _level.array.connect("swapped", self, "_on_ArrayModel_swapped")
     if _level.has_method("get_pointer"):
-        _pointer = Polygon2D.new()
         _pointer.polygon = [
             Vector2(width / 2, _pointer_size),
             Vector2(width / 2 - _pointer_size, 0),
             Vector2(width / 2 + _pointer_size, 0),
         ]
         _pointer.color = GlobalTheme.BLUE
-        add_child(_pointer)
+        _pointer.show()
 
 func _process(delta):
-    if _pointer != null:
+    if _pointer.visible:
         var pointed = _level.get_pointer()
         var height = rect_size.y - _pointer_size * 2
         _pointer.position = Vector2(_rects[pointed].position.x,
             height - _level.array.frac(pointed) * height)
-        if _level.done:
-            _pointer.queue_free()
     for i in range(_rects.size()):
-        if _level.done:
-            _rects[i].color = ComparisonSort.EFFECTS.NONE
-        else:
-            _rects[i].color = _level.get_effect(i)
+        _rects[i].color = _level.get_effect(i)
+        _rects[i].scale.y = -_level.array.frac(i)
+
+func _on_ComparisonSort_done():
+    set_process(false)
+    _pointer.hide()
+    for i in range(_rects.size()):
+        _rects[i].color = ComparisonSort.EFFECTS.NONE
         _rects[i].scale.y = -_level.array.frac(i)
 
 func _on_ArrayModel_swapped(i, j):