godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-11 13:10:58 +00:00
Code Releases Wiki Activity

[HTML5] Port JavaScript inline code to libraries.

Browse Source 
The API is implemented in javascript, and generates C functions that can
be called from godot.
This allows much cleaner code replacing all `EM_ASM` calls in our C++
code with plain C function calls.
This also gets rid of few hacks and comes with few optimizations (e.g.
custom cursor shapes should be much faster now).
This commit is contained in:
Fabio Alessandrelli
2020-10-23 18:33:20 +02:00
parent 54cda5c3b8
commit e2083871eb
33 changed files with 1995 additions and 1461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

247
modules/webrtc/webrtc_data_channel_js.cpp
View File

@@ -34,65 +34,58 @@
#include "emscripten.h"
extern "C" {
EMSCRIPTEN_KEEPALIVE void _emrtc_on_ch_error(void *obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(obj);
peer->_on_error();
typedef void (*RTCChOnOpen)(void *p_obj);
typedef void (*RTCChOnMessage)(void *p_obj, const uint8_t *p_buffer, int p_size, int p_is_string);
typedef void (*RTCChOnClose)(void *p_obj);
typedef void (*RTCChOnError)(void *p_obj);
extern int godot_js_rtc_datachannel_ready_state_get(int p_id);
extern int godot_js_rtc_datachannel_send(int p_id, const uint8_t *p_buffer, int p_length, int p_raw);
extern int godot_js_rtc_datachannel_is_ordered(int p_id);
extern int godot_js_rtc_datachannel_id_get(int p_id);
extern int godot_js_rtc_datachannel_max_packet_lifetime_get(int p_id);
extern int godot_js_rtc_datachannel_max_retransmits_get(int p_id);
extern int godot_js_rtc_datachannel_is_negotiated(int p_id);
extern char *godot_js_rtc_datachannel_label_get(int p_id); // Must free the returned string.
extern char *godot_js_rtc_datachannel_protocol_get(int p_id); // Must free the returned string.
extern void godot_js_rtc_datachannel_destroy(int p_id);
extern void godot_js_rtc_datachannel_connect(int p_id, void *p_obj, RTCChOnOpen p_on_open, RTCChOnMessage p_on_message, RTCChOnError p_on_error, RTCChOnClose p_on_close);
extern void godot_js_rtc_datachannel_close(int p_id);
}
EMSCRIPTEN_KEEPALIVE void _emrtc_on_ch_open(void *obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(obj);
peer->_on_open();
void WebRTCDataChannelJS::_on_open(void *p_obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(p_obj);
peer->in_buffer.resize(peer->_in_buffer_shift);
}
EMSCRIPTEN_KEEPALIVE void _emrtc_on_ch_close(void *obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(obj);
peer->_on_close();
void WebRTCDataChannelJS::_on_close(void *p_obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(p_obj);
peer->close();
}
EMSCRIPTEN_KEEPALIVE void _emrtc_on_ch_message(void *obj, uint8_t *p_data, uint32_t p_size, bool p_is_string) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(obj);
peer->_on_message(p_data, p_size, p_is_string);
}
void WebRTCDataChannelJS::_on_error(void *p_obj) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(p_obj);
peer->close();
}
void WebRTCDataChannelJS::_on_open() {
in_buffer.resize(_in_buffer_shift);
}
void WebRTCDataChannelJS::_on_message(void *p_obj, const uint8_t *p_data, int p_size, int p_is_string) {
WebRTCDataChannelJS *peer = static_cast<WebRTCDataChannelJS *>(p_obj);
RingBuffer<uint8_t> &in_buffer = peer->in_buffer;
void WebRTCDataChannelJS::_on_close() {
close();
}
void WebRTCDataChannelJS::_on_error() {
close();
}
void WebRTCDataChannelJS::_on_message(uint8_t *p_data, uint32_t p_size, bool p_is_string) {
ERR_FAIL_COND_MSG(in_buffer.space_left() < (int)(p_size + 5), "Buffer full! Dropping data.");
uint8_t is_string = p_is_string ? 1 : 0;
in_buffer.write((uint8_t *)&p_size, 4);
in_buffer.write((uint8_t *)&is_string, 1);
in_buffer.write(p_data, p_size);
queue_count++;
peer->queue_count++;
}
void WebRTCDataChannelJS::close() {
in_buffer.resize(0);
queue_count = 0;
_was_string = false;
/* clang-format off */
EM_ASM({
var dict = Module.IDHandler.get($0);
if (!dict) return;
var channel = dict["channel"];
channel.onopen = null;
channel.onclose = null;
channel.onerror = null;
channel.onmessage = null;
channel.close();
}, _js_id);
/* clang-format on */
godot_js_rtc_datachannel_close(_js_id);
}
Error WebRTCDataChannelJS::poll() {
@@ -100,24 +93,7 @@ Error WebRTCDataChannelJS::poll() {
}
WebRTCDataChannelJS::ChannelState WebRTCDataChannelJS::get_ready_state() const {
/* clang-format off */
return (ChannelState) EM_ASM_INT({
var dict = Module.IDHandler.get($0);
if (!dict) return 3; // CLOSED
var channel = dict["channel"];
switch(channel.readyState) {
case "connecting":
return 0;
case "open":
return 1;
case "closing":
return 2;
case "closed":
return 3;
}
return 3; // CLOSED
}, _js_id);
/* clang-format on */
return (ChannelState)godot_js_rtc_datachannel_ready_state_get(_js_id);
}
int WebRTCDataChannelJS::get_available_packet_count() const {
@@ -157,27 +133,7 @@ Error WebRTCDataChannelJS::put_packet(const uint8_t *p_buffer, int p_buffer_size
ERR_FAIL_COND_V(get_ready_state() != STATE_OPEN, ERR_UNCONFIGURED);
int is_bin = _write_mode == WebRTCDataChannel::WRITE_MODE_BINARY ? 1 : 0;
/* clang-format off */
EM_ASM({
var dict = Module.IDHandler.get($0);
var channel = dict["channel"];
var bytes_array = new Uint8Array($2);
var i = 0;
for(i=0; i<$2; i++) {
bytes_array[i] = getValue($1+i, 'i8');
}
if ($3) {
channel.send(bytes_array.buffer);
} else {
var string = new TextDecoder("utf-8").decode(bytes_array);
channel.send(string);
}
}, _js_id, p_buffer, p_buffer_size, is_bin);
/* clang-format on */
godot_js_rtc_datachannel_send(_js_id, p_buffer, p_buffer_size, is_bin);
return OK;
}
@@ -201,46 +157,20 @@ String WebRTCDataChannelJS::get_label() const {
return _label;
}
/* clang-format off */
#define _JS_GET(PROP, DEF) \
EM_ASM_INT({ \
var dict = Module.IDHandler.get($0); \
if (!dict || !dict["channel"]) { \
return DEF; \
} \
var out = dict["channel"].PROP; \
return out === null ? DEF : out; \
}, _js_id)
/* clang-format on */
bool WebRTCDataChannelJS::is_ordered() const {
return _JS_GET(ordered, true);
return godot_js_rtc_datachannel_is_ordered(_js_id);
}
int WebRTCDataChannelJS::get_id() const {
return _JS_GET(id, 65535);
return godot_js_rtc_datachannel_id_get(_js_id);
}
int WebRTCDataChannelJS::get_max_packet_life_time() const {
// Can't use macro, webkit workaround.
/* clang-format off */
return EM_ASM_INT({
var dict = Module.IDHandler.get($0);
if (!dict || !dict["channel"]) {
return 65535;
}
if (dict["channel"].maxRetransmitTime !== undefined) {
// Guess someone didn't appreciate the standardization process.
return dict["channel"].maxRetransmitTime;
}
var out = dict["channel"].maxPacketLifeTime;
return out === null ? 65535 : out;
}, _js_id);
/* clang-format on */
return godot_js_rtc_datachannel_max_packet_lifetime_get(_js_id);
}
int WebRTCDataChannelJS::get_max_retransmits() const {
return _JS_GET(maxRetransmits, 65535);
return godot_js_rtc_datachannel_max_retransmits_get(_js_id);
}
String WebRTCDataChannelJS::get_protocol() const {
@@ -248,7 +178,7 @@ String WebRTCDataChannelJS::get_protocol() const {
}
bool WebRTCDataChannelJS::is_negotiated() const {
return _JS_GET(negotiated, false);
return godot_js_rtc_datachannel_is_negotiated(_js_id);
}
WebRTCDataChannelJS::WebRTCDataChannelJS() {
@@ -264,101 +194,22 @@ WebRTCDataChannelJS::WebRTCDataChannelJS(int js_id) {
_write_mode = WRITE_MODE_BINARY;
_js_id = js_id;
/* clang-format off */
EM_ASM({
var c_ptr = $0;
var dict = Module.IDHandler.get($1);
if (!dict) return;
var channel = dict["channel"];
dict["ptr"] = c_ptr;
channel.binaryType = "arraybuffer";
channel.onopen = function (evt) {
ccall("_emrtc_on_ch_open",
"void",
["number"],
[c_ptr]
);
};
channel.onclose = function (evt) {
ccall("_emrtc_on_ch_close",
"void",
["number"],
[c_ptr]
);
};
channel.onerror = function (evt) {
ccall("_emrtc_on_ch_error",
"void",
["number"],
[c_ptr]
);
};
channel.onmessage = function(event) {
var buffer;
var is_string = 0;
if (event.data instanceof ArrayBuffer) {
buffer = new Uint8Array(event.data);
} else if (event.data instanceof Blob) {
console.error("Blob type not supported");
return;
} else if (typeof event.data === "string") {
is_string = 1;
var enc = new TextEncoder("utf-8");
buffer = new Uint8Array(enc.encode(event.data));
} else {
console.error("Unknown message type");
return;
}
var len = buffer.length*buffer.BYTES_PER_ELEMENT;
var out = _malloc(len);
HEAPU8.set(buffer, out);
ccall("_emrtc_on_ch_message",
"void",
["number", "number", "number", "number"],
[c_ptr, out, len, is_string]
);
_free(out);
}
}, this, js_id);
godot_js_rtc_datachannel_connect(js_id, this, &_on_open, &_on_message, &_on_error, &_on_close);
// Parse label
char *str;
str = (char *)EM_ASM_INT({
var dict = Module.IDHandler.get($0);
if (!dict || !dict["channel"]) return 0;
var str = dict["channel"].label;
var len = lengthBytesUTF8(str)+1;
var ptr = _malloc(str);
stringToUTF8(str, ptr, len+1);
return ptr;
}, js_id);
if(str != nullptr) {
_label.parse_utf8(str);
EM_ASM({ _free($0) }, str);
char *label = godot_js_rtc_datachannel_label_get(js_id);
if (label) {
_label.parse_utf8(label);
free(label);
}
str = (char *)EM_ASM_INT({
var dict = Module.IDHandler.get($0);
if (!dict || !dict["channel"]) return 0;
var str = dict["channel"].protocol;
var len = lengthBytesUTF8(str)+1;
var ptr = _malloc(str);
stringToUTF8(str, ptr, len+1);
return ptr;
}, js_id);
if(str != nullptr) {
_protocol.parse_utf8(str);
EM_ASM({ _free($0) }, str);
char *protocol = godot_js_rtc_datachannel_protocol_get(js_id);
if (protocol) {
_protocol.parse_utf8(protocol);
free(protocol);
}
/* clang-format on */
}
WebRTCDataChannelJS::~WebRTCDataChannelJS() {
close();
/* clang-format off */
EM_ASM({
Module.IDHandler.remove($0);
}, _js_id);
/* clang-format on */
};
godot_js_rtc_datachannel_destroy(_js_id);
}
#endif