Skip to content

Commit e5b0a7d

Browse files
committed
refactor: rename sound_toggled, remove big preview
Due to extreme difficulties of implementation, big preview mode has been canceled.
1 parent 49db1dc commit e5b0a7d

File tree

3 files changed

+16
-19
lines changed

3 files changed

+16
-19
lines changed

project.godot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ smaller={
192192
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null)
193193
]
194194
}
195-
sound_toggle={
195+
sound={
196196
"deadzone": 0.5,
197197
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":77,"unicode":0,"echo":false,"script":null)
198198
]

scenes/menu.tscn

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,58 +42,55 @@ __meta__ = {
4242
}
4343

4444
[node name="InstructionsContainer" type="MarginContainer" parent="MainMenu/Display"]
45-
visible = false
46-
margin_left = 489.0
47-
margin_top = 175.0
48-
margin_right = 709.0
49-
margin_bottom = 423.0
45+
margin_left = 509.0
46+
margin_top = 186.0
47+
margin_right = 689.0
48+
margin_bottom = 412.0
5049
size_flags_horizontal = 4
5150
size_flags_vertical = 4
5251
script = ExtResource( 3 )
5352

5453
[node name="Instructions" type="VBoxContainer" parent="MainMenu/Display/InstructionsContainer"]
5554
margin_left = 20.0
5655
margin_top = 20.0
57-
margin_right = 200.0
58-
margin_bottom = 228.0
56+
margin_right = 160.0
57+
margin_bottom = 206.0
5958
custom_constants/separation = 16
6059

6160
[node name="Controls" type="HBoxContainer" parent="MainMenu/Display/InstructionsContainer/Instructions"]
62-
margin_right = 180.0
63-
margin_bottom = 173.0
61+
margin_right = 140.0
62+
margin_bottom = 151.0
6463
custom_constants/separation = 20
6564

6665
[node name="Keys" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]
6766
margin_right = 50.0
68-
margin_bottom = 173.0
67+
margin_bottom = 151.0
6968
size_flags_horizontal = 4
7069
text = "W
7170
A
7271
S
7372
D
7473
M
75-
F
7674
space
7775
esc"
7876

7977
[node name="Actions" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]
8078
margin_left = 70.0
81-
margin_right = 180.0
82-
margin_bottom = 173.0
79+
margin_right = 140.0
80+
margin_bottom = 151.0
8381
text = "bigger
8482
slower
8583
smaller
8684
faster
8785
sound
88-
big preview
8986
confirm
9087
back"
9188
align = 2
9289

9390
[node name="Button" type="Button" parent="MainMenu/Display/InstructionsContainer/Instructions"]
94-
margin_top = 189.0
95-
margin_right = 180.0
96-
margin_bottom = 208.0
91+
margin_top = 167.0
92+
margin_right = 140.0
93+
margin_bottom = 186.0
9794
text = "OK"
9895

9996
[node name="Spacing" type="Control" parent="MainMenu"]

views/array_sound.gd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func triangle(x):
3232
return 2 / PI * asin(sin(PI * x))
3333

3434
func _input(event):
35-
if event.is_action_pressed("sound_toggle"):
35+
if event.is_action_pressed("sound"):
3636
# Prevent event from propagating to ComparisonSort trigger
3737
get_tree().set_input_as_handled()
3838
var bus = AudioServer.get_bus_index("Master")

0 commit comments

Comments
 (0)