godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
core/os/main_loop.cpp
View File

@@ -31,20 +31,20 @@
void MainLoop::_bind_methods() {
ObjectTypeDB::bind_method(_MD("input_event","ev"),&MainLoop::input_event);
ObjectTypeDB::bind_method(_MD("input_text","text"),&MainLoop::input_text);
ObjectTypeDB::bind_method(_MD("init"),&MainLoop::init);
ObjectTypeDB::bind_method(_MD("iteration","delta"),&MainLoop::iteration);
ObjectTypeDB::bind_method(_MD("idle","delta"),&MainLoop::idle);
ObjectTypeDB::bind_method(_MD("finish"),&MainLoop::finish);
ObjectTypeDB::bind_method(_MD("input_event", "ev"), &MainLoop::input_event);
ObjectTypeDB::bind_method(_MD("input_text", "text"), &MainLoop::input_text);
ObjectTypeDB::bind_method(_MD("init"), &MainLoop::init);
ObjectTypeDB::bind_method(_MD("iteration", "delta"), &MainLoop::iteration);
ObjectTypeDB::bind_method(_MD("idle", "delta"), &MainLoop::idle);
ObjectTypeDB::bind_method(_MD("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::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::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
}
}