Compare commits

..

8 Commits

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
2 changed files with 321 additions and 45 deletions

View File

@@ -48,7 +48,7 @@ jobs:
cache-name: windows-x86_64-mingw cache-name: windows-x86_64-mingw
- name: 🍎 macOS (universal) - name: 🍎 macOS (universal)
os: macos-11 os: macos-latest
platform: macos platform: macos
artifact-name: godot-cpp-macos-universal-release artifact-name: godot-cpp-macos-universal-release
artifact-path: bin/libgodot-cpp.macos.template_release.universal.a artifact-path: bin/libgodot-cpp.macos.template_release.universal.a
@@ -60,11 +60,12 @@ jobs:
platform: android platform: android
artifact-name: godot-cpp-android-arm64-release artifact-name: godot-cpp-android-arm64-release
artifact-path: bin/libgodot-cpp.android.template_release.arm64.a 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 cache-name: android-arm64
- name: 🍏 iOS (arm64) - name: 🍏 iOS (arm64)
os: macos-11 os: macos-latest
platform: ios platform: ios
artifact-name: godot-cpp-ios-arm64-release artifact-name: godot-cpp-ios-arm64-release
artifact-path: bin/libgodot-cpp.ios.template_release.arm64.a artifact-path: bin/libgodot-cpp.ios.template_release.arm64.a
@@ -73,6 +74,8 @@ jobs:
env: env:
SCONS_CACHE: ${{ github.workspace }}/.scons-cache/ SCONS_CACHE: ${{ github.workspace }}/.scons-cache/
EM_VERSION: 3.1.39
EM_CACHE_FOLDER: "emsdk-cache"
steps: steps:
- name: Checkout - name: Checkout
@@ -91,19 +94,29 @@ jobs:
with: with:
python-version: '3.x' python-version: '3.x'
- name: Linux dependencies - name: Android dependencies
if: ${{ matrix.platform == 'linux' }} if: ${{ matrix.platform == 'android' }}
run: | uses: nttld/setup-ndk@v1
sudo apt-get update -qq with:
sudo apt-get install -qqq build-essential pkg-config ndk-version: r23c
link-to-sdk: true
- name: Install scons - name: Web dependencies
run: | if: ${{ matrix.platform == 'web' }}
python -m pip install scons==4.0.0 uses: mymindstorm/setup-emsdk@v13
with:
version: ${{env.EM_VERSION}}
actions-cache-folder: ${{env.EM_CACHE_FOLDER}}
- name: Setup MinGW for Windows/MinGW build - name: Setup MinGW for Windows/MinGW build
if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }} if: ${{ matrix.platform == 'windows' && matrix.flags == 'use_mingw=yes' }}
uses: egor-tensin/setup-mingw@v2 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 - name: Generate godot-cpp sources only
run: | run: |

View File

@@ -2,10 +2,10 @@
"header": { "header": {
"version_major": 4, "version_major": 4,
"version_minor": 0, "version_minor": 0,
"version_patch": 1, "version_patch": 4,
"version_status": "stable", "version_status": "stable",
"version_build": "official", "version_build": "official",
"version_full_name": "Godot Engine v4.0.1.stable.official" "version_full_name": "Godot Engine v4.0.4.stable.official"
}, },
"builtin_class_sizes": [ "builtin_class_sizes": [
{ {
@@ -12366,7 +12366,7 @@
"hash": 88913544, "hash": 88913544,
"arguments": [ "arguments": [
{ {
"name": "with", "name": "to",
"type": "Vector4" "type": "Vector4"
} }
] ]
@@ -25216,7 +25216,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1459844657, "hash": 2372066587,
"arguments": [ "arguments": [
{ {
"name": "name", "name": "name",
@@ -25660,7 +25660,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1459844657, "hash": 2372066587,
"arguments": [ "arguments": [
{ {
"name": "name", "name": "name",
@@ -27761,7 +27761,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1804059263, "hash": 3608408117,
"arguments": [ "arguments": [
{ {
"name": "page_size", "name": "page_size",
@@ -31335,7 +31335,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 2221377757, "hash": 3118260607,
"arguments": [ "arguments": [
{ {
"name": "name", "name": "name",
@@ -39806,7 +39806,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3041634712, "hash": 1958160172,
"arguments": [ "arguments": [
{ {
"name": "from_position", "name": "from_position",
@@ -40166,7 +40166,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3041634712, "hash": 1958160172,
"arguments": [ "arguments": [
{ {
"name": "from_position", "name": "from_position",
@@ -40723,7 +40723,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3041634712, "hash": 1958160172,
"arguments": [ "arguments": [
{ {
"name": "from_position", "name": "from_position",
@@ -56074,7 +56074,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 4181505845, "hash": 3283884939,
"arguments": [ "arguments": [
{ {
"name": "position", "name": "position",
@@ -58298,6 +58298,14 @@
"type": "bool" "type": "bool"
} }
}, },
{
"name": "apply_floor_snap",
"is_const": false,
"is_vararg": false,
"is_static": false,
"is_virtual": false,
"hash": 3218959716
},
{ {
"name": "set_velocity", "name": "set_velocity",
"is_const": false, "is_const": false,
@@ -59025,6 +59033,14 @@
"type": "bool" "type": "bool"
} }
}, },
{
"name": "apply_floor_snap",
"is_const": false,
"is_vararg": false,
"is_static": false,
"is_virtual": false,
"hash": 3218959716
},
{ {
"name": "set_velocity", "name": "set_velocity",
"is_const": false, "is_const": false,
@@ -69645,7 +69661,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3750540263, "hash": 3464257706,
"return_value": { "return_value": {
"type": "Vector2" "type": "Vector2"
}, },
@@ -69669,7 +69685,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 255128112, "hash": 3296056341,
"return_value": { "return_value": {
"type": "Transform2D" "type": "Transform2D"
}, },
@@ -69764,7 +69780,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 4229237857, "hash": 2319761637,
"return_value": { "return_value": {
"type": "PackedVector2Array" "type": "PackedVector2Array"
}, },
@@ -70147,7 +70163,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 4240323138, "hash": 1350085894,
"return_value": { "return_value": {
"type": "Vector3" "type": "Vector3"
}, },
@@ -70171,7 +70187,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 2486289007, "hash": 1939359131,
"return_value": { "return_value": {
"type": "Transform3D" "type": "Transform3D"
}, },
@@ -70316,7 +70332,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3915530683, "hash": 133237049,
"return_value": { "return_value": {
"type": "PackedVector3Array" "type": "PackedVector3Array"
}, },
@@ -74057,7 +74073,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3723082199, "hash": 3741216677,
"arguments": [ "arguments": [
{ {
"name": "text", "name": "text",
@@ -91109,7 +91125,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3705324482, "hash": 1149405976,
"return_value": { "return_value": {
"type": "RID" "type": "RID"
}, },
@@ -106344,7 +106360,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1135556294, "hash": 3609286057,
"arguments": [ "arguments": [
{ {
"name": "gen_lightmap_uv", "name": "gen_lightmap_uv",
@@ -108622,6 +108638,14 @@
{ {
"name": "COMPRESS_BPTC", "name": "COMPRESS_BPTC",
"value": 3 "value": 3
},
{
"name": "COMPRESS_ASTC",
"value": 4
},
{
"name": "COMPRESS_MAX",
"value": 5
} }
] ]
}, },
@@ -109105,7 +109129,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 310747435, "hash": 592235273,
"return_value": { "return_value": {
"type": "PackedByteArray" "type": "PackedByteArray"
}, },
@@ -109192,7 +109216,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1235769281, "hash": 1214628238,
"return_value": { "return_value": {
"type": "PackedByteArray" "type": "PackedByteArray"
}, },
@@ -109396,7 +109420,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 336773324, "hash": 3423495036,
"arguments": [ "arguments": [
{ {
"name": "bump_scale", "name": "bump_scale",
@@ -127868,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", "name": "_set_transfer_channel",
"is_const": false, "is_const": false,
@@ -128017,6 +128062,16 @@
"type": "bool" "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", "name": "_get_connection_status",
"is_const": true, "is_const": true,
@@ -128867,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", "name": "set_path_metadata_flags",
"is_const": false, "is_const": false,
@@ -129256,6 +129361,18 @@
"setter": "set_navigation_layers", "setter": "set_navigation_layers",
"getter": "get_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", "type": "int",
"name": "path_metadata_flags", "name": "path_metadata_flags",
@@ -129705,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", "name": "set_path_metadata_flags",
"is_const": false, "is_const": false,
@@ -130073,6 +130240,18 @@
"setter": "set_navigation_layers", "setter": "set_navigation_layers",
"getter": "get_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", "type": "int",
"name": "path_metadata_flags", "name": "path_metadata_flags",
@@ -137936,6 +138115,17 @@
"is_virtual": false, "is_virtual": false,
"hash": 3218959716 "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", "name": "set_multiplayer_authority",
"is_const": false, "is_const": false,
@@ -149306,7 +149496,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3198110832, "hash": 1529961754,
"return_value": { "return_value": {
"type": "KinematicCollision2D" "type": "KinematicCollision2D"
}, },
@@ -149424,7 +149614,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1140990067, "hash": 2825704414,
"return_value": { "return_value": {
"type": "KinematicCollision3D" "type": "KinematicCollision3D"
}, },
@@ -149463,7 +149653,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 2082761915, "hash": 680299713,
"return_value": { "return_value": {
"type": "bool" "type": "bool"
}, },
@@ -152320,7 +152510,7 @@
"is_virtual": false, "is_virtual": false,
"hash": 3803848594, "hash": 3803848594,
"return_value": { "return_value": {
"type": "typedarray::PackedVector2Array" "type": "typedarray::Vector2"
}, },
"arguments": [ "arguments": [
{ {
@@ -152763,7 +152953,7 @@
"is_virtual": false, "is_virtual": false,
"hash": 550215980, "hash": 550215980,
"return_value": { "return_value": {
"type": "typedarray::PackedVector3Array" "type": "typedarray::Vector3"
}, },
"arguments": [ "arguments": [
{ {
@@ -175615,7 +175805,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 2207676613, "hash": 837325100,
"return_value": { "return_value": {
"type": "float", "type": "float",
"meta": "float" "meta": "float"
@@ -180935,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", "name": "vertex_buffer_create",
"is_const": false, "is_const": false,
@@ -189059,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", "name": "viewport_get_texture",
"is_const": true, "is_const": true,
@@ -189948,7 +190176,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 362573166, "hash": 491659071,
"arguments": [ "arguments": [
{ {
"name": "env", "name": "env",
@@ -192731,7 +192959,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1568036344, "hash": 41973386,
"arguments": [ "arguments": [
{ {
"name": "item", "name": "item",
@@ -193752,7 +193980,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 899045543, "hash": 1076185472,
"arguments": [ "arguments": [
{ {
"name": "swap_buffers", "name": "swap_buffers",
@@ -225035,6 +225263,10 @@
{ {
"name": "GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL", "name": "GRAPHEME_IS_SAFE_TO_INSERT_TATWEEL",
"value": 2048 "value": 2048
},
{
"name": "GRAPHEME_IS_EMBEDDED_OBJECT",
"value": 4096
} }
] ]
}, },
@@ -263404,7 +263636,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 1912078273, "hash": 1014814997,
"arguments": [ "arguments": [
{ {
"name": "ratio", "name": "ratio",
@@ -263435,7 +263667,7 @@
"is_vararg": false, "is_vararg": false,
"is_static": false, "is_static": false,
"is_virtual": false, "is_virtual": false,
"hash": 3728566557, "hash": 2613752477,
"arguments": [ "arguments": [
{ {
"name": "minsize", "name": "minsize",
@@ -266686,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", "name": "get_reference_frame",
"is_const": true, "is_const": true,
@@ -266967,6 +267224,12 @@
"setter": "set_world_scale", "setter": "set_world_scale",
"getter": "get_world_scale" "getter": "get_world_scale"
}, },
{
"type": "Vector3",
"name": "world_origin",
"setter": "set_world_origin",
"getter": "get_world_origin"
},
{ {
"type": "Object", "type": "Object",
"name": "primary_interface", "name": "primary_interface",