diff options
Diffstat (limited to 'core/engine.cpp')
-rw-r--r-- | core/engine.cpp | 44 |
1 files changed, 10 insertions, 34 deletions
diff --git a/core/engine.cpp b/core/engine.cpp index 5361e09a8a..c8bfffd020 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -37,18 +37,18 @@ #include "core/version_hash.gen.h" void Engine::set_iterations_per_second(int p_ips) { - ERR_FAIL_COND_MSG(p_ips <= 0, "Engine iterations per second must be greater than 0."); ips = p_ips; } -int Engine::get_iterations_per_second() const { +int Engine::get_iterations_per_second() const { return ips; } void Engine::set_physics_jitter_fix(float p_threshold) { - if (p_threshold < 0) + if (p_threshold < 0) { p_threshold = 0; + } physics_jitter_fix = p_threshold; } @@ -65,32 +65,26 @@ int Engine::get_target_fps() const { } uint64_t Engine::get_frames_drawn() { - return frames_drawn; } void Engine::set_frame_delay(uint32_t p_msec) { - _frame_delay = p_msec; } uint32_t Engine::get_frame_delay() const { - return _frame_delay; } void Engine::set_time_scale(float p_scale) { - _time_scale = p_scale; } float Engine::get_time_scale() const { - return _time_scale; } Dictionary Engine::get_version_info() const { - Dictionary dict; dict["major"] = VERSION_MAJOR; dict["minor"] = VERSION_MINOR; @@ -104,8 +98,9 @@ Dictionary Engine::get_version_info() const { dict["hash"] = hash.length() == 0 ? String("unknown") : hash; String stringver = String(dict["major"]) + "." + String(dict["minor"]); - if ((int)dict["patch"] != 0) + if ((int)dict["patch"] != 0) { stringver += "." + String(dict["patch"]); + } stringver += "-" + String(dict["status"]) + " (" + String(dict["build"]) + ")"; dict["string"] = stringver; @@ -185,27 +180,24 @@ String Engine::get_license_text() const { } void Engine::add_singleton(const Singleton &p_singleton) { - singletons.push_back(p_singleton); singleton_ptrs[p_singleton.name] = p_singleton.ptr; } Object *Engine::get_singleton_object(const String &p_name) const { - const Map<StringName, Object *>::Element *E = singleton_ptrs.find(p_name); ERR_FAIL_COND_V_MSG(!E, nullptr, "Failed to retrieve non-existent singleton '" + p_name + "'."); return E->get(); -}; +} bool Engine::has_singleton(const String &p_name) const { - return singleton_ptrs.has(p_name); -}; +} void Engine::get_singletons(List<Singleton> *p_singletons) { - - for (List<Singleton>::Element *E = singletons.front(); E; E = E->next()) + for (List<Singleton>::Element *E = singletons.front(); E; E = E->next()) { p_singletons->push_back(E->get()); + } } Engine *Engine::singleton = nullptr; @@ -217,23 +209,7 @@ Engine *Engine::get_singleton() { bool Engine::is_abort_on_gpu_errors_enabled() const { return abort_on_gpu_errors; } -Engine::Engine() { +Engine::Engine() { singleton = this; - frames_drawn = 0; - ips = 60; - physics_jitter_fix = 0.5; - _physics_interpolation_fraction = 0.0f; - _frame_delay = 0; - _fps = 1; - _target_fps = 0; - _time_scale = 1.0; - _pixel_snap = false; - _physics_frames = 0; - _idle_frames = 0; - _in_physics = false; - _frame_ticks = 0; - _frame_step = 0; - editor_hint = false; - abort_on_gpu_errors = false; } |