Bläddra i källkod

Add WebRTC GDNative interface

Fabio Alessandrelli 6 år sedan
förälder
incheckning
320960cd32

+ 18 - 1
modules/gdnative/gdnative_api.json

@@ -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",

+ 29 - 0
modules/gdnative/include/net/godot_net.h

@@ -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

+ 7 - 1
modules/gdnative/net/SCsub

@@ -3,5 +3,11 @@
 Import('env')
 Import('env_gdnative')
 
-env_gdnative.add_source_files(env.modules_sources, '*.cpp')
+env_net = env_gdnative.Clone()
+
+has_webrtc = env_net["module_webrtc_enabled"]
+if has_webrtc:
+    env_net.Append(CPPDEFINES=['WEBRTC_GDNATIVE_ENABLED'])
+
+env_net.add_source_files(env.modules_sources, '*.cpp')
 

+ 45 - 0
modules/gdnative/net/webrtc_peer_gdnative.cpp

@@ -0,0 +1,45 @@
+/*************************************************************************/
+/*  packet_peer_gdnative.cpp                                             */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "modules/gdnative/gdnative.h"
+#include "modules/gdnative/include/net/godot_net.h"
+
+#ifdef WEBRTC_GDNATIVE_ENABLED
+#include "modules/webrtc/webrtc_peer_gdnative.h"
+#endif
+
+extern "C" {
+
+void GDAPI godot_net_bind_webrtc_peer(godot_object *p_obj, const godot_net_webrtc_peer *p_impl) {
+#ifdef WEBRTC_GDNATIVE_ENABLED
+	((WebRTCPeerGDNative *)p_obj)->set_native_webrtc_peer(p_impl);
+#endif
+}
+}

+ 6 - 0
modules/webrtc/SCsub

@@ -6,5 +6,11 @@ Import('env_modules')
 # Thirdparty source files
 
 env_webrtc = env_modules.Clone()
+use_gdnative = env_webrtc["module_gdnative_enabled"]
+
+if use_gdnative: # GDNative is retained in Javascript for export compatibility
+    env_webrtc.Append(CPPDEFINES=['WEBRTC_GDNATIVE_ENABLED'])
+    gdnative_includes = ["#modules/gdnative/include/"]
+    env_webrtc.Append(CPPPATH=gdnative_includes)
 
 env_webrtc.add_source_files(env.modules_sources, "*.cpp")

+ 114 - 0
modules/webrtc/webrtc_peer_gdnative.cpp

@@ -0,0 +1,114 @@
+/*************************************************************************/
+/*  webrtc_peer_gdnative.cpp                                             */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifdef WEBRTC_GDNATIVE_ENABLED
+
+#include "webrtc_peer_gdnative.h"
+
+void WebRTCPeerGDNative::_bind_methods() {
+}
+
+WebRTCPeerGDNative::WebRTCPeerGDNative() {
+	interface = NULL;
+}
+
+WebRTCPeerGDNative::~WebRTCPeerGDNative() {
+}
+
+Error WebRTCPeerGDNative::create_offer() {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->create_offer(interface->data);
+}
+
+Error WebRTCPeerGDNative::set_local_description(String p_type, String p_sdp) {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->set_local_description(interface->data, p_type.utf8().get_data(), p_sdp.utf8().get_data());
+}
+
+Error WebRTCPeerGDNative::set_remote_description(String p_type, String p_sdp) {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->set_remote_description(interface->data, p_type.utf8().get_data(), p_sdp.utf8().get_data());
+}
+
+Error WebRTCPeerGDNative::add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName) {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->add_ice_candidate(interface->data, sdpMidName.utf8().get_data(), sdpMlineIndexName, sdpName.utf8().get_data());
+}
+
+Error WebRTCPeerGDNative::poll() {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->poll(interface->data);
+}
+
+void WebRTCPeerGDNative::set_write_mode(WriteMode p_mode) {
+	ERR_FAIL_COND(interface == NULL);
+	interface->set_write_mode(interface->data, p_mode);
+}
+
+WebRTCPeer::WriteMode WebRTCPeerGDNative::get_write_mode() const {
+	ERR_FAIL_COND_V(interface == NULL, WRITE_MODE_BINARY);
+	return (WriteMode)interface->get_write_mode(interface->data);
+}
+
+bool WebRTCPeerGDNative::was_string_packet() const {
+	ERR_FAIL_COND_V(interface == NULL, false);
+	return interface->was_string_packet(interface->data);
+}
+
+WebRTCPeer::ConnectionState WebRTCPeerGDNative::get_connection_state() const {
+	ERR_FAIL_COND_V(interface == NULL, STATE_DISCONNECTED);
+	return STATE_DISCONNECTED;
+}
+
+Error WebRTCPeerGDNative::get_packet(const uint8_t **r_buffer, int &r_buffer_size) {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->get_packet(interface->data, r_buffer, &r_buffer_size);
+}
+
+Error WebRTCPeerGDNative::put_packet(const uint8_t *p_buffer, int p_buffer_size) {
+	ERR_FAIL_COND_V(interface == NULL, ERR_UNCONFIGURED);
+	return (Error)interface->put_packet(interface->data, p_buffer, p_buffer_size);
+}
+
+int WebRTCPeerGDNative::get_max_packet_size() const {
+	ERR_FAIL_COND_V(interface == NULL, 0);
+	return interface->get_max_packet_size(interface->data);
+}
+
+int WebRTCPeerGDNative::get_available_packet_count() const {
+	ERR_FAIL_COND_V(interface == NULL, 0);
+	return interface->get_available_packet_count(interface->data);
+}
+
+void WebRTCPeerGDNative::set_native_webrtc_peer(const godot_net_webrtc_peer *p_impl) {
+	interface = p_impl;
+}
+
+#endif // WEBRTC_GDNATIVE_ENABLED

+ 78 - 0
modules/webrtc/webrtc_peer_gdnative.h

@@ -0,0 +1,78 @@
+/*************************************************************************/
+/*  webrtc_peer_gdnative.h                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifdef WEBRTC_GDNATIVE_ENABLED
+
+#ifndef WEBRTC_PEER_GDNATIVE_H
+#define WEBRTC_PEER_GDNATIVE_H
+
+#include "modules/gdnative/include/net/godot_net.h"
+#include "webrtc_peer.h"
+
+class WebRTCPeerGDNative : public WebRTCPeer {
+	GDCLASS(WebRTCPeerGDNative, WebRTCPeer);
+
+protected:
+	static void _bind_methods();
+
+private:
+	const godot_net_webrtc_peer *interface;
+
+public:
+	static WebRTCPeer *_create() { return memnew(WebRTCPeerGDNative); }
+	static void make_default() { WebRTCPeer::_create = WebRTCPeerGDNative::_create; }
+
+	void set_native_webrtc_peer(const godot_net_webrtc_peer *p_impl);
+
+	virtual void set_write_mode(WriteMode mode);
+	virtual WriteMode get_write_mode() const;
+	virtual bool was_string_packet() const;
+	virtual ConnectionState get_connection_state() const;
+
+	virtual Error create_offer();
+	virtual Error set_remote_description(String type, String sdp);
+	virtual Error set_local_description(String type, String sdp);
+	virtual Error add_ice_candidate(String sdpMidName, int sdpMlineIndexName, String sdpName);
+	virtual Error poll();
+
+	/** Inherited from PacketPeer: **/
+	virtual int get_available_packet_count() const;
+	virtual Error get_packet(const uint8_t **r_buffer, int &r_buffer_size); ///< buffer is GONE after next get_packet
+	virtual Error put_packet(const uint8_t *p_buffer, int p_buffer_size);
+
+	virtual int get_max_packet_size() const;
+
+	WebRTCPeerGDNative();
+	~WebRTCPeerGDNative();
+};
+
+#endif // WEBRTC_PEER_GDNATIVE_H
+
+#endif // WEBRTC_GDNATIVE_ENABLED