Update Multiple Resolutions demo for Godot 4.0

gui/multiple_resolutions/README.md

@@ -39,13 +39,13 @@ factor is changed).
 
 Language: GDScript
 
-Renderer: GLES 2
+Renderer: Vulkan
 
 ## Technical notes
 
 The demo works with the following project settings:
 
-- `2d` stretch mode (recommended for most non-pixel art games).
+- `canvas_items` stretch mode (formerly `2d`). Recommended for most non-pixel art games.
 - `expand` stretch aspect (allows support for multiple aspect ratios without
   distortion or black bars).
 - Using a base window size with a 1:1 aspect ratio (`648×648` in this demo).

gui/multiple_resolutions/icon.png.import

@@ -1,35 +1,34 @@
 [remap]
 
 importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+type="CompressedTexture2D"
+uid="uid://cx2c0cunh0e1i"
+path="res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
 source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.ctex"]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
-compress/hdr_mode=0
+compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
 process/fix_alpha_border=true
 process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
 process/normal_map_invert_y=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

gui/multiple_resolutions/main.gd

@@ -8,52 +8,52 @@ var base_window_size = Vector2(ProjectSettings.get_setting("display/window/size/
 
 # These defaults match this demo's project settings. Adjust as needed if adapting this
 # in your own project.
-var stretch_mode = SceneTree.STRETCH_MODE_2D
-var stretch_aspect = SceneTree.STRETCH_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
 
-onready var panel = $Panel
-onready var arc = $Panel/AspectRatioContainer
+@onready var panel = $Panel
+@onready var arc = $Panel/AspectRatioContainer
 
 
 func _ready():
 	# 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.
 	# warning-ignore:return_value_discarded
-	connect("resized", self, "_on_resized")
+	connect("resized", self._on_resized)
 	update_container()
 
 
 func update_container():
 	# The code within this function needs to be run twice to work around an issue with containers
 	# having a 1-frame delay with updates.
-	# Otherwise, `panel.rect_size` returns a value of the previous frame, which results in incorrect
+	# Otherwise, `panel.size` returns a value of the previous frame, which results in incorrect
 	# sizing of the inner AspectRatioContainer when using the Fit to Window setting.
 	for _i in 2:
 		if is_equal_approx(gui_aspect_ratio, -1.0):
 			# Fit to Window. Tell the AspectRatioContainer to use the same aspect ratio as the window,
 			# making the AspectRatioContainer not have any visible effect.
-			arc.ratio = panel.rect_size.aspect()
-			# Apply GUI margin on the AspectRatioContainer's parent (Panel).
-			# This also makes the GUI margin apply on controls located outside the AspectRatioContainer
+			arc.ratio = panel.size.aspect()
+			# Apply GUI offset on the AspectRatioContainer's parent (Panel).
+			# This also makes the GUI offset apply on controls located outside the AspectRatioContainer
 			# (such as the inner side label in this demo).
-			panel.margin_top = gui_margin
-			panel.margin_bottom = -gui_margin
+			panel.offset_top = gui_margin
+			panel.offset_bottom = -gui_margin
 		else:
 			# Constrained aspect ratio.
-			arc.ratio = min(panel.rect_size.aspect(), gui_aspect_ratio)
-			# Adjust top and bottom margins relative to the aspect ratio when it's constrained.
-			# This ensures that GUI margin settings behave exactly as if the window had the
+			arc.ratio = min(panel.size.aspect(), gui_aspect_ratio)
+			# Adjust top and bottom offsets relative to the aspect ratio when it's constrained.
+			# This ensures that GUI offset settings behave exactly as if the window had the
 			# original aspect ratio size.
-			panel.margin_top = gui_margin / gui_aspect_ratio
-			panel.margin_bottom = -gui_margin / gui_aspect_ratio
+			panel.offset_top = gui_margin / gui_aspect_ratio
+			panel.offset_bottom = -gui_margin / gui_aspect_ratio
 
-		panel.margin_left = gui_margin
-		panel.margin_right = -gui_margin
+		panel.offset_left = gui_margin
+		panel.offset_right = -gui_margin
 
 
 func _on_gui_aspect_ratio_item_selected(index):
@@ -81,8 +81,8 @@ func _on_resized():
 
 
 func _on_gui_margin_drag_ended(_value_changed):
-	gui_margin = $"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/GUIMargin/HSlider".value
-	$"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/GUIMargin/Value".text = str(gui_margin)
+	gui_margin = $"Panel/AspectRatioContainer/Panel/CenterContainer/Options/GUIMargin/HSlider".value
+	$"Panel/AspectRatioContainer/Panel/CenterContainer/Options/GUIMargin/Value".text = str(gui_margin)
 	update_container()
 
 
@@ -105,25 +105,25 @@ func _on_window_base_size_item_selected(index):
 		7:  # 1680×720 (21:9)
 			base_window_size = Vector2(1680, 720)
 
-	get_tree().set_screen_stretch(stretch_mode, stretch_aspect, base_window_size, scale_factor)
+	get_viewport().content_scale_size = base_window_size
 	update_container()
 
 
 func _on_window_stretch_mode_item_selected(index):
 	stretch_mode = index
-	get_tree().set_screen_stretch(stretch_mode, stretch_aspect, base_window_size, scale_factor)
+	get_viewport().content_scale_mode = stretch_mode
 
 	# Disable irrelevant options when the stretch mode is Disabled.
-	$"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/WindowBaseSize/OptionButton".disabled = stretch_mode == SceneTree.STRETCH_MODE_DISABLED
-	$"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/WindowStretchAspect/OptionButton".disabled = stretch_mode == SceneTree.STRETCH_MODE_DISABLED
+	$"Panel/AspectRatioContainer/Panel/CenterContainer/Options/WindowBaseSize/OptionButton".disabled = stretch_mode == Window.CONTENT_SCALE_MODE_DISABLED
+	$"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
-	get_tree().set_screen_stretch(stretch_mode, stretch_aspect, base_window_size, scale_factor)
+	get_viewport().content_scale_aspect = stretch_aspect
 
 
 func _on_window_scale_factor_drag_ended(_value_changed):
-	scale_factor = $"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/WindowScaleFactor/HSlider".value
-	$"Panel/AspectRatioContainer/ColorRect/CenterContainer/Options/WindowScaleFactor/Value".text = "%d%%" % (scale_factor * 100)
-	get_tree().set_screen_stretch(stretch_mode, stretch_aspect, base_window_size, scale_factor)
+	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