From 17c87d2ec1c7f51bb58091a2ede746e67fb709b1 Mon Sep 17 00:00:00 2001 From: Ev1lbl0w Date: Thu, 18 Jun 2020 11:49:24 +0100 Subject: [PATCH] Expose disable_render_loop property to GDScript --- doc/classes/VisualServer.xml | 5 +++++ main/main.cpp | 5 ++++- servers/visual_server.cpp | 12 ++++++++++++ servers/visual_server.h | 4 ++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index 6941175870b..81acdf04997 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -4231,6 +4231,11 @@ + + + If [code]false[/code], disables rendering completely, but the engine logic is still being processed. You can call [method force_draw] to draw a frame even with rendering disabled. + + diff --git a/main/main.cpp b/main/main.cpp index 1174079c5b7..74b53a5435f 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1271,6 +1271,9 @@ Error Main::setup2(Thread::ID p_main_tid_override) { // also init our arvr_server from here arvr_server = memnew(ARVRServer); + // and finally setup this property under visual_server + VisualServer::get_singleton()->set_render_loop_enabled(!disable_render_loop); + register_core_singletons(); MAIN_PRINT("Main: Setup Logo"); @@ -2101,7 +2104,7 @@ bool Main::iteration() { VisualServer::get_singleton()->sync(); //sync if still drawing from previous frames. - if (OS::get_singleton()->can_draw() && !disable_render_loop) { + if (OS::get_singleton()->can_draw() && VisualServer::get_singleton()->is_render_loop_enabled()) { if ((!force_redraw_requested) && OS::get_singleton()->is_in_low_processor_usage_mode()) { if (VisualServer::get_singleton()->has_changed()) { diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index a4a399998bb..71502cad741 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -2050,6 +2050,10 @@ void VisualServer::_bind_methods() { ClassDB::bind_method(D_METHOD("has_os_feature", "feature"), &VisualServer::has_os_feature); ClassDB::bind_method(D_METHOD("set_debug_generate_wireframes", "generate"), &VisualServer::set_debug_generate_wireframes); + ClassDB::bind_method(D_METHOD("is_render_loop_enabled"), &VisualServer::is_render_loop_enabled); + ClassDB::bind_method(D_METHOD("set_render_loop_enabled", "enabled"), &VisualServer::set_render_loop_enabled); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "render_loop_enabled"), "set_render_loop_enabled", "is_render_loop_enabled"); + BIND_CONSTANT(NO_INDEX_ARRAY); BIND_CONSTANT(ARRAY_WEIGHTS_SIZE); BIND_CONSTANT(CANVAS_ITEM_Z_MIN); @@ -2368,6 +2372,14 @@ RID VisualServer::instance_create2(RID p_base, RID p_scenario) { return instance; } +bool VisualServer::is_render_loop_enabled() const { + return render_loop_enabled; +} + +void VisualServer::set_render_loop_enabled(bool p_enabled) { + render_loop_enabled = p_enabled; +} + VisualServer::VisualServer() { //ERR_FAIL_COND(singleton); diff --git a/servers/visual_server.h b/servers/visual_server.h index 30d6d68f2aa..5876f089fa0 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -46,6 +46,7 @@ class VisualServer : public Object { static VisualServer *singleton; int mm_policy; + bool render_loop_enabled = true; void _camera_set_orthogonal(RID p_camera, float p_size, float p_z_near, float p_z_far); void _canvas_item_add_style_box(RID p_item, const Rect2 &p_rect, const Rect2 &p_source, RID p_texture, const Vector &p_margins, const Color &p_modulate = Color(1, 1, 1)); @@ -1063,6 +1064,9 @@ public: virtual bool is_low_end() const = 0; + bool is_render_loop_enabled() const; + void set_render_loop_enabled(bool p_enabled); + VisualServer(); virtual ~VisualServer(); };