From 1049927a596402cd2e8215cd6624868929f5f18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 3 Aug 2022 10:12:30 +0200 Subject: [PATCH] Sync API with upstream 3.x commit a1c0be731 https://github.com/godotengine/godot/commit/a1c0be731d1e5423bfd2a524cd6be8aa5781474c --- android/godot_android.h | 6 +++--- api.json | 31 +++++++++++++++++++++++++++++++ arvr/godot_arvr.h | 6 +++--- gdnative/aabb.h | 6 +++--- gdnative/array.h | 6 +++--- gdnative/basis.h | 6 +++--- gdnative/color.h | 6 +++--- gdnative/dictionary.h | 6 +++--- gdnative/gdnative.h | 6 +++--- gdnative/node_path.h | 6 +++--- gdnative/plane.h | 6 +++--- gdnative/pool_arrays.h | 6 +++--- gdnative/quat.h | 6 +++--- gdnative/rect2.h | 6 +++--- gdnative/rid.h | 6 +++--- gdnative/string.h | 6 +++--- gdnative/string_name.h | 6 +++--- gdnative/transform.h | 6 +++--- gdnative/transform2d.h | 6 +++--- gdnative/variant.h | 6 +++--- gdnative/vector2.h | 6 +++--- gdnative/vector3.h | 6 +++--- nativescript/godot_nativescript.h | 2 +- net/godot_net.h | 6 +++--- net/godot_webrtc.h | 6 +++--- videodecoder/godot_videodecoder.h | 6 +++--- 26 files changed, 104 insertions(+), 73 deletions(-) diff --git a/android/godot_android.h b/android/godot_android.h index 859a85a..8e7397f 100644 --- a/android/godot_android.h +++ b/android/godot_android.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_ANDROID_GDN_H -#define GODOT_ANDROID_GDN_H +#ifndef GODOT_ANDROID_H +#define GODOT_ANDROID_H #include @@ -53,4 +53,4 @@ bool GDAPI godot_android_is_activity_resumed(); } #endif -#endif /* !GODOT_ANDROID_GDN_H */ +#endif // GODOT_ANDROID_H diff --git a/api.json b/api.json index 8406e88..6813654 100644 --- a/api.json +++ b/api.json @@ -203621,6 +203621,31 @@ } ] }, + { + "name": "viewport_set_use_32_bpc_depth", + "return_type": "void", + "is_editor": false, + "is_noscript": false, + "is_const": false, + "is_reverse": false, + "is_virtual": false, + "has_varargs": false, + "is_from_script": false, + "arguments": [ + { + "name": "viewport", + "type": "RID", + "has_default_value": false, + "default_value": "" + }, + { + "name": "enabled", + "type": "bool", + "has_default_value": false, + "default_value": "" + } + ] + }, { "name": "viewport_set_use_arvr", "return_type": "void", @@ -213540,6 +213565,12 @@ "has_varargs": false, "is_from_script": false, "arguments": [ + { + "name": "skip_cr", + "type": "bool", + "has_default_value": true, + "default_value": "True" + } ] }, { diff --git a/arvr/godot_arvr.h b/arvr/godot_arvr.h index dbf0426..7a07380 100644 --- a/arvr/godot_arvr.h +++ b/arvr/godot_arvr.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEARVR_H -#define GODOT_NATIVEARVR_H +#ifndef GODOT_ARVR_H +#define GODOT_ARVR_H #include @@ -95,4 +95,4 @@ godot_int GDAPI godot_arvr_get_depthid(godot_rid *p_render_target); } #endif -#endif /* !GODOT_NATIVEARVR_H */ +#endif // GODOT_ARVR_H diff --git a/gdnative/aabb.h b/gdnative/aabb.h index 69256e3..df81a49 100644 --- a/gdnative/aabb.h +++ b/gdnative/aabb.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_AABB_H -#define GODOT_AABB_H +#ifndef GDNATIVE_AABB_H +#define GDNATIVE_AABB_H #ifdef __cplusplus extern "C" { @@ -115,4 +115,4 @@ godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot } #endif -#endif // GODOT_AABB_H +#endif // GDNATIVE_AABB_H diff --git a/gdnative/array.h b/gdnative/array.h index d14926d..a9e3a51 100644 --- a/gdnative/array.h +++ b/gdnative/array.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_ARRAY_H -#define GODOT_ARRAY_H +#ifndef GDNATIVE_ARRAY_H +#define GDNATIVE_ARRAY_H #ifdef __cplusplus extern "C" { @@ -144,4 +144,4 @@ void GDAPI godot_array_shuffle(godot_array *p_self); } #endif -#endif // GODOT_ARRAY_H +#endif // GDNATIVE_ARRAY_H diff --git a/gdnative/basis.h b/gdnative/basis.h index 012ac79..85c6f76 100644 --- a/gdnative/basis.h +++ b/gdnative/basis.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_BASIS_H -#define GODOT_BASIS_H +#ifndef GDNATIVE_BASIS_H +#define GDNATIVE_BASIS_H #ifdef __cplusplus extern "C" { @@ -133,4 +133,4 @@ godot_basis GDAPI godot_basis_slerp(const godot_basis *p_self, const godot_basis } #endif -#endif // GODOT_BASIS_H +#endif // GDNATIVE_BASIS_H diff --git a/gdnative/color.h b/gdnative/color.h index 8c28b82..3e55b17 100644 --- a/gdnative/color.h +++ b/gdnative/color.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_COLOR_H -#define GODOT_COLOR_H +#ifndef GDNATIVE_COLOR_H +#define GDNATIVE_COLOR_H #ifdef __cplusplus extern "C" { @@ -117,4 +117,4 @@ godot_bool GDAPI godot_color_operator_less(const godot_color *p_self, const godo } #endif -#endif // GODOT_COLOR_H +#endif // GDNATIVE_COLOR_H diff --git a/gdnative/dictionary.h b/gdnative/dictionary.h index 1a7411e..00e697a 100644 --- a/gdnative/dictionary.h +++ b/gdnative/dictionary.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_DICTIONARY_H -#define GODOT_DICTIONARY_H +#ifndef GDNATIVE_DICTIONARY_H +#define GDNATIVE_DICTIONARY_H #ifdef __cplusplus extern "C" { @@ -110,4 +110,4 @@ void GDAPI godot_dictionary_merge(godot_dictionary *p_self, const godot_dictiona } #endif -#endif // GODOT_DICTIONARY_H +#endif // GDNATIVE_DICTIONARY_H diff --git a/gdnative/gdnative.h b/gdnative/gdnative.h index 664fbe9..67a6919 100644 --- a/gdnative/gdnative.h +++ b/gdnative/gdnative.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_GDNATIVE_H -#define GODOT_GDNATIVE_H +#ifndef GDNATIVE_GDNATIVE_H +#define GDNATIVE_GDNATIVE_H #ifdef __cplusplus extern "C" { @@ -301,4 +301,4 @@ godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id); } #endif -#endif // GODOT_C_H +#endif // GDNATIVE_GDNATIVE_H diff --git a/gdnative/node_path.h b/gdnative/node_path.h index 9c4f1e0..36e1535 100644 --- a/gdnative/node_path.h +++ b/gdnative/node_path.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NODE_PATH_H -#define GODOT_NODE_PATH_H +#ifndef GDNATIVE_NODE_PATH_H +#define GDNATIVE_NODE_PATH_H #ifdef __cplusplus extern "C" { @@ -86,4 +86,4 @@ godot_node_path godot_node_path_get_as_property_path(const godot_node_path *p_se } #endif -#endif // GODOT_NODE_PATH_H +#endif // GDNATIVE_NODE_PATH_H diff --git a/gdnative/plane.h b/gdnative/plane.h index fe817de..834ceeb 100644 --- a/gdnative/plane.h +++ b/gdnative/plane.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_PLANE_H -#define GODOT_PLANE_H +#ifndef GDNATIVE_PLANE_H +#define GDNATIVE_PLANE_H #ifdef __cplusplus extern "C" { @@ -100,4 +100,4 @@ void GDAPI godot_plane_set_d(godot_plane *p_self, const godot_real p_d); } #endif -#endif // GODOT_PLANE_H +#endif // GDNATIVE_PLANE_H diff --git a/gdnative/pool_arrays.h b/gdnative/pool_arrays.h index 279f22d..54aa5d9 100644 --- a/gdnative/pool_arrays.h +++ b/gdnative/pool_arrays.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_POOL_ARRAYS_H -#define GODOT_POOL_ARRAYS_H +#ifndef GDNATIVE_POOL_ARRAYS_H +#define GDNATIVE_POOL_ARRAYS_H #ifdef __cplusplus extern "C" { @@ -505,4 +505,4 @@ void GDAPI godot_pool_color_array_write_access_destroy(godot_pool_color_array_wr } #endif -#endif // GODOT_POOL_ARRAYS_H +#endif // GDNATIVE_POOL_ARRAYS_H diff --git a/gdnative/quat.h b/gdnative/quat.h index 171efef..243f959 100644 --- a/gdnative/quat.h +++ b/gdnative/quat.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_QUAT_H -#define GODOT_QUAT_H +#ifndef GDNATIVE_QUAT_H +#define GDNATIVE_QUAT_H #ifdef __cplusplus extern "C" { @@ -115,4 +115,4 @@ void GDAPI godot_quat_set_axis_angle(godot_quat *p_self, const godot_vector3 *p_ } #endif -#endif // GODOT_QUAT_H +#endif // GDNATIVE_QUAT_H diff --git a/gdnative/rect2.h b/gdnative/rect2.h index 15d7cf2..d046e6d 100644 --- a/gdnative/rect2.h +++ b/gdnative/rect2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_RECT2_H -#define GODOT_RECT2_H +#ifndef GDNATIVE_RECT2_H +#define GDNATIVE_RECT2_H #ifdef __cplusplus extern "C" { @@ -99,4 +99,4 @@ void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size } #endif -#endif // GODOT_RECT2_H +#endif // GDNATIVE_RECT2_H diff --git a/gdnative/rid.h b/gdnative/rid.h index 349907f..a9862eb 100644 --- a/gdnative/rid.h +++ b/gdnative/rid.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_RID_H -#define GODOT_RID_H +#ifndef GDNATIVE_RID_H +#define GDNATIVE_RID_H #ifdef __cplusplus extern "C" { @@ -71,4 +71,4 @@ godot_bool GDAPI godot_rid_operator_less(const godot_rid *p_self, const godot_ri } #endif -#endif // GODOT_RID_H +#endif // GDNATIVE_RID_H diff --git a/gdnative/string.h b/gdnative/string.h index 047b447..32e4fff 100644 --- a/gdnative/string.h +++ b/gdnative/string.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_STRING_H -#define GODOT_STRING_H +#ifndef GDNATIVE_STRING_H +#define GDNATIVE_STRING_H #ifdef __cplusplus extern "C" { @@ -264,4 +264,4 @@ void GDAPI godot_string_destroy(godot_string *p_self); } #endif -#endif // GODOT_STRING_H +#endif // GDNATIVE_STRING_H diff --git a/gdnative/string_name.h b/gdnative/string_name.h index 46ce681..e6a353e 100644 --- a/gdnative/string_name.h +++ b/gdnative/string_name.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_STRING_NAME_H -#define GODOT_STRING_NAME_H +#ifndef GDNATIVE_STRING_NAME_H +#define GDNATIVE_STRING_NAME_H #ifdef __cplusplus extern "C" { @@ -75,4 +75,4 @@ void GDAPI godot_string_name_destroy(godot_string_name *p_self); } #endif -#endif // GODOT_STRING_NAME_H +#endif // GDNATIVE_STRING_NAME_H diff --git a/gdnative/transform.h b/gdnative/transform.h index faedb1f..18d1ff2 100644 --- a/gdnative/transform.h +++ b/gdnative/transform.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_TRANSFORM_H -#define GODOT_TRANSFORM_H +#ifndef GDNATIVE_TRANSFORM_H +#define GDNATIVE_TRANSFORM_H #ifdef __cplusplus extern "C" { @@ -108,4 +108,4 @@ godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, c } #endif -#endif // GODOT_TRANSFORM_H +#endif // GDNATIVE_TRANSFORM_H diff --git a/gdnative/transform2d.h b/gdnative/transform2d.h index 0093769..d632722 100644 --- a/gdnative/transform2d.h +++ b/gdnative/transform2d.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_TRANSFORM2D_H -#define GODOT_TRANSFORM2D_H +#ifndef GDNATIVE_TRANSFORM2D_H +#define GDNATIVE_TRANSFORM2D_H #ifdef __cplusplus extern "C" { @@ -106,4 +106,4 @@ godot_rect2 GDAPI godot_transform2d_xform_inv_rect2(const godot_transform2d *p_s } #endif -#endif // GODOT_TRANSFORM2D_H +#endif // GDNATIVE_TRANSFORM2D_H diff --git a/gdnative/variant.h b/gdnative/variant.h index 350e719..47b571c 100644 --- a/gdnative/variant.h +++ b/gdnative/variant.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VARIANT_H -#define GODOT_VARIANT_H +#ifndef GDNATIVE_VARIANT_H +#define GDNATIVE_VARIANT_H #ifdef __cplusplus extern "C" { @@ -252,4 +252,4 @@ void GDAPI godot_variant_evaluate(godot_variant_operator p_op, const godot_varia } #endif -#endif +#endif // GDNATIVE_VARIANT_H diff --git a/gdnative/vector2.h b/gdnative/vector2.h index 1d780eb..b548c89 100644 --- a/gdnative/vector2.h +++ b/gdnative/vector2.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VECTOR2_H -#define GODOT_VECTOR2_H +#ifndef GDNATIVE_VECTOR2_H +#define GDNATIVE_VECTOR2_H #ifdef __cplusplus extern "C" { @@ -139,4 +139,4 @@ godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self); } #endif -#endif // GODOT_VECTOR2_H +#endif // GDNATIVE_VECTOR2_H diff --git a/gdnative/vector3.h b/gdnative/vector3.h index 68ca1cd..a5084c1 100644 --- a/gdnative/vector3.h +++ b/gdnative/vector3.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_VECTOR3_H -#define GODOT_VECTOR3_H +#ifndef GDNATIVE_VECTOR3_H +#define GDNATIVE_VECTOR3_H #ifdef __cplusplus extern "C" { @@ -146,4 +146,4 @@ godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot } #endif -#endif // GODOT_VECTOR3_H +#endif // GDNATIVE_VECTOR3_H diff --git a/nativescript/godot_nativescript.h b/nativescript/godot_nativescript.h index 2e5d923..42fad62 100644 --- a/nativescript/godot_nativescript.h +++ b/nativescript/godot_nativescript.h @@ -249,4 +249,4 @@ void GDAPI godot_nativescript_profiling_add_data(const char *p_signature, uint64 } #endif -#endif +#endif // GODOT_NATIVESCRIPT_H diff --git a/net/godot_net.h b/net/godot_net.h index e10277b..4834c18 100644 --- a/net/godot_net.h +++ b/net/godot_net.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVENET_H -#define GODOT_NATIVENET_H +#ifndef GODOT_NET_H +#define GODOT_NET_H #include @@ -117,4 +117,4 @@ void GDAPI godot_net_bind_multiplayer_peer(godot_object *p_obj, const godot_net_ // WebRTC Bindings #include "net/godot_webrtc.h" -#endif /* GODOT_NATIVENET_H */ +#endif // GODOT_NET_H diff --git a/net/godot_webrtc.h b/net/godot_webrtc.h index 6d640fb..f51c0bc 100644 --- a/net/godot_webrtc.h +++ b/net/godot_webrtc.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEWEBRTC_H -#define GODOT_NATIVEWEBRTC_H +#ifndef GODOT_WEBRTC_H +#define GODOT_WEBRTC_H #include @@ -126,4 +126,4 @@ void GDAPI godot_net_bind_webrtc_data_channel(godot_object *p_obj, const godot_n } #endif -#endif +#endif // GODOT_WEBRTC_H diff --git a/videodecoder/godot_videodecoder.h b/videodecoder/godot_videodecoder.h index 4de0f45..cb215d6 100644 --- a/videodecoder/godot_videodecoder.h +++ b/videodecoder/godot_videodecoder.h @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_NATIVEVIDEODECODER_H -#define GODOT_NATIVEVIDEODECODER_H +#ifndef GODOT_VIDEODECODER_H +#define GODOT_VIDEODECODER_H #include @@ -72,4 +72,4 @@ void GDAPI godot_videodecoder_register_decoder(const godot_videodecoder_interfac } #endif -#endif /* GODOT_NATIVEVIDEODECODER_H */ +#endif // GODOT_VIDEODECODER_H