diff options
Diffstat (limited to 'platform/web/javascript_bridge_singleton.cpp')
| -rw-r--r-- | platform/web/javascript_bridge_singleton.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp index c4dbb405a3..869c2e9903 100644 --- a/platform/web/javascript_bridge_singleton.cpp +++ b/platform/web/javascript_bridge_singleton.cpp @@ -59,6 +59,8 @@ extern void godot_js_wrapper_object_unref(int p_id); extern int godot_js_wrapper_create_cb(void *p_ref, void (*p_callback)(void *p_ref, int p_arg_id, int p_argc)); extern void godot_js_wrapper_object_set_cb_ret(int p_type, godot_js_wrapper_ex *p_val); extern int godot_js_wrapper_create_object(const char *p_method, void **p_args, int p_argc, GodotJSWrapperVariant2JSCallback p_variant2js_callback, godot_js_wrapper_ex *p_cb_rval, void **p_lock, GodotJSWrapperFreeLockCallback p_lock_callback); +extern int godot_js_wrapper_object_is_buffer(int p_id); +extern int godot_js_wrapper_object_transfer_buffer(int p_id, void *p_byte_arr, void *p_byte_arr_write, void *(*p_callback)(void *p_ptr, void *p_ptr2, int p_len)); }; class JavaScriptObjectImpl : public JavaScriptObject { @@ -304,7 +306,7 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc r_error.expected = 1; return Ref<JavaScriptObject>(); } - if (p_args[0]->get_type() != Variant::STRING) { + if (!p_args[0]->is_string()) { r_error.error = Callable::CallError::CALL_ERROR_INVALID_ARGUMENT; r_error.argument = 0; r_error.expected = Variant::STRING; @@ -366,6 +368,27 @@ Variant JavaScriptBridge::eval(const String &p_code, bool p_use_global_exec_cont } } +bool JavaScriptBridge::is_js_buffer(Ref<JavaScriptObject> p_js_obj) { + Ref<JavaScriptObjectImpl> obj = p_js_obj; + if (obj.is_null()) { + return false; + } + return godot_js_wrapper_object_is_buffer(obj->_js_id); +} + +PackedByteArray JavaScriptBridge::js_buffer_to_packed_byte_array(Ref<JavaScriptObject> p_js_obj) { + ERR_FAIL_COND_V_MSG(!is_js_buffer(p_js_obj), PackedByteArray(), "The JavaScript object is not a buffer."); + Ref<JavaScriptObjectImpl> obj = p_js_obj; + + PackedByteArray arr; + VectorWriteProxy<uint8_t> arr_write; + + godot_js_wrapper_object_transfer_buffer(obj->_js_id, &arr, &arr_write, resize_PackedByteArray_and_open_write); + + arr_write = VectorWriteProxy<uint8_t>(); + return arr; +} + #endif // JAVASCRIPT_EVAL_ENABLED void JavaScriptBridge::download_buffer(Vector<uint8_t> p_arr, const String &p_name, const String &p_mime) { |