Update scripts to conform to the GDScript style guide

This commit is contained in:
Aaron Franke
2020-01-22 22:02:07 -05:00
parent 9fbdda6648
commit feb6a6e657
10 changed files with 363 additions and 454 deletions

View File

@@ -1,53 +1,45 @@
extends Spatial
# class member variables go here, for example:
# var a = 2
# var b = "textvar"
func _ready():
pass
func _on_play_pressed():
$ui/main.hide()
$ui/loading.show()
$begin_load_timer.start()
func _on_settings_pressed():
$ui/main.hide()
$ui/settings.show()
if (settings.gi_quality == settings.GI_QUALITY_HIGH):
if settings.gi_quality == settings.GIQuality.HIGH:
$ui/settings/gi_high.pressed=true
elif (settings.gi_quality == settings.GI_QUALITY_LOW):
elif settings.gi_quality == settings.GIQuality.LOW:
$ui/settings/gi_low.pressed=true
elif (settings.gi_quality == settings.GI_QUALITY_DISABLED):
elif settings.gi_quality == settings.GIQuality.DISABLED:
$ui/settings/gi_disabled.pressed=true
if (settings.aa_quality == settings.AA_8X):
if settings.aa_quality == settings.AAQuality.AA_8X:
$ui/settings/aa_8x.pressed=true
elif (settings.aa_quality == settings.AA_4X):
elif settings.aa_quality == settings.AAQuality.AA_4X:
$ui/settings/aa_4x.pressed=true
elif (settings.aa_quality == settings.AA_2X):
elif settings.aa_quality == settings.AAQuality.AA_2X:
$ui/settings/aa_2x.pressed=true
elif (settings.aa_quality == settings.AA_DISABLED):
elif settings.aa_quality == settings.AAQuality.AA_DISABLED:
$ui/settings/aa_disabled.pressed=true
if (settings.ssao_quality == settings.SSAO_QUALITY_HIGH):
if settings.ssao_quality == settings.SSAOQuality.HIGH:
$ui/settings/ssao_high.pressed=true
elif (settings.ssao_quality == settings.SSAO_QUALITY_LOW):
elif settings.ssao_quality == settings.SSAOQuality.LOW:
$ui/settings/ssao_low.pressed=true
elif (settings.ssao_quality == settings.SSAO_QUALITY_DISABLED):
elif settings.ssao_quality == settings.SSAOQuality.DISABLED:
$ui/settings/ssao_disabled.pressed=true
if (settings.resolution == settings.RESOLUTION_NATIVE):
if settings.resolution == settings.Resolution.NATIVE:
$ui/settings/resolution_native.pressed = true
elif (settings.resolution == settings.RESOLUTION_1080):
elif settings.resolution == settings.Resolution.RES_1080:
$ui/settings/resolution_1080.pressed = true
elif (settings.resolution == settings.RESOLUTION_720):
elif settings.resolution == settings.Resolution.RES_720:
$ui/settings/resolution_720.pressed = true
elif (settings.resolution == settings.RESOLUTION_576):
elif settings.resolution == settings.Resolution.RES_576:
$ui/settings/resolution_576.pressed = true
@@ -59,44 +51,46 @@ func _on_apply_pressed():
$ui/main.show()
$ui/settings.hide()
if($ui/settings/gi_high.pressed):
settings.gi_quality = settings.GI_QUALITY_HIGH
elif($ui/settings/gi_low.pressed):
settings.gi_quality = settings.GI_QUALITY_LOW
elif($ui/settings/gi_disabled.pressed):
settings.gi_quality = settings.GI_QUALITY_DISABLED
if($ui/settings/aa_8x.pressed):
settings.aa_quality = settings.AA_8X
elif($ui/settings/aa_4x.pressed):
settings.aa_quality = settings.AA_4X
elif($ui/settings/aa_2x.pressed):
settings.aa_quality = settings.AA_2X
elif($ui/settings/aa_disabled.pressed):
settings.aa_quality = settings.AA_DISABLED
if($ui/settings/ssao_high.pressed):
settings.ssao_quality = settings.SSAO_QUALITY_HIGH
elif($ui/settings/ssao_low.pressed):
settings.ssao_quality = settings.SSAO_QUALITY_LOW
elif($ui/settings/ssao_disabled.pressed):
settings.ssao_quality = settings.SSAO_QUALITY_DISABLED
if($ui/settings/resolution_native.pressed):
settings.resolution = settings.RESOLUTION_NATIVE
elif($ui/settings/resolution_1080.pressed):
settings.resolution = settings.RESOLUTION_1080
elif($ui/settings/resolution_720.pressed):
settings.resolution = settings.RESOLUTION_720
elif($ui/settings/resolution_576.pressed):
settings.resolution = settings.RESOLUTION_576
if $ui/settings/gi_high.pressed:
settings.gi_quality = settings.GIQuality.HIGH
elif $ui/settings/gi_low.pressed:
settings.gi_quality = settings.GIQuality.LOW
elif $ui/settings/gi_disabled.pressed:
settings.gi_quality = settings.GIQuality.DISABLED
if $ui/settings/aa_8x.pressed:
settings.aa_quality = settings.AAQuality.AA_8X
elif $ui/settings/aa_4x.pressed:
settings.aa_quality = settings.AAQuality.AA_4X
elif $ui/settings/aa_2x.pressed:
settings.aa_quality = settings.AAQuality.AA_2X
elif $ui/settings/aa_disabled.pressed:
settings.aa_quality = settings.AAQuality.AA_DISABLED
if $ui/settings/ssao_high.pressed:
settings.ssao_quality = settings.SSAOQuality.HIGH
elif $ui/settings/ssao_low.pressed:
settings.ssao_quality = settings.SSAOQuality.LOW
elif $ui/settings/ssao_disabled.pressed:
settings.ssao_quality = settings.SSAOQuality.DISABLED
if $ui/settings/resolution_native.pressed:
settings.resolution = settings.Resolution.NATIVE
elif $ui/settings/resolution_1080.pressed:
settings.resolution = settings.Resolution.RES_1080
elif $ui/settings/resolution_720.pressed:
settings.resolution = settings.Resolution.RES_720
elif $ui/settings/resolution_576.pressed:
settings.resolution = settings.Resolution.RES_576
settings.save_settings()
func _on_cancel_pressed():
$ui/main.show()
$ui/settings.hide()
func _on_begin_load_timer_timeout():
#warning-ignore:return_value_discarded
get_tree().change_scene("res://level/level.tscn")

View File

@@ -617,7 +617,6 @@ text = "Loading..."
[node name="begin_load_timer" type="Timer" parent="."]
wait_time = 0.2
[connection signal="pressed" from="ui/main/play" to="." method="_on_play_pressed"]
[connection signal="pressed" from="ui/main/settings" to="." method="_on_settings_pressed"]
[connection signal="pressed" from="ui/main/quit" to="." method="_on_quit_pressed"]

View File

@@ -1,69 +1,68 @@
extends Node
# class member variables go here, for example:
# var a = 2
# var b = "textvar"
enum GIQuality {
DISABLED = 0
LOW = 1
HIGH = 2
}
const GI_QUALITY_HIGH = 2
const GI_QUALITY_LOW = 1
const GI_QUALITY_DISABLED = 0
enum AAQuality {
DISABLED = 0
AA_2X = 1
AA_4X = 2
AA_8X = 3
}
const AA_8X = 3
const AA_4X = 2
const AA_2X = 1
const AA_DISABLED = 0
enum SSAOQuality {
DISABLED = 0
LOW = 1
HIGH = 2
}
const SSAO_QUALITY_HIGH = 2
const SSAO_QUALITY_LOW = 1
const SSAO_QUALITY_DISABLED = 0
enum Resolution {
RES_576 = 0
RES_720 = 1
RES_1080 = 2
NATIVE = 3
}
const RESOLUTION_NATIVE = 3
const RESOLUTION_1080 = 2
const RESOLUTION_720 = 1
const RESOLUTION_576 = 0
var gi_quality = GIQuality.LOW
var aa_quality = AAQuality.AA_2X
var ssao_quality = SSAOQuality.DISABLED
var resolution = Resolution.NATIVE
var gi_quality = GI_QUALITY_LOW
var aa_quality = AA_2X
var ssao_quality = SSAO_QUALITY_DISABLED
var resolution = RESOLUTION_NATIVE
func load_settings():
var f = File.new()
var error = f.open("user://settings.json", File.READ)
if (error):
print("no settings to load..")
return
var d = parse_json( f.get_as_text() )
if (typeof(d)!=TYPE_DICTIONARY):
return
if ("gi" in d):
gi_quality = int(d.gi)
if ("aa" in d):
aa_quality = int(d.aa)
if ("ssao" in d):
ssao_quality = int(d.ssao)
if ("resolution" in d):
resolution = int(d.resolution)
func save_settings():
var f = File.new()
var error = f.open("user://settings.json", File.WRITE)
assert( not error )
var d = { "gi":gi_quality, "aa":aa_quality, "ssao":ssao_quality, "resolution":resolution }
f.store_line( to_json(d) )
func _ready():
load_settings()
#func _process(delta):
# # Called every frame. Delta is time since last frame.
# # Update game logic here.
# pass
func load_settings():
var f = File.new()
var error = f.open("user://settings.json", File.READ)
if error:
print("There are no settings to load.")
return
var d = parse_json(f.get_as_text())
if typeof(d) != TYPE_DICTIONARY:
return
if "gi" in d:
gi_quality = int(d.gi)
if "aa" in d:
aa_quality = int(d.aa)
if "ssao" in d:
ssao_quality = int(d.ssao)
if "resolution" in d:
resolution = int(d.resolution)
func save_settings():
var f = File.new()
var error = f.open("user://settings.json", File.WRITE)
assert(not error)
var d = { "gi":gi_quality, "aa":aa_quality, "ssao":ssao_quality, "resolution":resolution }
f.store_line(to_json(d))