godotengine/godot-headers
1
0
Fork 0
mirror of https://github.com/godotengine/godot-headers.git synced 2026-01-03 18:09:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: godotengine:godot-3.2.3-stable
Branches Tags
godotengine:3.x godotengine:master godotengine:3.5 godotengine:3.4 godotengine:3.3 godotengine:3.0 godotengine:3.2 godotengine:3.1
godotengine:godot-3.5.3-stable godotengine:godot-3.5.2-stable godotengine:godot-3.5.1-stable godotengine:godot-3.5-stable godotengine:godot-3.4.5-stable godotengine:godot-3.4.3-stable godotengine:godot-3.4.4-stable godotengine:godot-3.4.1-stable godotengine:godot-3.4.2-stable godotengine:godot-3.4-stable godotengine:godot-3.3.4-stable godotengine:godot-3.3.3-stable godotengine:godot-3.3.1-stable godotengine:godot-3.3.2-stable godotengine:godot-3.3-stable godotengine:godot-3.2.3-stable godotengine:godot-3.2.2-stable godotengine:godot-3.2.1-stable godotengine:godot-3.2-stable godotengine:godot-3.1.2-stable godotengine:godot-3.0.6-stable godotengine:godot-3.1.1-stable godotengine:godot-3.1-stable
...
compare: godotengine:3.0
Branches Tags
godotengine:master godotengine:3.5 godotengine:3.x godotengine:3.4 godotengine:3.3 godotengine:3.0 godotengine:3.2 godotengine:3.1
godotengine:godot-3.5.3-stable godotengine:godot-3.5.2-stable godotengine:godot-3.5.1-stable godotengine:godot-3.5-stable godotengine:godot-3.4.5-stable godotengine:godot-3.4.3-stable godotengine:godot-3.4.4-stable godotengine:godot-3.4.1-stable godotengine:godot-3.4.2-stable godotengine:godot-3.4-stable godotengine:godot-3.3.4-stable godotengine:godot-3.3.3-stable godotengine:godot-3.3.1-stable godotengine:godot-3.3.2-stable godotengine:godot-3.3-stable godotengine:godot-3.2.3-stable godotengine:godot-3.2.2-stable godotengine:godot-3.2.1-stable godotengine:godot-3.2-stable godotengine:godot-3.1.2-stable godotengine:godot-3.0.6-stable godotengine:godot-3.1.1-stable godotengine:godot-3.1-stable

2 Commits
godot-3.2. ... 3.0

Author SHA1 Message Date
George Marques
4c21389bcf Merge pull request #54 from akien-mga/3.0-sync-with-3.0.6-stable 
Sync JSON files and headers with 3.0.6-stable
 2021-03-01 08:49:41 -03:00
Rémi Verschelde
88e71f3c02 Sync JSON files and headers with 3.0.6-stable 
Also used a local cherry-pick of
godotengine/godot@0d2f3f4f50
to ensure that ``api.json`` keeps a consistent sorting.

This cherry-pick will be included in the upcoming 3.0.7-stable
so we'll be able to see a proper diff.

Partially reverts previous commit and remove NativeScript 1.1
declarations, I guess those were mistakenly committed to the 3.0
branch or it was branched off master too late?
 2019-07-29 14:08:18 +02:00
5 changed files with 132011 additions and 138169 deletions
Expand all files Collapse all files

269974
api.json
View File

File diff suppressed because it is too large Load Diff

2
gdnative/variant.h
View File

@@ -135,7 +135,7 @@ void GDAPI godot_variant_new_copy(godot_variant *r_dest, const godot_variant *p_
void GDAPI godot_variant_new_nil(godot_variant *r_dest); void GDAPI godot_variant_new_nil(godot_variant *r_dest);
void GDAPI godot_variant_new_bool(godot_variant *r_dest, const godot_bool p_b); void GDAPI godot_variant_new_bool(godot_variant *p_v, const godot_bool p_b);
void GDAPI godot_variant_new_uint(godot_variant *r_dest, const uint64_t p_i); void GDAPI godot_variant_new_uint(godot_variant *r_dest, const uint64_t p_i);
void GDAPI godot_variant_new_int(godot_variant *r_dest, const int64_t p_i); void GDAPI godot_variant_new_int(godot_variant *r_dest, const int64_t p_i);
void GDAPI godot_variant_new_real(godot_variant *r_dest, const double p_r); void GDAPI godot_variant_new_real(godot_variant *r_dest, const double p_r);

133
gdnative_api.json
View File

@@ -5,7 +5,6 @@
"major": 1, "major": 1,
"minor": 0 "minor": 0
}, },
"next": null,
"api": [ "api": [
{ {
"name": "godot_color_new_rgba", "name": "godot_color_new_rgba",
@@ -3964,7 +3963,7 @@
"name": "godot_variant_new_bool", "name": "godot_variant_new_bool",
"return_type": "void", "return_type": "void",
"arguments": [ "arguments": [
["godot_variant *", "r_dest"], ["godot_variant *", "p_v"],
["const godot_bool", "p_b"] ["const godot_bool", "p_b"]
] ]
}, },
@@ -5756,129 +5755,13 @@
} }
] ]
}, },
"extensions": [ "extensions": {
{ "nativescript": {
"name": "nativescript",
"type": "NATIVESCRIPT", "type": "NATIVESCRIPT",
"version": { "version": {
"major": 1, "major": 1,
"minor": 0 "minor": 0
}, },
"next": {
"type": "NATIVESCRIPT",
"version": {
"major": 1,
"minor": 1
},
"next": null,
"api": [
{
"name": "godot_nativescript_set_method_argument_information",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["const char *", "p_function_name"],
["int", "p_num_args"],
["const godot_method_arg *", "p_args"]
]
},
{
"name": "godot_nativescript_set_class_documentation",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["godot_string", "p_documentation"]
]
},
{
"name": "godot_nativescript_set_method_documentation",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["const char *", "p_function_name"],
["godot_string", "p_documentation"]
]
},
{
"name": "godot_nativescript_set_property_documentation",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["const char *", "p_path"],
["godot_string", "p_documentation"]
]
},
{
"name": "godot_nativescript_set_signal_documentation",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["const char *", "p_signal_name"],
["godot_string", "p_documentation"]
]
},
{
"name": "godot_nativescript_set_global_type_tag",
"return_type": "void",
"arguments": [
["int", "p_idx"],
["const char *", "p_name"],
["const void *", "p_type_tag"]
]
},
{
"name": "godot_nativescript_get_global_type_tag",
"return_type": "const void *",
"arguments": [
["int", "p_idx"],
["const char *", "p_name"]
]
},
{
"name": "godot_nativescript_set_type_tag",
"return_type": "void",
"arguments": [
["void *", "p_gdnative_handle"],
["const char *", "p_name"],
["const void *", "p_type_tag"]
]
},
{
"name": "godot_nativescript_get_type_tag",
"return_type": "const void *",
"arguments": [
["const godot_object *", "p_object"]
]
},
{
"name": "godot_nativescript_register_instance_binding_data_functions",
"return_type": "int",
"arguments": [
["godot_instance_binding_functions", "p_binding_functions"]
]
},
{
"name": "godot_nativescript_unregister_instance_binding_data_functions",
"return_type": "void",
"arguments": [
["int", "p_idx"]
]
},
{
"name": "godot_nativescript_get_instance_binding_data",
"return_type": "void *",
"arguments": [
["int", "p_idx"],
["godot_object *", "p_object"]
]
}
]
},
"api": [ "api": [
{ {
"name": "godot_nativescript_register_class", "name": "godot_nativescript_register_class",
@@ -5943,14 +5826,12 @@
} }
] ]
}, },
{ "pluginscript": {
"name": "pluginscript",
"type": "PLUGINSCRIPT", "type": "PLUGINSCRIPT",
"version": { "version": {
"major": 1, "major": 1,
"minor": 0 "minor": 0
}, },
"next": null,
"api": [ "api": [
{ {
"name": "godot_pluginscript_register_language", "name": "godot_pluginscript_register_language",
@@ -5961,14 +5842,12 @@
} }
] ]
}, },
{ "arvr": {
"name": "arvr",
"type": "ARVR", "type": "ARVR",
"version": { "version": {
"major": 1, "major": 1,
"minor": 0 "minor": 0
}, },
"next": null,
"api": [ "api": [
{ {
"name": "godot_arvr_register_interface", "name": "godot_arvr_register_interface",
@@ -6058,5 +5937,5 @@
} }
] ]
} }
] }
} }

22
gdnative_api_struct.gen.h
View File

@@ -13,7 +13,7 @@
extern const godot_gdnative_ext_pluginscript_api_struct *_gdnative_wrapper_pluginscript_api_struct; \ extern const godot_gdnative_ext_pluginscript_api_struct *_gdnative_wrapper_pluginscript_api_struct; \
extern const godot_gdnative_ext_arvr_api_struct *_gdnative_wrapper_arvr_api_struct; \ extern const godot_gdnative_ext_arvr_api_struct *_gdnative_wrapper_arvr_api_struct; \
_gdnative_wrapper_api_struct = options->api_struct; \ _gdnative_wrapper_api_struct = options->api_struct; \
for (unsigned int i = 0; i < _gdnative_wrapper_api_struct->num_extensions; i++) { \ for (int i = 0; i < _gdnative_wrapper_api_struct->num_extensions; i++) { \
switch (_gdnative_wrapper_api_struct->extensions[i]->type) { \ switch (_gdnative_wrapper_api_struct->extensions[i]->type) { \
case GDNATIVE_EXT_NATIVESCRIPT: \ case GDNATIVE_EXT_NATIVESCRIPT: \
_gdnative_wrapper_nativescript_api_struct = (godot_gdnative_ext_nativescript_api_struct *) _gdnative_wrapper_api_struct->extensions[i]; \ _gdnative_wrapper_nativescript_api_struct = (godot_gdnative_ext_nativescript_api_struct *) _gdnative_wrapper_api_struct->extensions[i]; \
@@ -39,24 +39,6 @@ enum GDNATIVE_API_TYPES {
GDNATIVE_EXT_ARVR, GDNATIVE_EXT_ARVR,
}; };
typedef struct godot_gdnative_ext_nativescript_1_1_api_struct {
unsigned int type;
godot_gdnative_api_version version;
const godot_gdnative_api_struct *next;
void (*godot_nativescript_set_method_argument_information)(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_method_arg *p_args);
void (*godot_nativescript_set_class_documentation)(void *p_gdnative_handle, const char *p_name, godot_string p_documentation);
void (*godot_nativescript_set_method_documentation)(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_string p_documentation);
void (*godot_nativescript_set_property_documentation)(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_string p_documentation);
void (*godot_nativescript_set_signal_documentation)(void *p_gdnative_handle, const char *p_name, const char *p_signal_name, godot_string p_documentation);
void (*godot_nativescript_set_global_type_tag)(int p_idx, const char *p_name, const void *p_type_tag);
const void *(*godot_nativescript_get_global_type_tag)(int p_idx, const char *p_name);
void (*godot_nativescript_set_type_tag)(void *p_gdnative_handle, const char *p_name, const void *p_type_tag);
const void *(*godot_nativescript_get_type_tag)(const godot_object *p_object);
int (*godot_nativescript_register_instance_binding_data_functions)(godot_instance_binding_functions p_binding_functions);
void (*godot_nativescript_unregister_instance_binding_data_functions)(int p_idx);
void *(*godot_nativescript_get_instance_binding_data)(int p_idx, godot_object *p_object);
} godot_gdnative_ext_nativescript_1_1_api_struct;
typedef struct godot_gdnative_ext_nativescript_api_struct { typedef struct godot_gdnative_ext_nativescript_api_struct {
unsigned int type; unsigned int type;
godot_gdnative_api_version version; godot_gdnative_api_version version;
@@ -609,7 +591,7 @@ typedef struct godot_gdnative_core_api_struct {
godot_variant_type (*godot_variant_get_type)(const godot_variant *p_v); godot_variant_type (*godot_variant_get_type)(const godot_variant *p_v);
void (*godot_variant_new_copy)(godot_variant *r_dest, const godot_variant *p_src); void (*godot_variant_new_copy)(godot_variant *r_dest, const godot_variant *p_src);
void (*godot_variant_new_nil)(godot_variant *r_dest); void (*godot_variant_new_nil)(godot_variant *r_dest);
void (*godot_variant_new_bool)(godot_variant *r_dest, const godot_bool p_b); void (*godot_variant_new_bool)(godot_variant *p_v, const godot_bool p_b);
void (*godot_variant_new_uint)(godot_variant *r_dest, const uint64_t p_i); void (*godot_variant_new_uint)(godot_variant *r_dest, const uint64_t p_i);
void (*godot_variant_new_int)(godot_variant *r_dest, const int64_t p_i); void (*godot_variant_new_int)(godot_variant *r_dest, const int64_t p_i);
void (*godot_variant_new_real)(godot_variant *r_dest, const double p_r); void (*godot_variant_new_real)(godot_variant *r_dest, const double p_r);

49
nativescript/godot_nativescript.h
View File

@@ -185,55 +185,6 @@ void GDAPI godot_nativescript_register_signal(void *p_gdnative_handle, const cha
void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance); void GDAPI *godot_nativescript_get_userdata(godot_object *p_instance);
/*
*
*
* NativeScript 1.1
*
*
*/
// method registering with argument names
typedef struct {
godot_string name;
godot_variant_type type;
godot_property_hint hint;
godot_string hint_string;
} godot_method_arg;
void GDAPI godot_nativescript_set_method_argument_information(void *p_gdnative_handle, const char *p_name, const char *p_function_name, int p_num_args, const godot_method_arg *p_args);
// documentation
void GDAPI godot_nativescript_set_class_documentation(void *p_gdnative_handle, const char *p_name, godot_string p_documentation);
void GDAPI godot_nativescript_set_method_documentation(void *p_gdnative_handle, const char *p_name, const char *p_function_name, godot_string p_documentation);
void GDAPI godot_nativescript_set_property_documentation(void *p_gdnative_handle, const char *p_name, const char *p_path, godot_string p_documentation);
void GDAPI godot_nativescript_set_signal_documentation(void *p_gdnative_handle, const char *p_name, const char *p_signal_name, godot_string p_documentation);
// type tag API
void GDAPI godot_nativescript_set_global_type_tag(int p_idx, const char *p_name, const void *p_type_tag);
const void GDAPI *godot_nativescript_get_global_type_tag(int p_idx, const char *p_name);
void GDAPI godot_nativescript_set_type_tag(void *p_gdnative_handle, const char *p_name, const void *p_type_tag);
const void GDAPI *godot_nativescript_get_type_tag(const godot_object *p_object);
// instance binding API
typedef struct {
GDCALLINGCONV void *(*alloc_instance_binding_data)(void *, const void *, godot_object *);
GDCALLINGCONV void (*free_instance_binding_data)(void *, void *);
void *data;
GDCALLINGCONV void (*free_func)(void *);
} godot_instance_binding_functions;
int GDAPI godot_nativescript_register_instance_binding_data_functions(godot_instance_binding_functions p_binding_functions);
void GDAPI godot_nativescript_unregister_instance_binding_data_functions(int p_idx);
void GDAPI *godot_nativescript_get_instance_binding_data(int p_idx, godot_object *p_object);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif