Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-Changed bootsplash option to use a file, fixes #1539

Browse source 
-Added OS.get_splash_tick_msec() to query when splash appeared
This commit is contained in:
Juan Linietsky 2015-04-12 17:55:01 -03:00
parent 2dfa1279ea
commit 3e20391bf6
9 changed files with 51 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/os/os.cpp
View file

@ -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;

4
core/os/os.h
View file

@ -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();