diff options
| author | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-05 16:44:50 +0100 |
| commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
| tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /core/os/main_loop.cpp | |
| parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
| download | godot-5dbf180.tar.gz godot-5dbf180.tar.zst godot-5dbf180.zip | |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'core/os/main_loop.cpp')
| -rw-r--r-- | core/os/main_loop.cpp | 62 |
1 files changed, 24 insertions, 38 deletions
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index dcda8e895..644536d94 100644 --- a/core/os/main_loop.cpp +++ b/core/os/main_loop.cpp @@ -31,20 +31,20 @@ void MainLoop::_bind_methods() { - ClassDB::bind_method(D_METHOD("input_event","ev"),&MainLoop::input_event); - ClassDB::bind_method(D_METHOD("input_text","text"),&MainLoop::input_text); - ClassDB::bind_method(D_METHOD("init"),&MainLoop::init); - ClassDB::bind_method(D_METHOD("iteration","delta"),&MainLoop::iteration); - ClassDB::bind_method(D_METHOD("idle","delta"),&MainLoop::idle); - ClassDB::bind_method(D_METHOD("finish"),&MainLoop::finish); + ClassDB::bind_method(D_METHOD("input_event", "ev"), &MainLoop::input_event); + ClassDB::bind_method(D_METHOD("input_text", "text"), &MainLoop::input_text); + ClassDB::bind_method(D_METHOD("init"), &MainLoop::init); + ClassDB::bind_method(D_METHOD("iteration", "delta"), &MainLoop::iteration); + ClassDB::bind_method(D_METHOD("idle", "delta"), &MainLoop::idle); + ClassDB::bind_method(D_METHOD("finish"), &MainLoop::finish); - BIND_VMETHOD( MethodInfo("_input_event",PropertyInfo(Variant::INPUT_EVENT,"ev")) ); - BIND_VMETHOD( MethodInfo("_input_text",PropertyInfo(Variant::STRING,"text")) ); - BIND_VMETHOD( MethodInfo("_initialize") ); - BIND_VMETHOD( MethodInfo("_iteration",PropertyInfo(Variant::REAL,"delta")) ); - BIND_VMETHOD( MethodInfo("_idle",PropertyInfo(Variant::REAL,"delta")) ); - BIND_VMETHOD( MethodInfo("_drop_files",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"),PropertyInfo(Variant::INT,"screen")) ); - BIND_VMETHOD( MethodInfo("_finalize") ); + BIND_VMETHOD(MethodInfo("_input_event", PropertyInfo(Variant::INPUT_EVENT, "ev"))); + BIND_VMETHOD(MethodInfo("_input_text", PropertyInfo(Variant::STRING, "text"))); + BIND_VMETHOD(MethodInfo("_initialize")); + BIND_VMETHOD(MethodInfo("_iteration", PropertyInfo(Variant::REAL, "delta"))); + BIND_VMETHOD(MethodInfo("_idle", PropertyInfo(Variant::REAL, "delta"))); + BIND_VMETHOD(MethodInfo("_drop_files", PropertyInfo(Variant::POOL_STRING_ARRAY, "files"), PropertyInfo(Variant::INT, "screen"))); + BIND_VMETHOD(MethodInfo("_finalize")); BIND_CONSTANT(NOTIFICATION_WM_MOUSE_ENTER); BIND_CONSTANT(NOTIFICATION_WM_MOUSE_EXIT); @@ -53,36 +53,29 @@ void MainLoop::_bind_methods() { BIND_CONSTANT(NOTIFICATION_WM_QUIT_REQUEST); BIND_CONSTANT(NOTIFICATION_WM_UNFOCUS_REQUEST); BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING); - }; -void MainLoop::set_init_script(const Ref<Script>& p_init_script) { +void MainLoop::set_init_script(const Ref<Script> &p_init_script) { - init_script=p_init_script; + init_script = p_init_script; } MainLoop::MainLoop() { } - -MainLoop::~MainLoop() -{ +MainLoop::~MainLoop() { } - - -void MainLoop::input_text( const String& p_text ) { +void MainLoop::input_text(const String &p_text) { if (get_script_instance()) - get_script_instance()->call("_input_text",p_text); - + get_script_instance()->call("_input_text", p_text); } -void MainLoop::input_event( const InputEvent& p_event ) { +void MainLoop::input_event(const InputEvent &p_event) { if (get_script_instance()) - get_script_instance()->call("_input_event",p_event); - + get_script_instance()->call("_input_event", p_event); } void MainLoop::init() { @@ -92,30 +85,26 @@ void MainLoop::init() { if (get_script_instance()) get_script_instance()->call("_initialize"); - } bool MainLoop::iteration(float p_time) { if (get_script_instance()) - return get_script_instance()->call("_iteration",p_time); + return get_script_instance()->call("_iteration", p_time); return false; - } bool MainLoop::idle(float p_time) { if (get_script_instance()) - return get_script_instance()->call("_idle",p_time); + return get_script_instance()->call("_idle", p_time); return false; } -void MainLoop::drop_files(const Vector<String>& p_files,int p_from_screen) { - +void MainLoop::drop_files(const Vector<String> &p_files, int p_from_screen) { if (get_script_instance()) - get_script_instance()->call("_drop_files",p_files,p_from_screen); - + get_script_instance()->call("_drop_files", p_files, p_from_screen); } void MainLoop::finish() { @@ -124,7 +113,4 @@ void MainLoop::finish() { get_script_instance()->call("_finalize"); set_script(RefPtr()); //clear script } - - } - |
