feat: fill in placeholder preview displays

Added bogo sort to the main menu and level previews to level selection.

Author: danielzting

levels/bogo_sort.gd

@@ -0,0 +1,14 @@
+extends ComparisonSort
+class_name BogoSort
+
+func _init(array).(array):
+	pass
+
+func check(action):
+	return true
+
+func next():
+	array = ArrayModel.new(array.size)
+
+func emphasized(i):
+	return false

models/array_model.gd

@@ -9,21 +9,21 @@ var array = []
 var size
 
 func _init(size):
-	for i in range(1, size + 1):
-		array.append(i)
-	array.shuffle()
-	self.size = size
+    for i in range(1, size + 1):
+        array.append(i)
+    array.shuffle()
+    self.size = size
 
 func get(i):
-	return array[i]
+    return array[i]
 
 func is_sorted():
-	for i in range(size - 1):
-		if array[i] > array[i + 1]:
-			return false
-	return true
+    for i in range(size - 1):
+        if array[i] > array[i + 1]:
+            return false
+    return true
 
 func swap(i, j):
-	var temp = array[i]
-	array[i] = array[j]
-	array[j] = temp
+    var temp = array[i]
+    array[i] = array[j]
+    array[j] = temp

project.godot

@@ -20,6 +20,11 @@ _global_script_classes=[ {
 "path": "res://views/array_view.gd"
 }, {
 "base": "ComparisonSort",
+"class": "BogoSort",
+"language": "GDScript",
+"path": "res://levels/bogo_sort.gd"
+}, {
+"base": "ComparisonSort",
 "class": "BubbleSort",
 "language": "GDScript",
 "path": "res://levels/bubble_sort.gd"
@@ -32,6 +37,7 @@ _global_script_classes=[ {
 _global_script_class_icons={
 "ArrayModel": "",
 "ArrayView": "",
+"BogoSort": "",
 "BubbleSort": "",
 "ComparisonSort": ""
 }

scenes/levels.tscn

@@ -35,28 +35,39 @@ margin_top = 20.0
 margin_right = 460.0
 margin_bottom = 1000.0
 
-[node name="PreviewBorder" type="MarginContainer" parent="LevelSelect"]
+[node name="Preview" type="VBoxContainer" parent="LevelSelect"]
 margin_left = 488.0
 margin_right = 1860.0
 margin_bottom = 1020.0
 size_flags_horizontal = 3
+
+[node name="Display" type="MarginContainer" parent="LevelSelect/Preview"]
+margin_right = 1372.0
+margin_bottom = 640.0
+rect_min_size = Vector2( 0, 640 )
 script = ExtResource( 3 )
 
-[node name="Preview" type="VBoxContainer" parent="LevelSelect/PreviewBorder"]
+[node name="Placeholder" type="Control" parent="LevelSelect/Preview/Display"]
 margin_left = 20.0
 margin_top = 20.0
 margin_right = 1352.0
-margin_bottom = 1000.0
-size_flags_horizontal = 3
-
-[node name="Display" type="Control" parent="LevelSelect/PreviewBorder/Preview"]
-margin_right = 1332.0
-margin_bottom = 640.0
-rect_min_size = Vector2( 0, 640 )
+margin_bottom = 620.0
 
-[node name="Info" type="Label" parent="LevelSelect/PreviewBorder/Preview"]
+[node name="InfoBorder" type="MarginContainer" parent="LevelSelect/Preview"]
 margin_top = 648.0
-margin_right = 1332.0
-margin_bottom = 686.0
-size_flags_horizontal = 3
+margin_right = 1372.0
+margin_bottom = 1020.0
+size_flags_vertical = 3
+script = ExtResource( 3 )
+
+[node name="Info" type="Label" parent="LevelSelect/Preview/InfoBorder"]
+margin_left = 20.0
+margin_top = 20.0
+margin_right = 1352.0
+margin_bottom = 352.0
+size_flags_vertical = 1
 autowrap = true
+
+[node name="Timer" type="Timer" parent="."]
+autostart = true
+[connection signal="timeout" from="Timer" to="LevelSelect" method="_on_Timer_timeout"]

scenes/menu.tscn

@@ -2,8 +2,7 @@
 
 [ext_resource path="res://scripts/menu.gd" type="Script" id=1]
 [ext_resource path="res://assets/theme.theme" type="Theme" id=2]
-
-[sub_resource type="StyleBoxEmpty" id=1]
+[ext_resource path="res://scripts/border.gd" type="Script" id=3]
 
 [node name="Viewport" type="MarginContainer"]
 anchor_left = 0.000711028
@@ -32,19 +31,32 @@ margin_bottom = 38.0
 text = "Human Computer Simulator"
 uppercase = true
 
-[node name="Display" type="Control" parent="MainMenu"]
+[node name="Display" type="MarginContainer" parent="MainMenu"]
 margin_top = 46.0
 margin_right = 1839.0
-margin_bottom = 973.0
+margin_bottom = 965.0
 size_flags_vertical = 3
+script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Spacing" type="Control" parent="MainMenu"]
+margin_top = 973.0
+margin_right = 1839.0
+margin_bottom = 973.0
 
 [node name="StartButton" type="Button" parent="MainMenu"]
 margin_left = 872.0
 margin_top = 981.0
 margin_right = 967.0
 margin_bottom = 1019.0
 size_flags_horizontal = 4
-custom_styles/focus = SubResource( 1 )
 text = "start"
 flat = true
+
+[node name="Timer" type="Timer" parent="."]
+wait_time = 0.25
+autostart = true
 [connection signal="pressed" from="MainMenu/StartButton" to="MainMenu" method="_on_StartButton_pressed"]
+[connection signal="timeout" from="Timer" to="MainMenu" method="_on_Timer_timeout"]

scripts/end.gd

@@ -1,8 +1,8 @@
 extends VBoxContainer
 
 func _ready():
-	$Score.text = str(scene.get_param("score"))
-	$Button.grab_focus()
+    $Score.text = str(scene.get_param("score"))
+    $Button.grab_focus()
 
 func _on_Button_pressed():
-	scene.change_scene("res://scenes/levels.tscn")
+    scene.change_scene("res://scenes/levels.tscn")

scripts/levels.gd

@@ -1,25 +1,44 @@
 extends HBoxContainer
 
-var levels
+var levels: Dictionary
+var level
 
 func _ready():
-	var descriptions = File.new()
-	descriptions.open("res://assets/levels.json", descriptions.READ)
-	levels = parse_json(descriptions.get_as_text())
-	var first = true
-	for level in levels:
-		var button = Button.new()
-		button.text = level
-		button.align = Button.ALIGN_LEFT
-		button.connect("focus_entered", self, "_on_Button_focus_changed")
-		button.connect("pressed", self, "_on_Button_pressed", [level])
-		$LevelsBorder/Levels.add_child(button)
-		if first:
-			button.grab_focus()
-			first = false
+    # Load level data
+    var descriptions = File.new()
+    descriptions.open("res://assets/levels.json", descriptions.READ)
+    levels = parse_json(descriptions.get_as_text())
+    # Dynamically add buttons
+    for level in levels:
+        var button = Button.new()
+        button.text = level
+        button.align = Button.ALIGN_LEFT
+        button.connect("focus_entered", self, "_on_Button_focus_changed")
+        button.connect("pressed", self, "_on_Button_pressed", [level])
+        $LevelsBorder/Levels.add_child(button)
+    # Automatically focus on first button
+    $LevelsBorder/Levels.get_child(0).grab_focus()
 
 func _on_Button_focus_changed():
-	$PreviewBorder/Preview/Info.text = levels[get_focus_owner().text]["about"]
+    var name = get_focus_owner().text
+    $Preview/InfoBorder/Info.text = levels[name]["about"]
+    level = get_level(name).new(ArrayModel.new(10))
+    level.active = false
+    # Start over when simulation is finished
+    level.connect("done", self, "_on_Button_focus_changed")
+    # Replace old display with new
+    for child in $Preview/Display.get_children():
+        child.queue_free()
+    $Preview/Display.add_child(ArrayView.new(level))
 
 func _on_Button_pressed(level):
-	scene.change_scene("res://scenes/play.tscn", {"level": level})
+    scene.change_scene("res://scenes/play.tscn",
+                      {"name": level, "level": get_level(level)})
+
+func get_level(level):
+    match level:
+        "BUBBLE SORT":
+            return BubbleSort
+
+func _on_Timer_timeout():
+    level.next()

scripts/menu.gd

@@ -1,7 +1,13 @@
 extends VBoxContainer
 
+var level = BogoSort.new(ArrayModel.new(10))
+
 func _ready():
-	$StartButton.grab_focus()
+    $StartButton.grab_focus()
+    $Display.add_child(ArrayView.new(level))
 
 func _on_StartButton_pressed():
-	scene.change_scene("res://scenes/levels.tscn")
+    scene.change_scene("res://scenes/levels.tscn")
+
+func _on_Timer_timeout():
+    level.next()

scripts/play.gd

@@ -3,29 +3,24 @@ extends VBoxContainer
 var start_time = -1
 
 func _ready():
-	$HUDBorder/HUD/Level.text = scene.get_param("level")
+    $HUDBorder/HUD/Level.text = scene.get_param("name")
 
 func _process(delta):
-	if start_time >= 0:
-		$HUDBorder/HUD/Score.text = "%.3f" % get_score()
+    if start_time >= 0:
+        $HUDBorder/HUD/Score.text = "%.3f" % get_score()
 
 func _on_Timer_timeout():
-	start_time = OS.get_ticks_msec()
-	# Delete ready text
-	$DisplayBorder/Label.queue_free()
-	# Load level
-	var array = ArrayModel.new(10)
-	var level = getLevel(scene.get_param("level")).new(array)
-	level.connect("done", self, "_on_Level_done")
-	$DisplayBorder.add_child(ArrayView.new(level))
-
-func getLevel(level):
-	match level:
-		"BUBBLE SORT":
-			return BubbleSort
+    start_time = OS.get_ticks_msec()
+    # Delete ready text
+    $DisplayBorder/Label.queue_free()
+    # Load level
+    var array = ArrayModel.new(10)
+    var level = scene.get_param("level").new(array)
+    level.connect("done", self, "_on_Level_done")
+    $DisplayBorder.add_child(ArrayView.new(level))
 
 func get_score():
-	return stepify((OS.get_ticks_msec() - start_time) / 1000.0, 0.001)
+    return stepify((OS.get_ticks_msec() - start_time) / 1000.0, 0.001)
 
 func _on_Level_done():
-	scene.change_scene("res://scenes/end.tscn", {"score": get_score()})
+    scene.change_scene("res://scenes/end.tscn", {"score": get_score()})

scripts/scene.gd

@@ -3,10 +3,10 @@ extends Node
 var _params = null
 
 func change_scene(next_scene, params=null):
-	_params = params
-	get_tree().change_scene(next_scene)
+    _params = params
+    get_tree().change_scene(next_scene)
 
 func get_param(name):
-	if _params != null and _params.has(name):
-		return _params[name]
-	return null
+    if _params != null and _params.has(name):
+        return _params[name]
+    return null

views/array_view.gd

@@ -8,21 +8,22 @@ var level
 var rects = []
 
 func _init(level):
-	level.connect("mistake", self, "_on_Level_mistake")
-	add_child(level)
-	self.level = level
-	for i in range(level.array.size):
-		var rect = ColorRect.new()
-		rect.size_flags_horizontal = Control.SIZE_EXPAND_FILL
-		rect.size_flags_vertical = Control.SIZE_SHRINK_END
-		rects.append(rect)
-		add_child(rect)
+    level.connect("mistake", self, "_on_Level_mistake")
+    add_child(level)
+    self.level = level
+    for i in range(level.array.size):
+        var rect = ColorRect.new()
+        rect.size_flags_horizontal = Control.SIZE_EXPAND_FILL
+        rect.size_flags_vertical = Control.SIZE_SHRINK_END
+        rects.append(rect)
+        add_child(rect)
 
 func _process(delta):
-	for i in range(level.array.size):
-		rects[i].rect_scale.y = -1 # Override parent Control scale
-		rects[i].color = ORANGE if level.emphasized(i) else GREEN
-		rects[i].rect_size.y = rect_size.y * level.array.get(i) / level.array.size
+    for i in range(level.array.size):
+        rects[i].rect_scale.y = -1 # Override parent Control scale
+        rects[i].color = ORANGE if level.emphasized(i) else GREEN
+        var frac = float(level.array.get(i)) / level.array.size
+        rects[i].rect_size.y = rect_size.y * frac
 
 func _on_Level_mistake():
-	get_parent().flash()
+    get_parent().flash()