Skip to content

Commit ffda4d8

Browse files
MewPurPursyntaxerror247
MewPurPur
authored and
syntaxerror247
committed
Migrate to Godot 4.6
1 parent 397d094 commit ffda4d8

14 files changed

Lines changed: 54 additions & 48 deletions

‎.github/disabled_classes.gdbuild‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
2-
"disabled_build_options": {
3-
4-
},
2+
"disabled_build_options": {},
53
"disabled_classes": [
64
"AESContext",
75
"AStar2D",
@@ -85,6 +83,7 @@
8583
"GLTFTextureSampler",
8684
"Geometry2D",
8785
"Geometry3D",
86+
"GodotInstance",
8887
"Gradient",
8988
"GradientTexture1D",
9089
"GradientTexture2D",
@@ -102,6 +101,7 @@
102101
"JavaClass",
103102
"JavaClassWrapper",
104103
"JavaObject",
104+
"JointLimitation3D",
105105
"KinematicCollision2D",
106106
"KinematicCollision3D",
107107
"LabelSettings",
@@ -136,7 +136,9 @@
136136
"NavigationPathQueryResult3D",
137137
"NavigationPolygon",
138138
"NavigationServer2D",
139+
"NavigationServer2DManager",
139140
"NavigationServer3D",
141+
"NavigationServer3DManager",
140142
"NinePatchRect",
141143
"Node2D",
142144
"Node3D",
@@ -158,6 +160,9 @@
158160
"OpenXRIPBinding",
159161
"OpenXRInteractionProfile",
160162
"OpenXRInteractionProfileMetadata",
163+
"OpenXRSpatialCapabilityConfigurationBaseHeader",
164+
"OpenXRSpatialComponentData",
165+
"OpenXRStructureBase",
161166
"OptimizedTranslation",
162167
"OptionButton",
163168
"PCKPacker",
@@ -232,6 +237,7 @@
232237
"ScriptLanguage",
233238
"Semaphore",
234239
"ShaderGlobalsOverride",
240+
"ShaderIncludeDB",
235241
"Shape2D",
236242
"Shape3D",
237243
"Shortcut",
@@ -242,14 +248,14 @@
242248
"SkinReference",
243249
"Sky",
244250
"Slider",
251+
"SocketServer",
245252
"SpinBox",
246253
"SpriteFrames",
247254
"StatusIndicator",
248255
"StreamPeer",
249256
"SubtweenTweener",
250257
"SurfaceTool",
251258
"SystemFont",
252-
"TCPServer",
253259
"TLSOptions",
254260
"TextParagraph",
255261
"TextServerExtension",
@@ -266,7 +272,6 @@
266272
"TileSet",
267273
"TileSetSource",
268274
"TranslationDomain",
269-
"TranslationPO",
270275
"Tree",
271276
"TreeItem",
272277
"TriangleMesh",

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ env:
1111
# Which godot version to use for exporting.
1212
GODOT_VERSION: 4.6
1313
# Which godot release to use for exporting. (stable/rc/beta/alpha)
14-
GODOT_RELEASE: beta2
14+
GODOT_RELEASE: stable
1515
# Used in the editor config file name. Do not change this for patch releases.
1616
GODOT_FEATURE_VERSION: 4.6
1717
# Commit hash
18-
GODOT_COMMIT_HASH: 551ce8d47feda9c81c870314745366b24957624b
18+
GODOT_COMMIT_HASH: 89cea143987d564363e15d207438530651d943ac
1919
PROJECT_NAME: VectorTouch
2020
BUILD_TYPE: ${{ github.event_name == 'workflow_dispatch' && 'release' || 'debug' }}
21-
BUILD_OPTIONS: lto=full production=yes deprecated=no minizip=no brotli=no vulkan=no openxr=no use_volk=no disable_3d=yes disable_physics_2d=yes disable_navigation_2d=yes modules_enabled_by_default=no module_freetype_enabled=yes module_gdscript_enabled=yes module_svg_enabled=yes module_jpg_enabled=yes module_text_server_adv_enabled=yes graphite=no module_webp_enabled=yes module_mbedtls_enabled=yes swappy=no build_profile=../vectortouch/.github/disabled_classes.gdbuild
21+
BUILD_OPTIONS: lto=full production=yes deprecated=no minizip=no d3d12=no brotli=no vulkan=no openxr=no use_volk=no disable_3d=yes disable_physics_2d=yes disable_navigation_2d=yes modules_enabled_by_default=no module_freetype_enabled=yes module_gdscript_enabled=yes module_svg_enabled=yes module_jpg_enabled=yes module_text_server_adv_enabled=yes graphite=no module_webp_enabled=yes module_mbedtls_enabled=yes swappy=no build_profile=../vectortouch/.github/disabled_classes.gdbuild
2222
GODOT_REPO: https://github.com/godotengine/godot.git
2323

2424
jobs:

‎assets/fonts/BoldFont.tres‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_resource type="FontVariation" load_steps=4 format=3 uid="uid://o6egawwljhgy"]
1+
[gd_resource type="FontVariation" format=3 uid="uid://o6egawwljhgy"]
22

33
[ext_resource type="FontFile" uid="uid://cdke2b8vyur24" path="res://assets/fonts/original/NotoSans-ExtraBold.woff2" id="1_c6ro6"]
44
[ext_resource type="FontFile" uid="uid://jkpbay57t50t" path="res://assets/fonts/original/DroidSansFallback.woff2" id="2_5dil2"]

‎godot_only/scripts/tests.gd‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Run with Ctrl+Shift+X.
22
# A script intended to test sensitive parts of the codebase.
3-
# This isn't an invitation to add random tests, please discuss before doing so.
3+
# This is reserved to things that are easy to test and fairly implementation-agnostic.
4+
# It isn't an invitation to add random tests, please discuss before doing so.
45
@tool
56
extends EditorScript
67

@@ -10,7 +11,7 @@ func _run() -> void:
1011
pathdata_tests()
1112
transform_list_tests()
1213
if report.is_empty():
13-
print_rich("[rainbow sat=0.4 val=1.0]Success[/rainbow]")
14+
print_rich("[rainbow sat=0.4 val=1.0]All tests successful[/rainbow]")
1415
else:
1516
for report_line in report:
1617
print_rich(report_line)
@@ -20,10 +21,9 @@ func add_to_report(test_category: String, test: String, result: String, expected
2021

2122

2223
# This test is dependent on specifics of the Formatter and AttributePathdata classes.
23-
# But its logic would likely not change enough in the future to make the tests obsolete.
24-
# https://www.w3.org/TR/SVG11/paths.html#PathDataBNF
25-
# We have a difference in logic where we don't require starting with MoveTo
26-
# in order to make pathdata easier to edit.
24+
# But their logic will likely not change enough in the future to make the tests obsolete.
25+
# SVG specification: https://www.w3.org/TR/SVG11/paths.html#PathDataBNF
26+
# Our logic is a bit different, as it considers MoveTo at the beginning as valid and doesn't collapse anything.
2727
# ClosePath are also merged, so you don't end up with invalid syntax after commands are deleted.
2828
func pathdata_tests() -> void:
2929
var spacious_formatter := Formatter.new()
@@ -73,8 +73,8 @@ func pathdata_tests() -> void:
7373
add_to_report("Pathdata parser", test, result, tests[test])
7474

7575
# This test is dependent on specifics of the Formatter and AttributeTransformList classes.
76-
# But its logic would likely not change enough in the future to make the tests obsolete.
77-
# https://www.w3.org/TR/SVG11/coords.html#TransformAttribute
76+
# But their logic will likely not change enough in the future to make the tests obsolete.
77+
# SVG specification: https://www.w3.org/TR/SVG11/coords.html#TransformAttribute
7878
func transform_list_tests() -> void:
7979
var spacious_formatter := Formatter.new()
8080
spacious_formatter.transform_list_compress_numbers = false

‎src/ui_parts/previews.tscn‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=7 format=3 uid="uid://ck1u5onyy0cdc"]
1+
[gd_scene format=3 uid="uid://ck1u5onyy0cdc"]
22

33
[ext_resource type="Script" uid="uid://dpn15qyr7xsds" path="res://src/ui_parts/previews.gd" id="1_uogc6"]
44
[ext_resource type="Texture2D" uid="uid://eif2ioi0mw17" path="res://assets/icons/Plus.svg" id="2_pm7dr"]
@@ -7,7 +7,7 @@
77
[ext_resource type="Texture2D" uid="uid://ccbta5q43jobk" path="res://assets/icons/More.svg" id="5_ue2r5"]
88
[ext_resource type="Script" uid="uid://bniafq6ma1iln" path="res://src/ui_widgets/ProceduralControl.gd" id="6_6v74c"]
99

10-
[node name="IconPreiew" type="Container"]
10+
[node name="IconPreiew" type="Container" unique_id=813250713]
1111
offset_bottom = 169.0
1212
size_flags_vertical = 3
1313
script = ExtResource("1_uogc6")
@@ -20,11 +20,11 @@ title_margin = 4
2020
panel_margin = 2
2121
metadata/_custom_type_script = "uid://ojo0537b6hcy"
2222

23-
[node name="ActionContainer" type="HBoxContainer" parent="."]
23+
[node name="ActionContainer" type="HBoxContainer" parent="." unique_id=1812445449]
2424
layout_mode = 2
2525
theme_override_constants/separation = 8
2626

27-
[node name="AddNewPreviewButton" type="Button" parent="ActionContainer"]
27+
[node name="AddNewPreviewButton" type="Button" parent="ActionContainer" unique_id=1393167346]
2828
unique_name_in_owner = true
2929
layout_mode = 2
3030
size_flags_horizontal = 0
@@ -34,55 +34,56 @@ mouse_default_cursor_shape = 2
3434
theme_type_variation = &"IconButton"
3535
icon = ExtResource("2_pm7dr")
3636

37-
[node name="ColorsContainer" type="HBoxContainer" parent="ActionContainer"]
37+
[node name="ColorsContainer" type="HBoxContainer" parent="ActionContainer" unique_id=1645315072]
3838
layout_mode = 2
3939
size_flags_horizontal = 6
4040

41-
[node name="TransparentColorSwatch" parent="ActionContainer/ColorsContainer" instance=ExtResource("3_auodr")]
41+
[node name="TransparentColorSwatch" parent="ActionContainer/ColorsContainer" unique_id=940556769 instance=ExtResource("3_auodr")]
4242
unique_name_in_owner = true
4343
layout_mode = 2
4444
size_flags_vertical = 4
4545

46-
[node name="BlackColorSwatch" parent="ActionContainer/ColorsContainer" instance=ExtResource("3_auodr")]
46+
[node name="BlackColorSwatch" parent="ActionContainer/ColorsContainer" unique_id=181031709 instance=ExtResource("3_auodr")]
4747
unique_name_in_owner = true
4848
layout_mode = 2
4949
size_flags_vertical = 4
5050

51-
[node name="WhiteColorSwatch" parent="ActionContainer/ColorsContainer" instance=ExtResource("3_auodr")]
51+
[node name="WhiteColorSwatch" parent="ActionContainer/ColorsContainer" unique_id=780192261 instance=ExtResource("3_auodr")]
5252
unique_name_in_owner = true
5353
layout_mode = 2
5454
size_flags_vertical = 4
5555

56-
[node name="ColorEdit" parent="ActionContainer/ColorsContainer" instance=ExtResource("4_mkhk3")]
56+
[node name="ColorEdit" parent="ActionContainer/ColorsContainer" unique_id=382124865 instance=ExtResource("4_mkhk3")]
5757
unique_name_in_owner = true
5858
layout_mode = 2
5959
size_flags_vertical = 4
6060
enable_alpha = true
6161

62-
[node name="MoreButton" type="Button" parent="ActionContainer"]
62+
[node name="MoreButton" type="Button" parent="ActionContainer" unique_id=1528240669]
6363
layout_mode = 2
6464
focus_mode = 0
6565
mouse_default_cursor_shape = 2
6666
theme_type_variation = &"IconButton"
6767
icon = ExtResource("5_ue2r5")
6868

69-
[node name="SplitContainer" type="SplitContainer" parent="."]
69+
[node name="SplitContainer" type="SplitContainer" parent="." unique_id=1430264023]
7070
unique_name_in_owner = true
7171
custom_minimum_size = Vector2(0, 80)
7272
layout_mode = 2
7373
size_flags_horizontal = 3
7474
size_flags_vertical = 3
7575
theme_override_constants/separation = 0
76-
split_offset = 250
76+
split_offsets = PackedInt32Array(250)
7777
vertical = true
78+
split_offset = 250
7879

79-
[node name="ScrollContainer" type="ScrollContainer" parent="SplitContainer"]
80+
[node name="ScrollContainer" type="ScrollContainer" parent="SplitContainer" unique_id=1897301189]
8081
custom_minimum_size = Vector2(144, 64)
8182
layout_mode = 2
8283
horizontal_scroll_mode = 0
8384
vertical_scroll_mode = 4
8485

85-
[node name="MarginContainer" type="MarginContainer" parent="SplitContainer/ScrollContainer"]
86+
[node name="MarginContainer" type="MarginContainer" parent="SplitContainer/ScrollContainer" unique_id=1611012842]
8687
layout_mode = 2
8788
size_flags_horizontal = 3
8889
size_flags_vertical = 3
@@ -91,46 +92,46 @@ theme_override_constants/margin_top = 2
9192
theme_override_constants/margin_right = 2
9293
theme_override_constants/margin_bottom = 2
9394

94-
[node name="IconPreviewTiles" type="Control" parent="SplitContainer/ScrollContainer/MarginContainer"]
95+
[node name="IconPreviewTiles" type="Control" parent="SplitContainer/ScrollContainer/MarginContainer" unique_id=2146728758]
9596
unique_name_in_owner = true
9697
layout_mode = 2
9798
size_flags_horizontal = 3
9899
size_flags_vertical = 3
99100
script = ExtResource("6_6v74c")
100101
metadata/_custom_type_script = "uid://bniafq6ma1iln"
101102

102-
[node name="PreviewTopPanel" type="PanelContainer" parent="SplitContainer"]
103+
[node name="PreviewTopPanel" type="PanelContainer" parent="SplitContainer" unique_id=919997231]
103104
visible = false
104105
layout_mode = 2
105106

106-
[node name="ScaledPreview" type="VBoxContainer" parent="SplitContainer/PreviewTopPanel"]
107+
[node name="ScaledPreview" type="VBoxContainer" parent="SplitContainer/PreviewTopPanel" unique_id=2024814424]
107108
layout_mode = 2
108109
size_flags_horizontal = 3
109110
size_flags_vertical = 3
110111

111-
[node name="SizeLabelMargins" type="MarginContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview"]
112+
[node name="SizeLabelMargins" type="MarginContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview" unique_id=1883748300]
112113
unique_name_in_owner = true
113114
layout_mode = 2
114115
theme_override_constants/margin_top = -3
115116
theme_override_constants/margin_bottom = -2
116117

117-
[node name="SizeLabel" type="Label" parent="SplitContainer/PreviewTopPanel/ScaledPreview/SizeLabelMargins"]
118+
[node name="SizeLabel" type="Label" parent="SplitContainer/PreviewTopPanel/ScaledPreview/SizeLabelMargins" unique_id=374657090]
118119
unique_name_in_owner = true
119120
layout_mode = 2
120121
size_flags_horizontal = 4
121122
size_flags_vertical = 0
122123

123-
[node name="ScaledPreviewPanel" type="PanelContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview"]
124+
[node name="ScaledPreviewPanel" type="PanelContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview" unique_id=226020093]
124125
unique_name_in_owner = true
125126
layout_mode = 2
126127
size_flags_vertical = 3
127128
theme_type_variation = &"OutlinedPanel"
128129

129-
[node name="ScrollContainer" type="ScrollContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview/ScaledPreviewPanel"]
130+
[node name="ScrollContainer" type="ScrollContainer" parent="SplitContainer/PreviewTopPanel/ScaledPreview/ScaledPreviewPanel" unique_id=375177294]
130131
custom_minimum_size = Vector2(64, 64)
131132
layout_mode = 2
132133

133-
[node name="TextureRect" type="TextureRect" parent="SplitContainer/PreviewTopPanel/ScaledPreview/ScaledPreviewPanel/ScrollContainer"]
134+
[node name="TextureRect" type="TextureRect" parent="SplitContainer/PreviewTopPanel/ScaledPreview/ScaledPreviewPanel/ScrollContainer" unique_id=100975222]
134135
unique_name_in_owner = true
135136
texture_filter = 1
136137
layout_mode = 2

‎src/ui_widgets/element_content_basic_shape.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=2 format=3 uid="uid://b0srm51hsvpel"]
1+
[gd_scene format=3 uid="uid://b0srm51hsvpel"]
22

33
[ext_resource type="Script" uid="uid://cv6p3un40sgne" path="res://src/ui_widgets/element_content_basic_shape.gd" id="1_tg77v"]
44

‎src/ui_widgets/element_content_g.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=2 format=3 uid="uid://bmbrrcuxvyfv3"]
1+
[gd_scene format=3 uid="uid://bmbrrcuxvyfv3"]
22

33
[ext_resource type="Script" uid="uid://dcvadp80yr47v" path="res://src/ui_widgets/element_content_g.gd" id="1_wpyt2"]
44

‎src/ui_widgets/element_content_linear_gradient.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=2 format=3 uid="uid://bt0kb3188plwn"]
1+
[gd_scene format=3 uid="uid://bt0kb3188plwn"]
22

33
[ext_resource type="Script" uid="uid://4xraagkofgdj" path="res://src/ui_widgets/element_content_linear_gradient.gd" id="1_q43hc"]
44

‎src/ui_widgets/element_content_path.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://ntom8irbw0d5"]
1+
[gd_scene format=3 uid="uid://ntom8irbw0d5"]
22

33
[ext_resource type="Script" uid="uid://db6oyweh2t54d" path="res://src/ui_widgets/element_content_path.gd" id="1_t5x4b"]
44
[ext_resource type="PackedScene" uid="uid://dqy5lv33sy5r7" path="res://src/ui_widgets/pathdata_field.tscn" id="1_vf17i"]

‎src/ui_widgets/element_content_polyshape.tscn‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=3 format=3 uid="uid://s0cuf24p8bbd"]
1+
[gd_scene format=3 uid="uid://s0cuf24p8bbd"]
22

33
[ext_resource type="Script" uid="uid://d3tlbx5skjsjj" path="res://src/ui_widgets/element_content_polyshape.gd" id="1_10fyu"]
44
[ext_resource type="PackedScene" uid="uid://b2gchy70px8jt" path="res://src/ui_widgets/points_field.tscn" id="2_8l4pm"]

0 commit comments

Comments
 (0)