CodingPirates/godot-demo-projects
1
0
Fork 0
mirror of https://github.com/godotengine/godot-demo-projects.git synced 2026-01-04 15:00:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use static typing in all demos (#1063)

Browse Source 
This leads to code that is easier to understand and runs
faster thanks to GDScript's typed instructions.

The untyped declaration warning is now enabled on all projects
where type hints were added. All projects currently run without
any untyped declration warnings.

Dodge the Creeps and Squash the Creeps demos intentionally don't
use type hints to match the documentation, where type hints haven't
been adopted yet (given its beginner focus).
This commit is contained in:
Hugo Locurcio
2024-06-01 12:12:18 +02:00
committed by GitHub
parent 8e9c180278
commit bac1e69164
498 changed files with 5218 additions and 4776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gui/multiple_resolutions/main.gd
View File

@@ -4,25 +4,24 @@
# (with their rect spread across the whole viewport, and Anchor set to Full Rect).
extends Control
var base_window_size = Vector2(
var base_window_size := Vector2(
ProjectSettings.get_setting("display/window/size/viewport_width"),
ProjectSettings.get_setting("display/window/size/viewport_height")
)
# These defaults match this demo's project settings. Adjust as needed if adapting this
# in your own project.
var stretch_mode = Window.CONTENT_SCALE_MODE_CANVAS_ITEMS
var stretch_aspect = Window.CONTENT_SCALE_ASPECT_EXPAND
var stretch_mode := Window.CONTENT_SCALE_MODE_CANVAS_ITEMS
var stretch_aspect := Window.CONTENT_SCALE_ASPECT_EXPAND
var scale_factor = 1.0
var gui_aspect_ratio = -1.0
var gui_margin = 0.0
var scale_factor := 1.0
var gui_aspect_ratio := -1.0
var gui_margin := 0.0
@onready var panel = $Panel
@onready var arc = $Panel/AspectRatioContainer
@onready var panel: Panel = $Panel
@onready var arc: AspectRatioContainer = $Panel/AspectRatioContainer
func _ready():
func _ready() -> void:
# The `resized` signal will be emitted when the window size changes, as the root Control node
# is resized whenever the window size changes. This is because the root Control node
# uses a Full Rect anchor, so its size will always be equal to the window size.
@@ -30,7 +29,7 @@ func _ready():
update_container.call_deferred()
func update_container():
func update_container() -> void:
# The code within this function needs to be run deferred to work around an issue with containers
# having a 1-frame delay with updates.
# Otherwise, `panel.size` returns a value of the previous frame, which results in incorrect
@@ -58,7 +57,7 @@ func update_container():
panel.offset_right = -gui_margin
func _on_gui_aspect_ratio_item_selected(index):
func _on_gui_aspect_ratio_item_selected(index: int) -> void:
match index:
0: # Fit to Window
gui_aspect_ratio = -1.0
@@ -78,17 +77,17 @@ func _on_gui_aspect_ratio_item_selected(index):
update_container.call_deferred()
func _on_resized():
func _on_resized() -> void:
update_container.call_deferred()
func _on_gui_margin_drag_ended(_value_changed):
func _on_gui_margin_drag_ended(_value_changed: bool) -> void:
gui_margin = $"Panel/AspectRatioContainer/Panel/CenterContainer/Options/GUIMargin/HSlider".value
$"Panel/AspectRatioContainer/Panel/CenterContainer/Options/GUIMargin/Value".text = str(gui_margin)
update_container.call_deferred()
func _on_window_base_size_item_selected(index):
func _on_window_base_size_item_selected(index: int) -> void:
match index:
0: # 648×648 (1:1)
base_window_size = Vector2(648, 648)
@@ -111,8 +110,8 @@ func _on_window_base_size_item_selected(index):
update_container.call_deferred()
func _on_window_stretch_mode_item_selected(index):
stretch_mode = index
func _on_window_stretch_mode_item_selected(index: int) -> void:
stretch_mode = index as Window.ContentScaleMode
get_viewport().content_scale_mode = stretch_mode
# Disable irrelevant options when the stretch mode is Disabled.
@@ -120,12 +119,12 @@ func _on_window_stretch_mode_item_selected(index):
$"Panel/AspectRatioContainer/Panel/CenterContainer/Options/WindowStretchAspect/OptionButton".disabled = stretch_mode == Window.CONTENT_SCALE_MODE_DISABLED
func _on_window_stretch_aspect_item_selected(index):
stretch_aspect = index
func _on_window_stretch_aspect_item_selected(index: int) -> void:
stretch_aspect = index as Window.ContentScaleAspect
get_viewport().content_scale_aspect = stretch_aspect
func _on_window_scale_factor_drag_ended(_value_changed):
func _on_window_scale_factor_drag_ended(_value_changed: bool) -> void:
scale_factor = $"Panel/AspectRatioContainer/Panel/CenterContainer/Options/WindowScaleFactor/HSlider".value
$"Panel/AspectRatioContainer/Panel/CenterContainer/Options/WindowScaleFactor/Value".text = "%d%%" % (scale_factor * 100)
get_viewport().content_scale_factor = scale_factor

4
gui/multiple_resolutions/project.godot
View File

@@ -33,6 +33,10 @@ config/features=PackedStringArray("4.2")
run/low_processor_mode=true
config/icon="res://icon.webp"
[debug]
gdscript/warnings/untyped_declaration=1
[display]
window/size/viewport_width=648