From 0068320ff13fd91d16f3a2bdcf7956cd439c2869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 14 Feb 2023 19:12:02 +0100 Subject: [PATCH] gdextension: Sync with upstream commit d2699dc7ab96fbd75faccc1f32f55baebf1d84dc (4.0-rc2) --- gdextension/extension_api.json | 116 ++++++++++++++++++++++++++-- gdextension/gdextension_interface.h | 2 +- 2 files changed, 110 insertions(+), 8 deletions(-) diff --git a/gdextension/extension_api.json b/gdextension/extension_api.json index 30e0211b..5a22648c 100644 --- a/gdextension/extension_api.json +++ b/gdextension/extension_api.json @@ -3,9 +3,9 @@ "version_major": 4, "version_minor": 0, "version_patch": 0, - "version_status": "rc1", + "version_status": "rc2", "version_build": "official", - "version_full_name": "Godot Engine v4.0.rc1.official" + "version_full_name": "Godot Engine v4.0.rc2.official" }, "builtin_class_sizes": [ { @@ -32256,6 +32256,39 @@ "type": "Vector3" } }, + { + "name": "get_root_motion_position_accumulator", + "is_const": true, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 3360562783, + "return_value": { + "type": "Vector3" + } + }, + { + "name": "get_root_motion_rotation_accumulator", + "is_const": true, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 1222331677, + "return_value": { + "type": "Quaternion" + } + }, + { + "name": "get_root_motion_scale_accumulator", + "is_const": true, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 3360562783, + "return_value": { + "type": "Vector3" + } + }, { "name": "advance", "is_const": false, @@ -38530,7 +38563,7 @@ "hash": 83702148, "arguments": [ { - "name": "output_device", + "name": "name", "type": "String" } ] @@ -84946,7 +84979,27 @@ "is_vararg": false, "is_static": false, "is_virtual": false, - "hash": 1327703655, + "hash": 1850254898, + "return_value": { + "type": "enum::Error" + }, + "arguments": [ + { + "name": "language", + "type": "ScriptLanguage" + } + ] + }, + { + "name": "unregister_script_language", + "is_const": false, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 1850254898, + "return_value": { + "type": "enum::Error" + }, "arguments": [ { "name": "language", @@ -117040,7 +117093,7 @@ "hash": 1286410249, "arguments": [ { - "name": "lines_visible", + "name": "visible_lines", "type": "int", "meta": "int32" } @@ -152613,7 +152666,7 @@ "is_virtual": false, "hash": 550215980, "return_value": { - "type": "typedarray::PackedVector2Array" + "type": "typedarray::PackedVector3Array" }, "arguments": [ { @@ -181218,7 +181271,7 @@ "is_vararg": false, "is_static": false, "is_virtual": false, - "hash": 1102329001, + "hash": 125363422, "return_value": { "type": "PackedByteArray" }, @@ -181226,6 +181279,18 @@ { "name": "buffer", "type": "RID" + }, + { + "name": "offset_bytes", + "type": "int", + "meta": "uint32", + "default_value": "0" + }, + { + "name": "size_bytes", + "type": "int", + "meta": "uint32", + "default_value": "0" } ] }, @@ -237947,6 +238012,43 @@ "type": "enum::TileMap.VisibilityMode" } }, + { + "name": "set_navigation_map", + "is_const": false, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 4040184819, + "arguments": [ + { + "name": "layer", + "type": "int", + "meta": "int32" + }, + { + "name": "map", + "type": "RID" + } + ] + }, + { + "name": "get_navigation_map", + "is_const": true, + "is_vararg": false, + "is_static": false, + "is_virtual": false, + "hash": 495598643, + "return_value": { + "type": "RID" + }, + "arguments": [ + { + "name": "layer", + "type": "int", + "meta": "int32" + } + ] + }, { "name": "set_cell", "is_const": false, diff --git a/gdextension/gdextension_interface.h b/gdextension/gdextension_interface.h index 3865b152..f323b2aa 100644 --- a/gdextension/gdextension_interface.h +++ b/gdextension/gdextension_interface.h @@ -554,7 +554,7 @@ typedef struct { GDExtensionVariantPtr (*array_operator_index)(GDExtensionTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr GDExtensionVariantPtr (*array_operator_index_const)(GDExtensionConstTypePtr p_self, GDExtensionInt p_index); // p_self should be an Array ptr void (*array_ref)(GDExtensionTypePtr p_self, GDExtensionConstTypePtr p_from); // p_self should be an Array ptr - void (*array_set_typed)(GDExtensionTypePtr p_self, uint32_t p_type, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstVariantPtr p_script); // p_self should be an Array ptr + void (*array_set_typed)(GDExtensionTypePtr p_self, GDExtensionVariantType p_type, GDExtensionConstStringNamePtr p_class_name, GDExtensionConstVariantPtr p_script); // p_self should be an Array ptr /* Dictionary functions */