diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-05 09:35:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 09:35:23 +0100 |
| commit | 2b46e2e1d4bd4b062a379b8adb791ffd9444934c (patch) | |
| tree | 998ad37a2615b7baa868aec5ba05d4bd06e3b044 /servers/rendering/rendering_server_default.h | |
| parent | 578460f7fb7b694f4601e8e6fdc4a5ee67de4067 (diff) | |
| parent | ac24070056871442b0559e7875372f40aadf8d02 (diff) | |
Merge pull request #54620 from briansemrau/request-frame-callable
Use Callable in RenderingServer `request_frame_drawn_callback`
Diffstat (limited to 'servers/rendering/rendering_server_default.h')
| -rw-r--r-- | servers/rendering/rendering_server_default.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/servers/rendering/rendering_server_default.h b/servers/rendering/rendering_server_default.h index a25bd3dae5..9a592a9265 100644 --- a/servers/rendering/rendering_server_default.h +++ b/servers/rendering/rendering_server_default.h @@ -58,13 +58,7 @@ class RenderingServerDefault : public RenderingServer { static int changes; RID test_cube; - struct FrameDrawnCallbacks { - ObjectID object; - StringName method; - Variant param; - }; - - List<FrameDrawnCallbacks> frame_drawn_callbacks; + List<Callable> frame_drawn_callbacks; static void _changes_changed() {} @@ -880,7 +874,7 @@ public: /* EVENT QUEUING */ - virtual void request_frame_drawn_callback(Object *p_where, const StringName &p_method, const Variant &p_userdata) override; + virtual void request_frame_drawn_callback(const Callable &p_callable) override; virtual void draw(bool p_swap_buffers, double frame_step) override; virtual void sync() override; |