From 2cce5699eaeb97db3a5fb82f31acd277443b6c08 Mon Sep 17 00:00:00 2001 From: Emmanuel Barroga Date: Wed, 12 Jun 2019 20:37:51 -0700 Subject: [PATCH] Limit Physics Process FPS above 0 Resolves: #19734 --- core/engine.cpp | 1 + main/main.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/core/engine.cpp b/core/engine.cpp index 9607dedb3c2..50822244cf1 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -38,6 +38,7 @@ void Engine::set_iterations_per_second(int p_ips) { + ERR_FAIL_COND(p_ips <= 0); ips = p_ips; } int Engine::get_iterations_per_second() const { diff --git a/main/main.cpp b/main/main.cpp index 3f01a17ea7c..7e4fdeeaa72 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1020,6 +1020,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/physics_fps", 60)); + ProjectSettings::get_singleton()->set_custom_property_info("physics/common/physics_fps", PropertyInfo(Variant::INT, "physics/common/physics_fps", PROPERTY_HINT_RANGE, "1,120,1,or_greater")); Engine::get_singleton()->set_physics_jitter_fix(GLOBAL_DEF("physics/common/physics_jitter_fix", 0.5)); Engine::get_singleton()->set_target_fps(GLOBAL_DEF("debug/settings/fps/force_fps", 0)); ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/fps/force_fps", PropertyInfo(Variant::INT, "debug/settings/fps/force_fps", PROPERTY_HINT_RANGE, "0,120,1,or_greater"));