Merge pull request #1533 from dsnopek/4.0-cherrypicks-1

Cherry-picks for the godot-cpp 4.0 branch - 1st batch
[CI] Update macOS workers to macos-latest
2026-01-01 05:48:37 +03:00 · 2024-07-23 09:42:29 -05:00 · 2024-07-22 08:44:18 -05:00 · 2024-07-22 08:44:07 -05:00 · 2024-07-22 08:43:36 -05:00 · 2023-11-09 13:22:17 +01:00
2 changed files with 325 additions and 51 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,7 +48,7 @@ jobs:
            cache-name: windows-x86_64-mingw

          - name: 🍎 macOS (universal)
-            os: macos-11
+            os: macos-latest
            platform: macos
            artifact-name: godot-cpp-macos-universal-release
            artifact-path: bin/libgodot-cpp.macos.template_release.universal.a
@@ -60,11 +60,12 @@ jobs:
            platform: android
            artifact-name: godot-cpp-android-arm64-release
            artifact-path: bin/libgodot-cpp.android.template_release.arm64.a
-            flags: ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME arch=arm64
+            flags: arch=arm64
+            run-tests: false
            cache-name: android-arm64

          - name: 🍏 iOS (arm64)
-            os: macos-11
+            os: macos-latest
            platform: ios
            artifact-name: godot-cpp-ios-arm64-release
            artifact-path: bin/libgodot-cpp.ios.template_release.arm64.a
@@ -73,6 +74,8 @@ jobs:

    env:
      SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
+      EM_VERSION: 3.1.39
+      EM_CACHE_FOLDER: "emsdk-cache"

    steps:
      - name: Checkout
@@ -91,19 +94,29 @@ jobs:
        with:
          python-version: '3.x'

-      - name: Linux dependencies
-        if: ${{ matrix.platform == 'linux' }}
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qqq build-essential pkg-config
+      - name: Android dependencies
+        if: ${{ matrix.platform == 'android' }}
+        uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r23c
+          link-to-sdk: true

-      - name: Install scons
-        run: |
-          python -m pip install scons==4.0.0
+      - name: Web dependencies
+        if: ${{ matrix.platform == 'web' }}
+        uses: mymindstorm/setup-emsdk@v13
+        with:
+          version: ${{env.EM_VERSION}}
+          actions-cache-folder: ${{env.EM_CACHE_FOLDER}}

      - name: Setup MinGW for Windows/MinGW build
        if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }}
        uses: egor-tensin/setup-mingw@v2
+        with:
+          version: 12.2.0
+
+      - name: Install scons
+        run: |
+          python -m pip install scons==4.0.0

      - name: Generate godot-cpp sources only
        run: |
--- a/gdextension/extension_api.json
+++ b/gdextension/extension_api.json
@@ -2,10 +2,10 @@
 	"header": {
 		"version_major": 4,
 		"version_minor": 0,
-		"version_patch": 0,
+		"version_patch": 4,
 		"version_status": "stable",
 		"version_build": "official",
-		"version_full_name": "Godot Engine v4.0.stable.official"
+		"version_full_name": "Godot Engine v4.0.4.stable.official"
 	},
 	"builtin_class_sizes": [
 		{
@@ -1915,9 +1915,7 @@
 			]
 		}
 	],
-	"global_constants": [
-
-	],
+	"global_constants": [],
 	"global_enums": [
 		{
 			"name": "Side",
@@ -12368,7 +12366,7 @@
 					"hash": 88913544,
 					"arguments": [
 						{
-							"name": "with",
+							"name": "to",
 							"type": "Vector4"
 						}
 					]
@@ -25218,7 +25216,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1459844657,
+					"hash": 2372066587,
 					"arguments": [
 						{
 							"name": "name",
@@ -25662,7 +25660,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1459844657,
+					"hash": 2372066587,
 					"arguments": [
 						{
 							"name": "name",
@@ -27763,7 +27761,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1804059263,
+					"hash": 3608408117,
 					"arguments": [
 						{
 							"name": "page_size",
@@ -31337,7 +31335,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 2221377757,
+					"hash": 3118260607,
 					"arguments": [
 						{
 							"name": "name",
@@ -39808,7 +39806,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3041634712,
+					"hash": 1958160172,
 					"arguments": [
 						{
 							"name": "from_position",
@@ -40168,7 +40166,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3041634712,
+					"hash": 1958160172,
 					"arguments": [
 						{
 							"name": "from_position",
@@ -40725,7 +40723,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3041634712,
+					"hash": 1958160172,
 					"arguments": [
 						{
 							"name": "from_position",
@@ -56076,7 +56074,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 4181505845,
+					"hash": 3283884939,
 					"arguments": [
 						{
 							"name": "position",
@@ -58300,6 +58298,14 @@
 						"type": "bool"
 					}
 				},
+				{
+					"name": "apply_floor_snap",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3218959716
+				},
 				{
 					"name": "set_velocity",
 					"is_const": false,
@@ -59027,6 +59033,14 @@
 						"type": "bool"
 					}
 				},
+				{
+					"name": "apply_floor_snap",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3218959716
+				},
 				{
 					"name": "set_velocity",
 					"is_const": false,
@@ -69647,7 +69661,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3750540263,
+					"hash": 3464257706,
 					"return_value": {
 						"type": "Vector2"
 					},
@@ -69671,7 +69685,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 255128112,
+					"hash": 3296056341,
 					"return_value": {
 						"type": "Transform2D"
 					},
@@ -69766,7 +69780,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 4229237857,
+					"hash": 2319761637,
 					"return_value": {
 						"type": "PackedVector2Array"
 					},
@@ -70149,7 +70163,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 4240323138,
+					"hash": 1350085894,
 					"return_value": {
 						"type": "Vector3"
 					},
@@ -70173,7 +70187,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 2486289007,
+					"hash": 1939359131,
 					"return_value": {
 						"type": "Transform3D"
 					},
@@ -70318,7 +70332,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3915530683,
+					"hash": 133237049,
 					"return_value": {
 						"type": "PackedVector3Array"
 					},
@@ -74059,7 +74073,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3723082199,
+					"hash": 3741216677,
 					"arguments": [
 						{
 							"name": "text",
@@ -91111,7 +91125,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3705324482,
+					"hash": 1149405976,
 					"return_value": {
 						"type": "RID"
 					},
@@ -106346,7 +106360,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1135556294,
+					"hash": 3609286057,
 					"arguments": [
 						{
 							"name": "gen_lightmap_uv",
@@ -108624,6 +108638,14 @@
 						{
 							"name": "COMPRESS_BPTC",
 							"value": 3
+						},
+						{
+							"name": "COMPRESS_ASTC",
+							"value": 4
+						},
+						{
+							"name": "COMPRESS_MAX",
+							"value": 5
 						}
 					]
 				},
@@ -109107,7 +109129,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 310747435,
+					"hash": 592235273,
 					"return_value": {
 						"type": "PackedByteArray"
 					},
@@ -109194,7 +109216,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1235769281,
+					"hash": 1214628238,
 					"return_value": {
 						"type": "PackedByteArray"
 					},
@@ -109398,7 +109420,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 336773324,
+					"hash": 3423495036,
 					"arguments": [
 						{
 							"name": "bump_scale",
@@ -123551,7 +123573,7 @@
 					"getter": "is_flat"
 				},
 				{
-					"type": "bool",
+					"type": "int",
 					"name": "start_index",
 					"setter": "set_start_index",
 					"getter": "get_start_index"
@@ -127870,6 +127892,27 @@
 						}
 					]
 				},
+				{
+					"name": "_get_packet_channel",
+					"is_const": true,
+					"is_static": false,
+					"is_vararg": false,
+					"is_virtual": true,
+					"return_value": {
+						"type": "int",
+						"meta": "int32"
+					}
+				},
+				{
+					"name": "_get_packet_mode",
+					"is_const": true,
+					"is_static": false,
+					"is_vararg": false,
+					"is_virtual": true,
+					"return_value": {
+						"type": "enum::MultiplayerPeer.TransferMode"
+					}
+				},
 				{
 					"name": "_set_transfer_channel",
 					"is_const": false,
@@ -128019,6 +128062,16 @@
 						"type": "bool"
 					}
 				},
+				{
+					"name": "_is_server_relay_supported",
+					"is_const": true,
+					"is_static": false,
+					"is_vararg": false,
+					"is_virtual": true,
+					"return_value": {
+						"type": "bool"
+					}
+				},
 				{
 					"name": "_get_connection_status",
 					"is_const": true,
@@ -128869,6 +128922,56 @@
 						}
 					]
 				},
+				{
+					"name": "set_pathfinding_algorithm",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2783519915,
+					"arguments": [
+						{
+							"name": "pathfinding_algorithm",
+							"type": "enum::NavigationPathQueryParameters2D.PathfindingAlgorithm"
+						}
+					]
+				},
+				{
+					"name": "get_pathfinding_algorithm",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3000421146,
+					"return_value": {
+						"type": "enum::NavigationPathQueryParameters2D.PathfindingAlgorithm"
+					}
+				},
+				{
+					"name": "set_path_postprocessing",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2864409082,
+					"arguments": [
+						{
+							"name": "path_postprocessing",
+							"type": "enum::NavigationPathQueryParameters2D.PathPostProcessing"
+						}
+					]
+				},
+				{
+					"name": "get_path_postprocessing",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3798118993,
+					"return_value": {
+						"type": "enum::NavigationPathQueryParameters2D.PathPostProcessing"
+					}
+				},
 				{
 					"name": "set_path_metadata_flags",
 					"is_const": false,
@@ -129258,6 +129361,18 @@
 					"setter": "set_navigation_layers",
 					"getter": "get_navigation_layers"
 				},
+				{
+					"type": "int",
+					"name": "pathfinding_algorithm",
+					"setter": "set_pathfinding_algorithm",
+					"getter": "get_pathfinding_algorithm"
+				},
+				{
+					"type": "int",
+					"name": "path_postprocessing",
+					"setter": "set_path_postprocessing",
+					"getter": "get_path_postprocessing"
+				},
 				{
 					"type": "int",
 					"name": "path_metadata_flags",
@@ -129707,6 +129822,56 @@
 						}
 					]
 				},
+				{
+					"name": "set_pathfinding_algorithm",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 394560454,
+					"arguments": [
+						{
+							"name": "pathfinding_algorithm",
+							"type": "enum::NavigationPathQueryParameters3D.PathfindingAlgorithm"
+						}
+					]
+				},
+				{
+					"name": "get_pathfinding_algorithm",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3398491350,
+					"return_value": {
+						"type": "enum::NavigationPathQueryParameters3D.PathfindingAlgorithm"
+					}
+				},
+				{
+					"name": "set_path_postprocessing",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2267362344,
+					"arguments": [
+						{
+							"name": "path_postprocessing",
+							"type": "enum::NavigationPathQueryParameters3D.PathPostProcessing"
+						}
+					]
+				},
+				{
+					"name": "get_path_postprocessing",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3883858360,
+					"return_value": {
+						"type": "enum::NavigationPathQueryParameters3D.PathPostProcessing"
+					}
+				},
 				{
 					"name": "set_path_metadata_flags",
 					"is_const": false,
@@ -130075,6 +130240,18 @@
 					"setter": "set_navigation_layers",
 					"getter": "get_navigation_layers"
 				},
+				{
+					"type": "int",
+					"name": "pathfinding_algorithm",
+					"setter": "set_pathfinding_algorithm",
+					"getter": "get_pathfinding_algorithm"
+				},
+				{
+					"type": "int",
+					"name": "path_postprocessing",
+					"setter": "set_path_postprocessing",
+					"getter": "get_path_postprocessing"
+				},
 				{
 					"type": "int",
 					"name": "path_metadata_flags",
@@ -137938,6 +138115,17 @@
 					"is_virtual": false,
 					"hash": 3218959716
 				},
+				{
+					"name": "is_node_ready",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 36873697,
+					"return_value": {
+						"type": "bool"
+					}
+				},
 				{
 					"name": "set_multiplayer_authority",
 					"is_const": false,
@@ -149308,7 +149496,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3198110832,
+					"hash": 1529961754,
 					"return_value": {
 						"type": "KinematicCollision2D"
 					},
@@ -149426,7 +149614,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1140990067,
+					"hash": 2825704414,
 					"return_value": {
 						"type": "KinematicCollision3D"
 					},
@@ -149465,7 +149653,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 2082761915,
+					"hash": 680299713,
 					"return_value": {
 						"type": "bool"
 					},
@@ -152322,7 +152510,7 @@
 					"is_virtual": false,
 					"hash": 3803848594,
 					"return_value": {
-						"type": "typedarray::PackedVector2Array"
+						"type": "typedarray::Vector2"
 					},
 					"arguments": [
 						{
@@ -152765,7 +152953,7 @@
 					"is_virtual": false,
 					"hash": 550215980,
 					"return_value": {
-						"type": "typedarray::PackedVector3Array"
+						"type": "typedarray::Vector3"
 					},
 					"arguments": [
 						{
@@ -175617,7 +175805,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 2207676613,
+					"hash": 837325100,
 					"return_value": {
 						"type": "float",
 						"meta": "float"
@@ -180937,6 +181125,27 @@
 						}
 					]
 				},
+				{
+					"name": "sampler_is_format_supported_for_filter",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2247922238,
+					"return_value": {
+						"type": "bool"
+					},
+					"arguments": [
+						{
+							"name": "format",
+							"type": "enum::RenderingDevice.DataFormat"
+						},
+						{
+							"name": "sampler_filter",
+							"type": "enum::RenderingDevice.SamplerFilter"
+						}
+					]
+				},
 				{
 					"name": "vertex_buffer_create",
 					"is_const": false,
@@ -189061,6 +189270,23 @@
 						}
 					]
 				},
+				{
+					"name": "viewport_get_render_target",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3814569979,
+					"return_value": {
+						"type": "RID"
+					},
+					"arguments": [
+						{
+							"name": "viewport",
+							"type": "RID"
+						}
+					]
+				},
 				{
 					"name": "viewport_get_texture",
 					"is_const": true,
@@ -189950,7 +190176,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 362573166,
+					"hash": 491659071,
 					"arguments": [
 						{
 							"name": "env",
@@ -192733,7 +192959,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1568036344,
+					"hash": 41973386,
 					"arguments": [
 						{
 							"name": "item",
@@ -193754,7 +193980,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 899045543,
+					"hash": 1076185472,
 					"arguments": [
 						{
 							"name": "swap_buffers",
@@ -225037,6 +225263,10 @@
 						{
 							"name": "GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL",
 							"value": 2048
+						},
+						{
+							"name": "GRAPHEME_IS_EMBEDDED_OBJECT",
+							"value": 4096
 						}
 					]
 				},
@@ -263406,7 +263636,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 1912078273,
+					"hash": 1014814997,
 					"arguments": [
 						{
 							"name": "ratio",
@@ -263437,7 +263667,7 @@
 					"is_vararg": false,
 					"is_static": false,
 					"is_virtual": false,
-					"hash": 3728566557,
+					"hash": 2613752477,
 					"arguments": [
 						{
 							"name": "minsize",
@@ -266688,6 +266918,31 @@
 						}
 					]
 				},
+				{
+					"name": "get_world_origin",
+					"is_const": true,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3229777777,
+					"return_value": {
+						"type": "Transform3D"
+					}
+				},
+				{
+					"name": "set_world_origin",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2952846383,
+					"arguments": [
+						{
+							"name": "world_origin",
+							"type": "Transform3D"
+						}
+					]
+				},
 				{
 					"name": "get_reference_frame",
 					"is_const": true,
@@ -266969,6 +267224,12 @@
 					"setter": "set_world_scale",
 					"getter": "get_world_scale"
 				},
+				{
+					"type": "Vector3",
+					"name": "world_origin",
+					"setter": "set_world_origin",
+					"getter": "get_world_origin"
+				},
 				{
 					"type": "Object",
 					"name": "primary_interface",
@@ -267332,11 +267593,11 @@
 		},
 		{
 			"name": "PhysicsServer3DExtensionMotionCollision",
-			"format": "Vector3 position;Vector3 normal;Vector3 collider_velocity;real_t depth;int local_shape;ObjectID collider_id;RID collider;int collider_shape"
+			"format": "Vector3 position;Vector3 normal;Vector3 collider_velocity;Vector3 collider_angular_velocity;real_t depth;int local_shape;ObjectID collider_id;RID collider;int collider_shape"
 		},
 		{
 			"name": "PhysicsServer3DExtensionMotionResult",
-			"format": "Vector3 travel;Vector3 remainder;real_t collision_safe_fraction;real_t collision_unsafe_fraction;PhysicsServer3DExtensionMotionCollision collisions[32];int collision_count"
+			"format": "Vector3 travel;Vector3 remainder;real_t collision_depth;real_t collision_safe_fraction;real_t collision_unsafe_fraction;PhysicsServer3DExtensionMotionCollision collisions[32];int collision_count"
 		},
 		{
 			"name": "PhysicsServer3DExtensionRayResult",
Author	SHA1	Message	Date
David Snopek	65dc2f1265	Merge pull request #1533 from dsnopek/4.0-cherrypicks-1 Cherry-picks for the godot-cpp 4.0 branch - 1st batch	2024-07-23 09:42:29 -05:00
Fabio Alessandrelli	469d65d951	[CI] Update macOS workers to macos-latest GitHub actions no longer allow `macos-11` runners (cherry picked from commit `2dd8917508`)	2024-07-22 08:44:18 -05:00
dependabot[bot]	597ae98f44	Bump mymindstorm/setup-emsdk from 12 to 13 Bumps [mymindstorm/setup-emsdk](https://github.com/mymindstorm/setup-emsdk) from 12 to 13. - [Release notes](https://github.com/mymindstorm/setup-emsdk/releases) - [Commits](https://github.com/mymindstorm/setup-emsdk/compare/v12...v13) --- updated-dependencies: - dependency-name: mymindstorm/setup-emsdk dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit `78bf5a42ed`)	2024-07-22 08:44:07 -05:00
Rémi Verschelde	c8096d4668	CI: Install Android NDK r23c explicitly It has just been removed from the Ubuntu 20.04 default install, breaking our CI setup. Also, sets Emscripten version to 3.1.39, as done upstream. Newer versions actually break dynamic library support. (cherry picked from commit `eea33b4133`)	2024-07-22 08:43:36 -05:00
Rémi Verschelde	2fdac1c9a9	gdextension: Sync with upstream commit fc0b241c9b0be3890712c3b72248d6bd790e7889 (4.0.4-stable)	2023-11-09 13:22:17 +01:00
Rémi Verschelde	d479df19f7	CI: Fix MinGW install error by pinning to earlier version Works around https://github.com/egor-tensin/setup-mingw/issues/14. (cherry picked from commit `0369f6fea0`)	2023-10-04 15:21:11 +02:00
Rémi Verschelde	3a9118cb0d	gdextension: Sync with upstream commit 5222a99f5d38cd5346254cefed8f65315bca4fcb (4.0.3-stable)	2023-05-19 14:08:46 +02:00
Rémi Verschelde	7fb46e9ea1	gdextension: Sync with upstream commit 7a0977ce2c558fe6219f0a14f8bd4d05aea8f019 (4.0.2-stable)	2023-04-04 15:46:34 +02:00
Rémi Verschelde	4d3afc0ad0	gdextension: Sync with upstream commit cacf49999e3fb37281d66cc591ca8bebc5712d4d (4.0.1-stable)	2023-03-20 18:33:38 +01:00