2
0
Эх сурвалжийг харах

gdextension: Sync with upstream commit c4fb119f03477ad9a494ba6cdad211b35a8efcce (4.0-rc1)

Rémi Verschelde 2 жил өмнө
parent
commit
516fad14e4

+ 228 - 25
gdextension/extension_api.json

@@ -3,9 +3,9 @@
 		"version_major": 4,
 		"version_major": 4,
 		"version_minor": 0,
 		"version_minor": 0,
 		"version_patch": 0,
 		"version_patch": 0,
-		"version_status": "beta17",
+		"version_status": "rc1",
 		"version_build": "official",
 		"version_build": "official",
-		"version_full_name": "Godot Engine v4.0.beta17.official"
+		"version_full_name": "Godot Engine v4.0.rc1.official"
 	},
 	},
 	"builtin_class_sizes": [
 	"builtin_class_sizes": [
 		{
 		{
@@ -19199,9 +19199,9 @@
 					"name": "bsearch",
 					"name": "bsearch",
 					"return_type": "int",
 					"return_type": "int",
 					"is_vararg": false,
 					"is_vararg": false,
-					"is_const": false,
+					"is_const": true,
 					"is_static": false,
 					"is_static": false,
-					"hash": 2634019015,
+					"hash": 3372222236,
 					"arguments": [
 					"arguments": [
 						{
 						{
 							"name": "value",
 							"name": "value",
@@ -19218,9 +19218,9 @@
 					"name": "bsearch_custom",
 					"name": "bsearch_custom",
 					"return_type": "int",
 					"return_type": "int",
 					"is_vararg": false,
 					"is_vararg": false,
-					"is_const": false,
+					"is_const": true,
 					"is_static": false,
 					"is_static": false,
-					"hash": 135832563,
+					"hash": 161317131,
 					"arguments": [
 					"arguments": [
 						{
 						{
 							"name": "value",
 							"name": "value",
@@ -28441,6 +28441,36 @@
 			"signals": [
 			"signals": [
 				{
 				{
 					"name": "tree_changed"
 					"name": "tree_changed"
+				},
+				{
+					"name": "animation_node_renamed",
+					"arguments": [
+						{
+							"name": "object_id",
+							"type": "int"
+						},
+						{
+							"name": "old_name",
+							"type": "String"
+						},
+						{
+							"name": "new_name",
+							"type": "String"
+						}
+					]
+				},
+				{
+					"name": "animation_node_removed",
+					"arguments": [
+						{
+							"name": "object_id",
+							"type": "int"
+						},
+						{
+							"name": "name",
+							"type": "String"
+						}
+					]
 				}
 				}
 			],
 			],
 			"properties": [
 			"properties": [
@@ -32226,24 +32256,6 @@
 						"type": "Vector3"
 						"type": "Vector3"
 					}
 					}
 				},
 				},
-				{
-					"name": "rename_parameter",
-					"is_const": false,
-					"is_vararg": false,
-					"is_static": false,
-					"is_virtual": false,
-					"hash": 3186203200,
-					"arguments": [
-						{
-							"name": "old_name",
-							"type": "String"
-						},
-						{
-							"name": "new_name",
-							"type": "String"
-						}
-					]
-				},
 				{
 				{
 					"name": "advance",
 					"name": "advance",
 					"is_const": false,
 					"is_const": false,
@@ -66111,7 +66123,7 @@
 					},
 					},
 					"arguments": [
 					"arguments": [
 						{
 						{
-							"name": "position",
+							"name": "point",
 							"type": "Vector2"
 							"type": "Vector2"
 						}
 						}
 					]
 					]
@@ -77214,6 +77226,26 @@
 					"is_vararg": false,
 					"is_vararg": false,
 					"is_virtual": true
 					"is_virtual": true
 				},
 				},
+				{
+					"name": "_get_export_features",
+					"is_const": true,
+					"is_static": false,
+					"is_vararg": false,
+					"is_virtual": true,
+					"return_value": {
+						"type": "PackedStringArray"
+					},
+					"arguments": [
+						{
+							"name": "platform",
+							"type": "EditorExportPlatform"
+						},
+						{
+							"name": "debug",
+							"type": "bool"
+						}
+					]
+				},
 				{
 				{
 					"name": "_get_name",
 					"name": "_get_name",
 					"is_const": true,
 					"is_const": true,
@@ -78642,6 +78674,38 @@
 							"type": "typedarray::String"
 							"type": "typedarray::String"
 						}
 						}
 					]
 					]
+				},
+				{
+					"name": "append_import_external_resource",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 3645925746,
+					"return_value": {
+						"type": "enum::Error"
+					},
+					"arguments": [
+						{
+							"name": "path",
+							"type": "String"
+						},
+						{
+							"name": "custom_options",
+							"type": "Dictionary",
+							"default_value": "{}"
+						},
+						{
+							"name": "custom_importer",
+							"type": "String",
+							"default_value": "\"\""
+						},
+						{
+							"name": "generator_parameters",
+							"type": "Variant",
+							"default_value": "null"
+						}
+					]
 				}
 				}
 			]
 			]
 		},
 		},
@@ -171257,6 +171321,17 @@
 						}
 						}
 					]
 					]
 				},
 				},
+				{
+					"name": "get_global_class_list",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2915620761,
+					"return_value": {
+						"type": "typedarray::Dictionary"
+					}
+				},
 				{
 				{
 					"name": "set_order",
 					"name": "set_order",
 					"is_const": false,
 					"is_const": false,
@@ -192881,6 +192956,24 @@
 						}
 						}
 					]
 					]
 				},
 				},
+				{
+					"name": "canvas_light_set_blend_mode",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 804895945,
+					"arguments": [
+						{
+							"name": "light",
+							"type": "RID"
+						},
+						{
+							"name": "mode",
+							"type": "enum::RenderingServer.CanvasLightBlendMode"
+						}
+					]
+				},
 				{
 				{
 					"name": "canvas_light_occluder_create",
 					"name": "canvas_light_occluder_create",
 					"is_const": false,
 					"is_const": false,
@@ -195161,6 +195254,24 @@
 							"value": 26
 							"value": 26
 						}
 						}
 					]
 					]
+				},
+				{
+					"name": "MenuItems",
+					"is_bitfield": false,
+					"values": [
+						{
+							"name": "MENU_COPY",
+							"value": 0
+						},
+						{
+							"name": "MENU_SELECT_ALL",
+							"value": 1
+						},
+						{
+							"name": "MENU_MAX",
+							"value": 2
+						}
+					]
 				}
 				}
 			],
 			],
 			"methods": [
 			"methods": [
@@ -196646,6 +196757,21 @@
 					"return_value": {
 					"return_value": {
 						"type": "bool"
 						"type": "bool"
 					}
 					}
+				},
+				{
+					"name": "menu_option",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 1286410249,
+					"arguments": [
+						{
+							"name": "option",
+							"type": "int",
+							"meta": "int32"
+						}
+					]
 				}
 				}
 			],
 			],
 			"signals": [
 			"signals": [
@@ -250081,6 +250207,31 @@
 						"type": "bool"
 						"type": "bool"
 					}
 					}
 				},
 				},
+				{
+					"name": "set_physics_object_picking_sort",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2586408642,
+					"arguments": [
+						{
+							"name": "enable",
+							"type": "bool"
+						}
+					]
+				},
+				{
+					"name": "get_physics_object_picking_sort",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2240911060,
+					"return_value": {
+						"type": "bool"
+					}
+				},
 				{
 				{
 					"name": "get_viewport_rid",
 					"name": "get_viewport_rid",
 					"is_const": true,
 					"is_const": true,
@@ -251193,6 +251344,12 @@
 					"setter": "set_physics_object_picking",
 					"setter": "set_physics_object_picking",
 					"getter": "get_physics_object_picking"
 					"getter": "get_physics_object_picking"
 				},
 				},
+				{
+					"type": "bool",
+					"name": "physics_object_picking_sort",
+					"setter": "set_physics_object_picking_sort",
+					"getter": "get_physics_object_picking_sort"
+				},
 				{
 				{
 					"type": "bool",
 					"type": "bool",
 					"name": "gui_disable_input",
 					"name": "gui_disable_input",
@@ -264690,6 +264847,24 @@
 							"value": 4
 							"value": 4
 						}
 						}
 					]
 					]
+				},
+				{
+					"name": "EnvironmentBlendMode",
+					"is_bitfield": false,
+					"values": [
+						{
+							"name": "XR_ENV_BLEND_MODE_OPAQUE",
+							"value": 0
+						},
+						{
+							"name": "XR_ENV_BLEND_MODE_ADDITIVE",
+							"value": 1
+						},
+						{
+							"name": "XR_ENV_BLEND_MODE_ALPHA_BLEND",
+							"value": 2
+						}
+					]
 				}
 				}
 			],
 			],
 			"methods": [
 			"methods": [
@@ -265031,6 +265206,34 @@
 							"meta": "double"
 							"meta": "double"
 						}
 						}
 					]
 					]
+				},
+				{
+					"name": "get_supported_environment_blend_modes",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 2915620761,
+					"return_value": {
+						"type": "Array"
+					}
+				},
+				{
+					"name": "set_environment_blend_mode",
+					"is_const": false,
+					"is_vararg": false,
+					"is_static": false,
+					"is_virtual": false,
+					"hash": 551152418,
+					"return_value": {
+						"type": "bool"
+					},
+					"arguments": [
+						{
+							"name": "mode",
+							"type": "enum::XRInterface.EnvironmentBlendMode"
+						}
+					]
 				}
 				}
 			],
 			],
 			"signals": [
 			"signals": [

+ 6 - 7
gdextension/gdextension_interface.h

@@ -37,7 +37,6 @@
 
 
 #include <stddef.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdint.h>
-#include <stdio.h>
 
 
 #ifndef __cplusplus
 #ifndef __cplusplus
 typedef uint32_t char32_t;
 typedef uint32_t char32_t;
@@ -415,12 +414,12 @@ typedef struct {
 	void *(*mem_realloc)(void *p_ptr, size_t p_bytes);
 	void *(*mem_realloc)(void *p_ptr, size_t p_bytes);
 	void (*mem_free)(void *p_ptr);
 	void (*mem_free)(void *p_ptr);
 
 
-	void (*print_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
-	void (*print_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
-	void (*print_warning)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
-	void (*print_warning_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
-	void (*print_script_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
-	void (*print_script_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, bool p_editor_notify);
+	void (*print_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_warning)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_warning_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_script_error)(const char *p_description, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
+	void (*print_script_error_with_message)(const char *p_description, const char *p_message, const char *p_function, const char *p_file, int32_t p_line, GDExtensionBool p_editor_notify);
 
 
 	uint64_t (*get_native_struct_size)(GDExtensionConstStringNamePtr p_name);
 	uint64_t (*get_native_struct_size)(GDExtensionConstStringNamePtr p_name);