diff options
Diffstat (limited to 'core/message_queue.h')
| -rw-r--r-- | core/message_queue.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/message_queue.h b/core/message_queue.h index e9a92ff5b7..710a605371 100644 --- a/core/message_queue.h +++ b/core/message_queue.h @@ -35,12 +35,10 @@ #include "core/os/thread_safe.h" class MessageQueue { - _THREAD_SAFE_CLASS_ enum { - - DEFAULT_QUEUE_SIZE_KB = 1024 + DEFAULT_QUEUE_SIZE_KB = 4096 }; enum { @@ -53,9 +51,7 @@ class MessageQueue { }; struct Message { - - ObjectID instance_id; - StringName target; + Callable callable; int16_t type; union { int16_t notification; @@ -64,15 +60,15 @@ class MessageQueue { }; uint8_t *buffer; - uint32_t buffer_end; - uint32_t buffer_max_used; + uint32_t buffer_end = 0; + uint32_t buffer_max_used = 0; uint32_t buffer_size; - void _call_function(Object *p_target, const StringName &p_func, const Variant *p_args, int p_argcount, bool p_show_error); + void _call_function(const Callable &p_callable, const Variant *p_args, int p_argcount, bool p_show_error); static MessageQueue *singleton; - bool flushing; + bool flushing = false; public: static MessageQueue *get_singleton(); @@ -81,6 +77,8 @@ public: Error push_call(ObjectID p_id, const StringName &p_method, VARIANT_ARG_LIST); Error push_notification(ObjectID p_id, int p_notification); Error push_set(ObjectID p_id, const StringName &p_prop, const Variant &p_value); + Error push_callable(const Callable &p_callable, const Variant **p_args, int p_argcount, bool p_show_error = false); + Error push_callable(const Callable &p_callable, VARIANT_ARG_LIST); Error push_call(Object *p_object, const StringName &p_method, VARIANT_ARG_LIST); Error push_notification(Object *p_object, int p_notification); |