Merge pull request #46 from BastiaanOlij/sync_3.2

Update files from upstream
This commit is contained in:
Bastiaan Olij
2019-04-30 19:30:38 +10:00
committed by GitHub
5 changed files with 171568 additions and 168299 deletions

339808
api.json

File diff suppressed because it is too large Load Diff

View File

@@ -42,7 +42,7 @@ extern "C" {
// Use these to populate version in your plugin
#define GODOTVR_API_MAJOR 1
#define GODOTVR_API_MINOR 0
#define GODOTVR_API_MINOR 1
typedef struct {
godot_gdnative_api_version version; /* version of our API */
@@ -61,6 +61,8 @@ typedef struct {
void (*fill_projection_for_eye)(void *, godot_real *, godot_int, godot_real, godot_real, godot_real);
void (*commit_for_eye)(void *, godot_int, godot_rid *, godot_rect2 *);
void (*process)(void *);
// only in 1.1 onwards
godot_int (*get_external_texture_for_eye)(void *, godot_int);
} godot_arvr_interface_gdnative;
void GDAPI godot_arvr_register_interface(const godot_arvr_interface_gdnative *p_interface);

View File

@@ -6427,7 +6427,24 @@
"major": 3,
"minor": 1
},
"next": null,
"next": {
"type": "NET",
"version": {
"major": 3,
"minor": 2
},
"next": null,
"api": [
{
"name": "godot_net_bind_webrtc_peer",
"return_type": "void",
"arguments": [
["godot_object *", "p_obj"],
["const godot_net_webrtc_peer *", "p_interface"]
]
}
]
},
"api": [
{
"name": "godot_net_bind_stream_peer",

View File

@@ -129,6 +129,13 @@ typedef struct godot_gdnative_ext_videodecoder_api_struct {
void (*godot_videodecoder_register_decoder)(const godot_videodecoder_interface_gdnative *p_interface);
} godot_gdnative_ext_videodecoder_api_struct;
typedef struct godot_gdnative_ext_net_3_2_api_struct {
unsigned int type;
godot_gdnative_api_version version;
const godot_gdnative_api_struct *next;
void (*godot_net_bind_webrtc_peer)(godot_object *p_obj, const godot_net_webrtc_peer *p_interface);
} godot_gdnative_ext_net_3_2_api_struct;
typedef struct godot_gdnative_ext_net_api_struct {
unsigned int type;
godot_gdnative_api_version version;

View File

@@ -111,6 +111,35 @@ typedef struct {
/* Binds a MultiplayerPeerGDNative to the provided interface */
void GDAPI godot_net_bind_multiplayer_peer(godot_object *p_obj, const godot_net_multiplayer_peer *);
typedef struct {
godot_gdnative_api_version version; /* version of our API */
godot_object *data; /* User reference */
/* This is PacketPeer */
godot_error (*get_packet)(void *, const uint8_t **, int *);
godot_error (*put_packet)(void *, const uint8_t *, int);
godot_int (*get_available_packet_count)(const void *);
godot_int (*get_max_packet_size)(const void *);
/* This is WebRTCPeer */
void (*set_write_mode)(void *, godot_int);
godot_int (*get_write_mode)(const void *);
bool (*was_string_packet)(const void *);
godot_int (*get_connection_state)(const void *);
godot_error (*create_offer)(void *);
godot_error (*set_remote_description)(void *, const char *, const char *);
godot_error (*set_local_description)(void *, const char *, const char *);
godot_error (*add_ice_candidate)(void *, const char *, int, const char *);
godot_error (*poll)(void *);
void *next; /* For extension? */
} godot_net_webrtc_peer;
/* Binds a PacketPeerGDNative to the provided interface */
void GDAPI godot_net_bind_webrtc_peer(godot_object *p_obj, const godot_net_webrtc_peer *);
#ifdef __cplusplus
}
#endif