From 5dbf1809c6e3e905b94b8764e99491e608122261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 5 Mar 2017 16:44:50 +0100 Subject: 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 --- core/os/os.cpp | 202 ++++++++++++++++++++++++--------------------------------- 1 file changed, 84 insertions(+), 118 deletions(-) (limited to 'core/os/os.cpp') diff --git a/core/os/os.cpp b/core/os/os.cpp index 1d670b4466..03b48f4554 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -35,15 +35,16 @@ #include -OS* OS::singleton=NULL; +OS *OS::singleton = NULL; -OS* OS::get_singleton() { +OS *OS::get_singleton() { return singleton; } -uint32_t OS::get_ticks_msec() const -{ return get_ticks_usec()/1000; } +uint32_t OS::get_ticks_msec() const { + return get_ticks_usec() / 1000; +} uint64_t OS::get_splash_tick_msec() const { return _msec_splash; @@ -55,29 +56,27 @@ uint64_t OS::get_unix_time() const { uint64_t OS::get_system_time_secs() const { return 0; } -void OS::debug_break() { +void OS::debug_break(){ // something }; +void OS::print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type) { -void OS::print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type) { - - const char* err_type; - switch(p_type) { - case ERR_ERROR: err_type="**ERROR**"; break; - case ERR_WARNING: err_type="**WARNING**"; break; - case ERR_SCRIPT: err_type="**SCRIPT ERROR**"; break; - case ERR_SHADER: err_type="**SHADER ERROR**"; break; + const char *err_type; + switch (p_type) { + case ERR_ERROR: err_type = "**ERROR**"; break; + case ERR_WARNING: err_type = "**WARNING**"; break; + case ERR_SCRIPT: err_type = "**SCRIPT ERROR**"; break; + case ERR_SHADER: err_type = "**SHADER ERROR**"; break; } if (p_rationale && *p_rationale) - print("%s: %s\n ",err_type,p_rationale); - print("%s: At: %s:%i:%s() - %s\n",err_type,p_file,p_line,p_function,p_code); + print("%s: %s\n ", err_type, p_rationale); + print("%s: At: %s:%i:%s() - %s\n", err_type, p_file, p_line, p_function, p_code); } -void OS::print(const char* p_format, ...) { - +void OS::print(const char *p_format, ...) { va_list argp; va_start(argp, p_format); @@ -87,7 +86,7 @@ void OS::print(const char* p_format, ...) { va_end(argp); }; -void OS::printerr(const char* p_format, ...) { +void OS::printerr(const char *p_format, ...) { va_list argp; va_start(argp, p_format); @@ -97,9 +96,8 @@ void OS::printerr(const char* p_format, ...) { va_end(argp); }; - void OS::set_keep_screen_on(bool p_enabled) { - _keep_screen_on=p_enabled; + _keep_screen_on = p_enabled; } bool OS::is_keep_screen_on() const { @@ -108,7 +106,7 @@ bool OS::is_keep_screen_on() const { void OS::set_low_processor_usage_mode(bool p_enabled) { - low_processor_usage_mode=p_enabled; + low_processor_usage_mode = p_enabled; } bool OS::is_in_low_processor_usage_mode() const { @@ -116,9 +114,9 @@ bool OS::is_in_low_processor_usage_mode() const { return low_processor_usage_mode; } -void OS::set_clipboard(const String& p_text) { +void OS::set_clipboard(const String &p_text) { - _local_clipboard=p_text; + _local_clipboard = p_text; } String OS::get_clipboard() const { @@ -135,41 +133,40 @@ int OS::get_process_ID() const { return -1; }; - bool OS::is_stdout_verbose() const { return _verbose_stdout; } -void OS::set_last_error(const char* p_error) { +void OS::set_last_error(const char *p_error) { GLOBAL_LOCK_FUNCTION - if (p_error==NULL) - p_error="Unknown Error"; + if (p_error == NULL) + p_error = "Unknown Error"; if (last_error) memfree(last_error); - last_error=NULL; - int len =0; - while(p_error[len++]); - - last_error=(char*)memalloc(len); - for(int i=0;iget_instance_ID())+String(res->get_class())+":"+String(res->get_name())+" - "+res->get_path(); + String str = itos(res->get_instance_ID()) + String(res->get_class()) + ":" + String(res->get_name()) + " - " + res->get_path(); if (_OSPRF) _OSPRF->store_line(str); else print_line(str); - } bool OS::has_virtual_keyboard() const { @@ -190,61 +186,56 @@ bool OS::has_virtual_keyboard() const { return false; } -void OS::show_virtual_keyboard(const String& p_existing_text,const Rect2& p_screen_rect) { - +void OS::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect) { } -void OS::hide_virtual_keyboard(){ - +void OS::hide_virtual_keyboard() { } void OS::print_all_resources(String p_to_file) { - ERR_FAIL_COND(p_to_file!="" && _OSPRF); - if (p_to_file!="") { + ERR_FAIL_COND(p_to_file != "" && _OSPRF); + if (p_to_file != "") { Error err; - _OSPRF=FileAccess::open(p_to_file,FileAccess::WRITE,&err); - if (err!=OK) { - _OSPRF=NULL; - ERR_FAIL_COND(err!=OK); + _OSPRF = FileAccess::open(p_to_file, FileAccess::WRITE, &err); + if (err != OK) { + _OSPRF = NULL; + ERR_FAIL_COND(err != OK); } } ObjectDB::debug_objects(_OS_printres); - if (p_to_file!="") { + if (p_to_file != "") { if (_OSPRF) memdelete(_OSPRF); - _OSPRF=NULL; + _OSPRF = NULL; } } void OS::print_resources_in_use(bool p_short) { - - ResourceCache::dump(NULL,p_short); + ResourceCache::dump(NULL, p_short); } -void OS::dump_resources_to_file(const char* p_file) { +void OS::dump_resources_to_file(const char *p_file) { ResourceCache::dump(p_file); } - void OS::clear_last_error() { GLOBAL_LOCK_FUNCTION if (last_error) memfree(last_error); - last_error=NULL; + last_error = NULL; } - void OS::set_no_window_mode(bool p_enable) { - _no_window=p_enable; + _no_window = p_enable; } bool OS::is_no_window_mode_enabled() const { @@ -258,7 +249,7 @@ int OS::get_exit_code() const { } void OS::set_exit_code(int p_code) { - _exit_code=p_code; + _exit_code = p_code; } String OS::get_locale() const { @@ -271,7 +262,6 @@ String OS::get_resource_dir() const { return GlobalConfig::get_singleton()->get_resource_path(); } - String OS::get_system_dir(SystemDir p_dir) const { return "."; @@ -280,8 +270,8 @@ String OS::get_system_dir(SystemDir p_dir) const { String OS::get_safe_application_name() const { String an = GlobalConfig::get_singleton()->get("application/name"); Vector invalid_char = String("\\ / : * ? \" < > |").split(" "); - for (int i=0;i p_buttons, Object* p_obj, String p_callback) { +Error OS::dialog_show(String p_title, String p_description, Vector p_buttons, Object *p_obj, String p_callback) { while (true) { print("%ls\n--------\n%ls\n", p_title.c_str(), p_description.c_str()); - for (int i=0; i0) print(", "); - print("%i=%ls", i+1, p_buttons[i].c_str()); + for (int i = 0; i < p_buttons.size(); i++) { + if (i > 0) print(", "); + print("%i=%ls", i + 1, p_buttons[i].c_str()); }; print("\n"); String res = get_stdin_string().strip_edges(); @@ -319,7 +309,7 @@ Error OS::dialog_show(String p_title, String p_description, Vector p_but return OK; }; -Error OS::dialog_input_text(String p_title, String p_description, String p_partial, Object* p_obj, String p_callback) { +Error OS::dialog_input_text(String p_title, String p_description, String p_partial, Object *p_obj, String p_callback) { ERR_FAIL_COND_V(!p_obj, FAILED); ERR_FAIL_COND_V(p_callback == "", FAILED); @@ -340,7 +330,7 @@ int OS::get_static_memory_usage() const { return Memory::get_mem_usage(); } -int OS::get_dynamic_memory_usage() const{ +int OS::get_dynamic_memory_usage() const { return MemoryPool::total_memory; } @@ -350,7 +340,7 @@ int OS::get_static_memory_peak_usage() const { return Memory::get_mem_max_usage(); } -Error OS::set_cwd(const String& p_cwd) { +Error OS::set_cwd(const String &p_cwd) { return ERR_CANT_OPEN; } @@ -367,13 +357,11 @@ int OS::get_free_static_memory() const { } void OS::yield() { - - } void OS::set_screen_orientation(ScreenOrientation p_orientation) { - _orientation=p_orientation; + _orientation = p_orientation; } OS::ScreenOrientation OS::get_screen_orientation() const { @@ -381,7 +369,6 @@ OS::ScreenOrientation OS::get_screen_orientation() const { return (OS::ScreenOrientation)_orientation; } - void OS::_ensure_data_dir() { String dd = get_data_dir(); @@ -393,45 +380,35 @@ void OS::_ensure_data_dir() { da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); Error err = da->make_dir_recursive(dd); - if (err!=OK) { - ERR_EXPLAIN("Error attempting to create data dir: "+dd); + if (err != OK) { + ERR_EXPLAIN("Error attempting to create data dir: " + dd); } - ERR_FAIL_COND(err!=OK); + ERR_FAIL_COND(err != OK); memdelete(da); - - } -void OS::set_icon(const Image& p_icon) { - - +void OS::set_icon(const Image &p_icon) { } String OS::get_model_name() const { - return "GenericDevice"; + return "GenericDevice"; } - -void OS::set_cmdline(const char* p_execpath, const List& p_args) { +void OS::set_cmdline(const char *p_execpath, const List &p_args) { _execpath = p_execpath; _cmdline = p_args; }; void OS::release_rendering_thread() { - - } void OS::make_rendering_thread() { - - } void OS::swap_buffers() { - } String OS::get_unique_ID() const { @@ -454,20 +431,19 @@ bool OS::native_video_is_playing() const { return false; }; -void OS::native_video_pause() { +void OS::native_video_pause(){ }; -void OS::native_video_unpause() { +void OS::native_video_unpause(){ }; -void OS::native_video_stop() { +void OS::native_video_stop(){ }; void OS::set_mouse_mode(MouseMode p_mode) { - } bool OS::can_use_threads() const { @@ -479,19 +455,16 @@ bool OS::can_use_threads() const { #endif } -OS::MouseMode OS::get_mouse_mode() const{ +OS::MouseMode OS::get_mouse_mode() const { return MOUSE_MODE_VISIBLE; } - OS::LatinKeyboardVariant OS::get_latin_keyboard_variant() const { return LATIN_KEYBOARD_QWERTY; } - - bool OS::is_joy_known(int p_device) { return true; } @@ -501,18 +474,15 @@ String OS::get_joy_guid(int p_device) const { } void OS::set_context(int p_context) { - } void OS::set_use_vsync(bool p_enable) { - } -bool OS::is_vsync_enabled() const{ +bool OS::is_vsync_enabled() const { return true; } - PowerState OS::get_power_state() { return POWERSTATE_UNKNOWN; } @@ -524,26 +494,22 @@ int OS::get_power_percent_left() { } OS::OS() { - last_error=NULL; - singleton=this; - _keep_screen_on=true; // set default value to true, because this had been true before godot 2.0. - low_processor_usage_mode=false; - _verbose_stdout=false; - _no_window=false; - _exit_code=0; - _orientation=SCREEN_LANDSCAPE; - - _render_thread_mode=RENDER_THREAD_SAFE; - - - _allow_hidpi=true; + last_error = NULL; + singleton = this; + _keep_screen_on = true; // set default value to true, because this had been true before godot 2.0. + low_processor_usage_mode = false; + _verbose_stdout = false; + _no_window = false; + _exit_code = 0; + _orientation = SCREEN_LANDSCAPE; + + _render_thread_mode = RENDER_THREAD_SAFE; + + _allow_hidpi = true; Math::seed(1234567); } - OS::~OS() { - singleton=NULL; + singleton = NULL; } - - -- cgit v1.2.3