diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-04-12 17:55:01 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-04-12 17:55:01 -0300 |
| commit | 3e20391bf607dc7c452b056854aed4a8c99ba0f6 (patch) | |
| tree | 030e345cf19f6fc76381e8fe955122bea37607c9 /core/os | |
| parent | 2dfa1279eaed14c4d42d431fc62f3e8c881c2d38 (diff) | |
-Changed bootsplash option to use a file, fixes #1539
-Added OS.get_splash_tick_msec() to query when splash appeared
Diffstat (limited to 'core/os')
| -rw-r--r-- | core/os/os.cpp | 3 | ||||
| -rw-r--r-- | core/os/os.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 5e0e5eed77..5fa7e87d06 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -43,6 +43,9 @@ OS* OS::get_singleton() { uint32_t OS::get_ticks_msec() const { return get_ticks_usec()/1000; } +uint64_t OS::get_splash_tick_msec() const { + return _msec_splash; +} uint64_t OS::get_unix_time() const { return 0; diff --git a/core/os/os.h b/core/os/os.h index d4ac433644..b52a37ede7 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -51,6 +51,7 @@ class OS { String _local_clipboard; uint64_t frames_drawn; uint32_t _frame_delay; + uint64_t _msec_splash; bool _no_window; int _exit_code; int _orientation; @@ -251,6 +252,7 @@ public: virtual void delay_usec(uint32_t p_usec) const=0; virtual uint64_t get_ticks_usec() const=0; uint32_t get_ticks_msec() const; + uint64_t get_splash_tick_msec() const; void set_frame_delay(uint32_t p_msec); uint32_t get_frame_delay() const; @@ -384,6 +386,8 @@ public: void set_time_scale(float p_scale); float get_time_scale() const; + + OS(); virtual ~OS(); |