Commit e5b0a7d

committed

refactor: rename sound_toggled, remove big preview

Due to extreme difficulties of implementation, big preview mode has been canceled.

1 parent 49db1dc commit e5b0a7dCopy full SHA for e5b0a7d

File tree

3 files changed

+16

-19

lines changed

project.godot
scenes
- menu.tscn
views
- array_sound.gd

3 files changed

+16

-19

lines changed

`‎project.godot‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ smaller={`
`192`	`192`	`"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)`
`193`	`193`	`]`
`194`	`194`	`}`
`195`		`-sound_toggle={`
	`195`	`+sound={`
`196`	`196`	`"deadzone": 0.5,`
`197`	`197`	`"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)`
`198`	`198`	`]`

`‎scenes/menu.tscn‎`

Lines changed: 14 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,58 +42,55 @@ __meta__ = {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[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`
`50`	`49`	`size_flags_horizontal = 4`
`51`	`50`	`size_flags_vertical = 4`
`52`	`51`	`script = ExtResource( 3 )`
`53`	`52`
`54`	`53`	`[node name="Instructions" type="VBoxContainer" parent="MainMenu/Display/InstructionsContainer"]`
`55`	`54`	`margin_left = 20.0`
`56`	`55`	`margin_top = 20.0`
`57`		`-margin_right = 200.0`
`58`		`-margin_bottom = 228.0`
	`56`	`+margin_right = 160.0`
	`57`	`+margin_bottom = 206.0`
`59`	`58`	`custom_constants/separation = 16`
`60`	`59`
`61`	`60`	`[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`
`64`	`63`	`custom_constants/separation = 20`
`65`	`64`
`66`	`65`	`[node name="Keys" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]`
`67`	`66`	`margin_right = 50.0`
`68`		`-margin_bottom = 173.0`
	`67`	`+margin_bottom = 151.0`
`69`	`68`	`size_flags_horizontal = 4`
`70`	`69`	`text = "W`
`71`	`70`	`A`
`72`	`71`	`S`
`73`	`72`	`D`
`74`	`73`	`M`
`75`		`-F`
`76`	`74`	`space`
`77`	`75`	`esc"`
`78`	`76`
`79`	`77`	`[node name="Actions" type="Label" parent="MainMenu/Display/InstructionsContainer/Instructions/Controls"]`
`80`	`78`	`margin_left = 70.0`
`81`		`-margin_right = 180.0`
`82`		`-margin_bottom = 173.0`
	`79`	`+margin_right = 140.0`
	`80`	`+margin_bottom = 151.0`
`83`	`81`	`text = "bigger`
`84`	`82`	`slower`
`85`	`83`	`smaller`
`86`	`84`	`faster`
`87`	`85`	`sound`
`88`		`-big preview`
`89`	`86`	`confirm`
`90`	`87`	`back"`
`91`	`88`	`align = 2`
`92`	`89`
`93`	`90`	`[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`
`97`	`94`	`text = "OK"`
`98`	`95`
`99`	`96`	`[node name="Spacing" type="Control" parent="MainMenu"]`

`‎views/array_sound.gd‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func triangle(x):`
`32`	`32`	`return 2 / PI * asin(sin(PI * x))`
`33`	`33`
`34`	`34`	`func _input(event):`
`35`		`- if event.is_action_pressed("sound_toggle"):`
	`35`	`+ if event.is_action_pressed("sound"):`
`36`	`36`	`# Prevent event from propagating to ComparisonSort trigger`
`37`	`37`	`get_tree().set_input_as_handled()`
`38`	`38`	`var bus = AudioServer.get_bus_index("Master")`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e5b0a7d

File tree

3 files changed

3 files changed

`‎project.godot‎`

`‎scenes/menu.tscn‎`

`‎views/array_sound.gd‎`

0 commit comments