diff options
| author | Juan Linietsky | 2015-04-12 17:55:01 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-04-12 17:55:01 -0300 |
| commit | 3e20391bf607dc7c452b056854aed4a8c99ba0f6 (patch) | |
| tree | 030e345cf19f6fc76381e8fe955122bea37607c9 /core/bind | |
| parent | 2dfa1279eaed14c4d42d431fc62f3e8c881c2d38 (diff) | |
| download | godot-3e20391bf607dc7c452b056854aed4a8c99ba0f6.tar.gz godot-3e20391bf607dc7c452b056854aed4a8c99ba0f6.tar.zst godot-3e20391bf607dc7c452b056854aed4a8c99ba0f6.zip | |
-Changed bootsplash option to use a file, fixes #1539
-Added OS.get_splash_tick_msec() to query when splash appeared
Diffstat (limited to 'core/bind')
| -rw-r--r-- | core/bind/core_bind.cpp | 5 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 439855fbb..cde328bc6 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -500,6 +500,10 @@ uint32_t _OS::get_ticks_msec() const { return OS::get_singleton()->get_ticks_msec(); } +uint32_t _OS::get_splash_tick_msec() const { + + return OS::get_singleton()->get_splash_tick_msec(); +} bool _OS::can_use_threads() const { @@ -765,6 +769,7 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("delay_usec","usec"),&_OS::delay_usec); ObjectTypeDB::bind_method(_MD("delay_msec","msec"),&_OS::delay_msec); ObjectTypeDB::bind_method(_MD("get_ticks_msec"),&_OS::get_ticks_msec); + ObjectTypeDB::bind_method(_MD("get_splash_tick_msec"),&_OS::get_splash_tick_msec); ObjectTypeDB::bind_method(_MD("get_locale"),&_OS::get_locale); ObjectTypeDB::bind_method(_MD("get_model_name"),&_OS::get_model_name); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index f3601e35f..ea8ca9af9 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -210,6 +210,7 @@ public: void delay_usec(uint32_t p_usec) const; void delay_msec(uint32_t p_msec) const; uint32_t get_ticks_msec() const; + uint32_t get_splash_tick_msec() const; bool can_use_threads() const; |
