diff options
| author | Juan Linietsky | 2017-08-19 17:48:10 -0300 |
|---|---|---|
| committer | GitHub | 2017-08-19 17:48:10 -0300 |
| commit | 56d9f9df67200b4b5c8ca56b339c75bf94f90007 (patch) | |
| tree | 86b1a935105abb50ff87aaf5c17f422a745c248c /core | |
| parent | 588ffbc08aaf7d1fa30163f46702d56e032de04a (diff) | |
| parent | b9dcebb37cf15f7f0c062740ad4a755d32f88ed5 (diff) | |
| download | godot-56d9f9df67200b4b5c8ca56b339c75bf94f90007.tar.gz godot-56d9f9df67200b4b5c8ca56b339c75bf94f90007.tar.zst godot-56d9f9df67200b4b5c8ca56b339c75bf94f90007.zip | |
Merge pull request #10464 from godotengine/revert-10445-args-doubledash
Revert "Second take at making command-line arguments more UNIX-like + main.cpp and help cleanup"
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 7 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 2 | ||||
| -rw-r--r-- | core/engine.h | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index a3812e41b..273ef7866 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -2534,6 +2534,11 @@ float _Engine::get_frames_per_second() const { return Engine::get_singleton()->get_frames_per_second(); } +String _Engine::get_custom_level() const { + + return Engine::get_singleton()->get_custom_level(); +} + void _Engine::set_time_scale(float p_scale) { Engine::get_singleton()->set_time_scale(p_scale); } @@ -2573,6 +2578,8 @@ void _Engine::_bind_methods() { ClassDB::bind_method(D_METHOD("set_time_scale", "time_scale"), &_Engine::set_time_scale); ClassDB::bind_method(D_METHOD("get_time_scale"), &_Engine::get_time_scale); + ClassDB::bind_method(D_METHOD("get_custom_level"), &_Engine::get_custom_level); + ClassDB::bind_method(D_METHOD("get_frames_drawn"), &_Engine::get_frames_drawn); ClassDB::bind_method(D_METHOD("get_frames_per_second"), &_Engine::get_frames_per_second); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 45416f5fd..61c80aaba 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -639,6 +639,8 @@ public: void set_time_scale(float p_scale); float get_time_scale(); + String get_custom_level() const; + MainLoop *get_main_loop() const; Dictionary get_version_info() const; diff --git a/core/engine.h b/core/engine.h index fc3e15154..16dfb7759 100644 --- a/core/engine.h +++ b/core/engine.h @@ -39,6 +39,7 @@ class Engine { friend class Main; + String _custom_level; uint64_t frames_drawn; uint32_t _frame_delay; uint64_t _frame_ticks; @@ -66,6 +67,8 @@ public: virtual float get_frames_per_second() const { return _fps; } + String get_custom_level() const { return _custom_level; } + uint64_t get_frames_drawn(); uint64_t get_fixed_frames() const { return _fixed_frames; } |
