Simplify network GDExtension bindings using EXBIND macros.

Simplify StreamPeer, PacketPeer, MultiplayerPeer extension.

Simplify and update WebRTC*Extension with newly supported types.

1 files changed, 7 insertions, 103 deletions

diff --git a/scene/main/multiplayer_peer.cpp b/scene/main/multiplayer_peer.cpp
index aad5baccab..9b63118f7c 100644
--- a/scene/main/multiplayer_peer.cpp
+++ b/scene/main/multiplayer_peer.cpp
@@ -120,19 +120,10 @@ void MultiplayerPeer::_bind_methods() {
 
 /*************/
 
-int MultiplayerPeerExtension::get_available_packet_count() const {
-	int count;
-	if (GDVIRTUAL_CALL(_get_available_packet_count, count)) {
-		return count;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_get_available_packet_count is unimplemented!");
-	return -1;
-}
-
 Error MultiplayerPeerExtension::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
-	int err;
+	Error err;
 	if (GDVIRTUAL_CALL(_get_packet, r_buffer, &r_buffer_size, err)) {
-		return (Error)err;
+		return err;
 	}
 	if (GDVIRTUAL_IS_OVERRIDDEN(_get_packet_script)) {
 		if (!GDVIRTUAL_CALL(_get_packet_script, script_buffer)) {
@@ -153,9 +144,9 @@ Error MultiplayerPeerExtension::get_packet(const uint8_t **r_buffer, int &r_buff
 }
 
 Error MultiplayerPeerExtension::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
-	int err;
+	Error err;
 	if (GDVIRTUAL_CALL(_put_packet, p_buffer, p_buffer_size, err)) {
-		return (Error)err;
+		return err;
 	}
 	if (GDVIRTUAL_IS_OVERRIDDEN(_put_packet_script)) {
 		PackedByteArray a;
@@ -171,87 +162,6 @@ Error MultiplayerPeerExtension::put_packet(const uint8_t *p_buffer, int p_buffer
 	return FAILED;
 }
 
-int MultiplayerPeerExtension::get_max_packet_size() const {
-	int size;
-	if (GDVIRTUAL_CALL(_get_max_packet_size, size)) {
-		return size;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_get_max_packet_size is unimplemented!");
-	return 0;
-}
-
-void MultiplayerPeerExtension::set_transfer_channel(int p_channel) {
-	if (GDVIRTUAL_CALL(_set_transfer_channel, p_channel)) {
-		return;
-	}
-	MultiplayerPeer::set_transfer_channel(p_channel);
-}
-
-int MultiplayerPeerExtension::get_transfer_channel() const {
-	int channel;
-	if (GDVIRTUAL_CALL(_get_transfer_channel, channel)) {
-		return channel;
-	}
-	return MultiplayerPeer::get_transfer_channel();
-}
-
-void MultiplayerPeerExtension::set_transfer_mode(TransferMode p_mode) {
-	if (GDVIRTUAL_CALL(_set_transfer_mode, p_mode)) {
-		return;
-	}
-	MultiplayerPeer::set_transfer_mode(p_mode);
-}
-
-MultiplayerPeer::TransferMode MultiplayerPeerExtension::get_transfer_mode() const {
-	int mode;
-	if (GDVIRTUAL_CALL(_get_transfer_mode, mode)) {
-		return (MultiplayerPeer::TransferMode)mode;
-	}
-	return MultiplayerPeer::get_transfer_mode();
-}
-
-void MultiplayerPeerExtension::set_target_peer(int p_peer_id) {
-	if (GDVIRTUAL_CALL(_set_target_peer, p_peer_id)) {
-		return;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_set_target_peer is unimplemented!");
-}
-
-int MultiplayerPeerExtension::get_packet_peer() const {
-	int peer;
-	if (GDVIRTUAL_CALL(_get_packet_peer, peer)) {
-		return peer;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_get_packet_peer is unimplemented!");
-	return 0;
-}
-
-bool MultiplayerPeerExtension::is_server() const {
-	bool server;
-	if (GDVIRTUAL_CALL(_is_server, server)) {
-		return server;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_is_server is unimplemented!");
-	return false;
-}
-
-void MultiplayerPeerExtension::poll() {
-	int err;
-	if (GDVIRTUAL_CALL(_poll, err)) {
-		return;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_poll is unimplemented!");
-}
-
-int MultiplayerPeerExtension::get_unique_id() const {
-	int id;
-	if (GDVIRTUAL_CALL(_get_unique_id, id)) {
-		return id;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_get_unique_id is unimplemented!");
-	return 0;
-}
-
 void MultiplayerPeerExtension::set_refuse_new_connections(bool p_enable) {
 	if (GDVIRTUAL_CALL(_set_refuse_new_connections, p_enable)) {
 		return;
@@ -267,15 +177,6 @@ bool MultiplayerPeerExtension::is_refusing_new_connections() const {
 	return MultiplayerPeer::is_refusing_new_connections();
 }
 
-MultiplayerPeer::ConnectionStatus MultiplayerPeerExtension::get_connection_status() const {
-	int status;
-	if (GDVIRTUAL_CALL(_get_connection_status, status)) {
-		return (ConnectionStatus)status;
-	}
-	WARN_PRINT_ONCE("MultiplayerPeerExtension::_get_connection_status is unimplemented!");
-	return CONNECTION_DISCONNECTED;
-}
-
 void MultiplayerPeerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_get_packet, "r_buffer", "r_buffer_size");
 	GDVIRTUAL_BIND(_put_packet, "p_buffer", "p_buffer_size");
@@ -300,4 +201,7 @@ void MultiplayerPeerExtension::_bind_methods() {
 	GDVIRTUAL_BIND(_set_refuse_new_connections, "p_enable");
 	GDVIRTUAL_BIND(_is_refusing_new_connections);
 	GDVIRTUAL_BIND(_get_connection_status);
+
+	ADD_PROPERTY_DEFAULT("transfer_mode", TRANSFER_MODE_RELIABLE);
+	ADD_PROPERTY_DEFAULT("transfer_channel", 0);
 }