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/bind/core_bind.cpp | 1513 +++++++++++++++++++++-------------------------- core/bind/core_bind.h | 305 +++++----- 2 files changed, 827 insertions(+), 991 deletions(-) (limited to 'core/bind') diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 08e1a311fa..ce3d65b448 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -27,21 +27,21 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "core_bind.h" -#include "os/os.h" +#include "core/global_config.h" #include "geometry.h" -#include "io/marshalls.h" #include "io/base64.h" -#include "core/global_config.h" #include "io/file_access_encrypted.h" +#include "io/marshalls.h" #include "os/keyboard.h" +#include "os/os.h" /** * Time constants borrowed from loc_time.h */ -#define EPOCH_YR 1970 /* EPOCH = Jan 1 1970 00:00:00 */ -#define SECS_DAY (24L * 60L * 60L) -#define LEAPYEAR(year) (!((year) % 4) && (((year) % 100) || !((year) % 400))) -#define YEARSIZE(year) (LEAPYEAR(year) ? 366 : 365) +#define EPOCH_YR 1970 /* EPOCH = Jan 1 1970 00:00:00 */ +#define SECS_DAY (24L * 60L * 60L) +#define LEAPYEAR(year) (!((year) % 4) && (((year) % 100) || !((year) % 400))) +#define YEARSIZE(year) (LEAPYEAR(year) ? 366 : 365) #define SECOND_KEY "second" #define MINUTE_KEY "minute" #define HOUR_KEY "hour" @@ -57,24 +57,24 @@ static const unsigned int MONTH_DAYS_TABLE[2][12] = { { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -_ResourceLoader *_ResourceLoader::singleton=NULL; +_ResourceLoader *_ResourceLoader::singleton = NULL; -Ref _ResourceLoader::load_interactive(const String& p_path,const String& p_type_hint) { - return ResourceLoader::load_interactive(p_path,p_type_hint); +Ref _ResourceLoader::load_interactive(const String &p_path, const String &p_type_hint) { + return ResourceLoader::load_interactive(p_path, p_type_hint); } -RES _ResourceLoader::load(const String &p_path,const String& p_type_hint, bool p_no_cache) { +RES _ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache) { - RES ret = ResourceLoader::load(p_path,p_type_hint, p_no_cache); + RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache); return ret; } -PoolVector _ResourceLoader::get_recognized_extensions_for_type(const String& p_type) { +PoolVector _ResourceLoader::get_recognized_extensions_for_type(const String &p_type) { List exts; - ResourceLoader::get_recognized_extensions_for_type(p_type,&exts); + ResourceLoader::get_recognized_extensions_for_type(p_type, &exts); PoolVector ret; - for(List::Element *E=exts.front();E;E=E->next()) { + for (List::Element *E = exts.front(); E; E = E->next()) { ret.push_back(E->get()); } @@ -87,13 +87,13 @@ void _ResourceLoader::set_abort_on_missing_resources(bool p_abort) { ResourceLoader::set_abort_on_missing_resources(p_abort); } -PoolStringArray _ResourceLoader::get_dependencies(const String& p_path) { +PoolStringArray _ResourceLoader::get_dependencies(const String &p_path) { List deps; ResourceLoader::get_dependencies(p_path, &deps); PoolStringArray ret; - for(List::Element *E=deps.front();E;E=E->next()) { + for (List::Element *E = deps.front(); E; E = E->next()) { ret.push_back(E->get()); } @@ -106,50 +106,46 @@ bool _ResourceLoader::has(const String &p_path) { return ResourceCache::has(local_path); }; - void _ResourceLoader::_bind_methods() { - - ClassDB::bind_method(D_METHOD("load_interactive:ResourceInteractiveLoader","path","type_hint"),&_ResourceLoader::load_interactive,DEFVAL("")); - ClassDB::bind_method(D_METHOD("load:Resource","path","type_hint", "p_no_cache"),&_ResourceLoader::load,DEFVAL(""), DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_recognized_extensions_for_type","type"),&_ResourceLoader::get_recognized_extensions_for_type); - ClassDB::bind_method(D_METHOD("set_abort_on_missing_resources","abort"),&_ResourceLoader::set_abort_on_missing_resources); - ClassDB::bind_method(D_METHOD("get_dependencies","path"),&_ResourceLoader::get_dependencies); - ClassDB::bind_method(D_METHOD("has","path"),&_ResourceLoader::has); + ClassDB::bind_method(D_METHOD("load_interactive:ResourceInteractiveLoader", "path", "type_hint"), &_ResourceLoader::load_interactive, DEFVAL("")); + ClassDB::bind_method(D_METHOD("load:Resource", "path", "type_hint", "p_no_cache"), &_ResourceLoader::load, DEFVAL(""), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_recognized_extensions_for_type", "type"), &_ResourceLoader::get_recognized_extensions_for_type); + ClassDB::bind_method(D_METHOD("set_abort_on_missing_resources", "abort"), &_ResourceLoader::set_abort_on_missing_resources); + ClassDB::bind_method(D_METHOD("get_dependencies", "path"), &_ResourceLoader::get_dependencies); + ClassDB::bind_method(D_METHOD("has", "path"), &_ResourceLoader::has); } _ResourceLoader::_ResourceLoader() { - singleton=this; + singleton = this; } +Error _ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { -Error _ResourceSaver::save(const String &p_path,const RES& p_resource, uint32_t p_flags) { - - ERR_FAIL_COND_V(p_resource.is_null(),ERR_INVALID_PARAMETER); - return ResourceSaver::save(p_path,p_resource, p_flags); + ERR_FAIL_COND_V(p_resource.is_null(), ERR_INVALID_PARAMETER); + return ResourceSaver::save(p_path, p_resource, p_flags); } -PoolVector _ResourceSaver::get_recognized_extensions(const RES& p_resource) { +PoolVector _ResourceSaver::get_recognized_extensions(const RES &p_resource) { - ERR_FAIL_COND_V(p_resource.is_null(),PoolVector()); + ERR_FAIL_COND_V(p_resource.is_null(), PoolVector()); List exts; - ResourceSaver::get_recognized_extensions(p_resource,&exts); + ResourceSaver::get_recognized_extensions(p_resource, &exts); PoolVector ret; - for(List::Element *E=exts.front();E;E=E->next()) { + for (List::Element *E = exts.front(); E; E = E->next()) { ret.push_back(E->get()); } return ret; } -_ResourceSaver *_ResourceSaver::singleton=NULL; - +_ResourceSaver *_ResourceSaver::singleton = NULL; void _ResourceSaver::_bind_methods() { - ClassDB::bind_method(D_METHOD("save","path","resource:Resource","flags"),&_ResourceSaver::save,DEFVAL(0)); - ClassDB::bind_method(D_METHOD("get_recognized_extensions","type"),&_ResourceSaver::get_recognized_extensions); + ClassDB::bind_method(D_METHOD("save", "path", "resource:Resource", "flags"), &_ResourceSaver::save, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_recognized_extensions", "type"), &_ResourceSaver::get_recognized_extensions); BIND_CONSTANT(FLAG_RELATIVE_PATHS); BIND_CONSTANT(FLAG_BUNDLE_RESOURCES); @@ -161,21 +157,18 @@ void _ResourceSaver::_bind_methods() { _ResourceSaver::_ResourceSaver() { - singleton=this; + singleton = this; } - /////////////////OS - Point2 _OS::get_mouse_pos() const { return OS::get_singleton()->get_mouse_pos(); } -void _OS::set_window_title(const String& p_title) { +void _OS::set_window_title(const String &p_title) { OS::get_singleton()->set_window_title(p_title); - } int _OS::get_mouse_button_state() const { @@ -191,44 +184,37 @@ bool _OS::has_touchscreen_ui_hint() const { return OS::get_singleton()->has_touchscreen_ui_hint(); } -void _OS::set_clipboard(const String& p_text) { - +void _OS::set_clipboard(const String &p_text) { OS::get_singleton()->set_clipboard(p_text); } String _OS::get_clipboard() const { return OS::get_singleton()->get_clipboard(); - } -void _OS::set_video_mode(const Size2& p_size, bool p_fullscreen,bool p_resizeable,int p_screen) { +void _OS::set_video_mode(const Size2 &p_size, bool p_fullscreen, bool p_resizeable, int p_screen) { OS::VideoMode vm; - vm.width=p_size.width; - vm.height=p_size.height; - vm.fullscreen=p_fullscreen; - vm.resizable=p_resizeable; - OS::get_singleton()->set_video_mode( vm,p_screen); - - + vm.width = p_size.width; + vm.height = p_size.height; + vm.fullscreen = p_fullscreen; + vm.resizable = p_resizeable; + OS::get_singleton()->set_video_mode(vm, p_screen); } Size2 _OS::get_video_mode(int p_screen) const { OS::VideoMode vm; vm = OS::get_singleton()->get_video_mode(p_screen); - return Size2(vm.width,vm.height); - + return Size2(vm.width, vm.height); } bool _OS::is_video_mode_fullscreen(int p_screen) const { OS::VideoMode vm; vm = OS::get_singleton()->get_video_mode(p_screen); return vm.fullscreen; - } - int _OS::get_screen_count() const { return OS::get_singleton()->get_screen_count(); } @@ -251,14 +237,14 @@ Size2 _OS::get_screen_size(int p_screen) const { int _OS::get_screen_dpi(int p_screen) const { - return OS::get_singleton()->get_screen_dpi(p_screen); + return OS::get_singleton()->get_screen_dpi(p_screen); } Point2 _OS::get_window_position() const { return OS::get_singleton()->get_window_position(); } -void _OS::set_window_position(const Point2& p_position) { +void _OS::set_window_position(const Point2 &p_position) { OS::get_singleton()->set_window_position(p_position); } @@ -266,7 +252,7 @@ Size2 _OS::get_window_size() const { return OS::get_singleton()->get_window_size(); } -void _OS::set_window_size(const Size2& p_size) { +void _OS::set_window_size(const Size2 &p_size) { OS::get_singleton()->set_window_size(p_size); } @@ -325,11 +311,11 @@ bool _OS::is_video_mode_resizable(int p_screen) const { Array _OS::get_fullscreen_mode_list(int p_screen) const { List vmlist; - OS::get_singleton()->get_fullscreen_mode_list(&vmlist,p_screen); + OS::get_singleton()->get_fullscreen_mode_list(&vmlist, p_screen); Array vmarr; - for(List::Element *E=vmlist.front();E;E=E->next() ){ + for (List::Element *E = vmlist.front(); E; E = E->next()) { - vmarr.push_back(Size2(E->get().width,E->get().height)); + vmarr.push_back(Size2(E->get().width, E->get().height)); } return vmarr; @@ -354,22 +340,20 @@ Error _OS::shell_open(String p_uri) { return OS::get_singleton()->shell_open(p_uri); }; - -int _OS::execute(const String& p_path, const Vector & p_arguments, bool p_blocking, Array p_output) { +int _OS::execute(const String &p_path, const Vector &p_arguments, bool p_blocking, Array p_output) { OS::ProcessID pid; List args; - for(int i=0;iexecute(p_path,args,p_blocking,&pid, &pipe); + Error err = OS::get_singleton()->execute(p_path, args, p_blocking, &pid, &pipe); p_output.clear(); p_output.push_back(pipe); if (err != OK) return -1; else return pid; - } Error _OS::kill(int p_pid) { @@ -381,12 +365,11 @@ int _OS::get_process_ID() const { return OS::get_singleton()->get_process_ID(); }; - -bool _OS::has_environment(const String& p_var) const { +bool _OS::has_environment(const String &p_var) const { return OS::get_singleton()->has_environment(p_var); } -String _OS::get_environment(const String& p_var) const { +String _OS::get_environment(const String &p_var) const { return OS::get_singleton()->get_environment(p_var); } @@ -399,7 +382,7 @@ Vector _OS::get_cmdline_args() { List cmdline = OS::get_singleton()->get_cmdline_args(); Vector cmdlinev; - for(List::Element *E=cmdline.front();E;E=E->next()) { + for (List::Element *E = cmdline.front(); E; E = E->next()) { cmdlinev.push_back(E->get()); } @@ -413,13 +396,13 @@ String _OS::get_locale() const { } String _OS::get_latin_keyboard_variant() const { - switch( OS::get_singleton()->get_latin_keyboard_variant() ) { + switch (OS::get_singleton()->get_latin_keyboard_variant()) { case OS::LATIN_KEYBOARD_QWERTY: return "QWERTY"; case OS::LATIN_KEYBOARD_QWERTZ: return "QWERTZ"; case OS::LATIN_KEYBOARD_AZERTY: return "AZERTY"; case OS::LATIN_KEYBOARD_QZERTY: return "QZERTY"; case OS::LATIN_KEYBOARD_DVORAK: return "DVORAK"; - case OS::LATIN_KEYBOARD_NEO : return "NEO"; + case OS::LATIN_KEYBOARD_NEO: return "NEO"; default: return "ERROR"; } } @@ -429,14 +412,12 @@ String _OS::get_model_name() const { return OS::get_singleton()->get_model_name(); } - - bool _OS::is_ok_left_and_cancel_right() const { return OS::get_singleton()->get_swap_ok_cancel(); } -Error _OS::set_thread_name(const String& p_name) { +Error _OS::set_thread_name(const String &p_name) { return Thread::set_name(p_name); }; @@ -509,22 +490,19 @@ struct Time { int _OS::get_static_memory_usage() const { return OS::get_singleton()->get_static_memory_usage(); - } int _OS::get_static_memory_peak_usage() const { return OS::get_singleton()->get_static_memory_peak_usage(); - } -int _OS::get_dynamic_memory_usage() const{ +int _OS::get_dynamic_memory_usage() const { return OS::get_singleton()->get_dynamic_memory_usage(); } - -void _OS::set_icon(const Image& p_icon) { +void _OS::set_icon(const Image &p_icon) { OS::get_singleton()->set_icon(p_icon); } @@ -551,7 +529,7 @@ Dictionary _OS::get_datetime(bool utc) const { List keys; timed.get_key_list(&keys); - for(int i = 0; i < keys.size(); i++) { + for (int i = 0; i < keys.size(); i++) { dated[keys[i]] = timed[keys[i]]; } @@ -562,11 +540,11 @@ Dictionary _OS::get_date(bool utc) const { OS::Date date = OS::get_singleton()->get_date(utc); Dictionary dated; - dated[YEAR_KEY]=date.year; - dated[MONTH_KEY]=date.month; - dated[DAY_KEY]=date.day; - dated[WEEKDAY_KEY]=date.weekday; - dated[DST_KEY]=date.dst; + dated[YEAR_KEY] = date.year; + dated[MONTH_KEY] = date.month; + dated[DAY_KEY] = date.day; + dated[WEEKDAY_KEY] = date.weekday; + dated[DST_KEY] = date.dst; return dated; } @@ -574,9 +552,9 @@ Dictionary _OS::get_time(bool utc) const { OS::Time time = OS::get_singleton()->get_time(utc); Dictionary timed; - timed[HOUR_KEY]=time.hour; - timed[MINUTE_KEY]=time.min; - timed[SECOND_KEY]=time.sec; + timed[HOUR_KEY] = time.hour; + timed[MINUTE_KEY] = time.min; + timed[SECOND_KEY] = time.sec; return timed; } @@ -603,12 +581,12 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { // Get all time values from the dictionary, set to zero if it doesn't exist. // Risk incorrect calculation over throwing errors - unsigned int second = ((datetime.has(SECOND_KEY)) ? static_cast(datetime[SECOND_KEY]): 0); - unsigned int minute = ((datetime.has(MINUTE_KEY)) ? static_cast(datetime[MINUTE_KEY]): 0); - unsigned int hour = ((datetime.has(HOUR_KEY)) ? static_cast(datetime[HOUR_KEY]): 0); - unsigned int day = ((datetime.has(DAY_KEY)) ? static_cast(datetime[DAY_KEY]): 0); - unsigned int month = ((datetime.has(MONTH_KEY)) ? static_cast(datetime[MONTH_KEY]) -1: 0); - unsigned int year = ((datetime.has(YEAR_KEY)) ? static_cast(datetime[YEAR_KEY]):0); + unsigned int second = ((datetime.has(SECOND_KEY)) ? static_cast(datetime[SECOND_KEY]) : 0); + unsigned int minute = ((datetime.has(MINUTE_KEY)) ? static_cast(datetime[MINUTE_KEY]) : 0); + unsigned int hour = ((datetime.has(HOUR_KEY)) ? static_cast(datetime[HOUR_KEY]) : 0); + unsigned int day = ((datetime.has(DAY_KEY)) ? static_cast(datetime[DAY_KEY]) : 0); + unsigned int month = ((datetime.has(MONTH_KEY)) ? static_cast(datetime[MONTH_KEY]) - 1 : 0); + unsigned int year = ((datetime.has(YEAR_KEY)) ? static_cast(datetime[YEAR_KEY]) : 0); /// How many days come before each month (0-12) static const unsigned short int DAYS_PAST_THIS_YEAR_TABLE[2][13] = { @@ -619,41 +597,40 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { }; ERR_EXPLAIN("Invalid second value of: " + itos(second)); - ERR_FAIL_COND_V( second > 59, 0); + ERR_FAIL_COND_V(second > 59, 0); ERR_EXPLAIN("Invalid minute value of: " + itos(minute)); - ERR_FAIL_COND_V( minute > 59, 0); + ERR_FAIL_COND_V(minute > 59, 0); ERR_EXPLAIN("Invalid hour value of: " + itos(hour)); - ERR_FAIL_COND_V( hour > 23, 0); + ERR_FAIL_COND_V(hour > 23, 0); - ERR_EXPLAIN("Invalid month value of: " + itos(month+1)); - ERR_FAIL_COND_V( month+1 > 12, 0); + ERR_EXPLAIN("Invalid month value of: " + itos(month + 1)); + ERR_FAIL_COND_V(month + 1 > 12, 0); // Do this check after month is tested as valid - ERR_EXPLAIN("Invalid day value of: " + itos(day) + " which is larger than "+ itos(MONTH_DAYS_TABLE[LEAPYEAR(year)][month])); - ERR_FAIL_COND_V( day > MONTH_DAYS_TABLE[LEAPYEAR(year)][month], 0); + ERR_EXPLAIN("Invalid day value of: " + itos(day) + " which is larger than " + itos(MONTH_DAYS_TABLE[LEAPYEAR(year)][month])); + ERR_FAIL_COND_V(day > MONTH_DAYS_TABLE[LEAPYEAR(year)][month], 0); // Calculate all the seconds from months past in this year uint64_t SECONDS_FROM_MONTHS_PAST_THIS_YEAR = DAYS_PAST_THIS_YEAR_TABLE[LEAPYEAR(year)][month] * SECONDS_PER_DAY; uint64_t SECONDS_FROM_YEARS_PAST = 0; - for(unsigned int iyear = EPOCH_YR; iyear < year; iyear++) { + for (unsigned int iyear = EPOCH_YR; iyear < year; iyear++) { SECONDS_FROM_YEARS_PAST += YEARSIZE(iyear) * SECONDS_PER_DAY; } uint64_t epoch = - second + - minute * SECONDS_PER_MINUTE + - hour * SECONDS_PER_HOUR + - // Subtract 1 from day, since the current day isn't over yet - // and we cannot count all 24 hours. - (day-1) * SECONDS_PER_DAY + - SECONDS_FROM_MONTHS_PAST_THIS_YEAR + - SECONDS_FROM_YEARS_PAST; + second + + minute * SECONDS_PER_MINUTE + + hour * SECONDS_PER_HOUR + + // Subtract 1 from day, since the current day isn't over yet + // and we cannot count all 24 hours. + (day - 1) * SECONDS_PER_DAY + + SECONDS_FROM_MONTHS_PAST_THIS_YEAR + + SECONDS_FROM_YEARS_PAST; return epoch; - } /** @@ -667,12 +644,12 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { * * @return dictionary of date and time values */ -Dictionary _OS::get_datetime_from_unix_time( uint64_t unix_time_val) const { +Dictionary _OS::get_datetime_from_unix_time(uint64_t unix_time_val) const { // Just fail if unix time is negative (when interpreted as an int). // This means the user passed in a negative value by accident - ERR_EXPLAIN("unix_time_val was really huge!"+ itos(unix_time_val) + " You probably passed in a negative value!"); - ERR_FAIL_COND_V( (int64_t)unix_time_val < 0, Dictionary()); + ERR_EXPLAIN("unix_time_val was really huge!" + itos(unix_time_val) + " You probably passed in a negative value!"); + ERR_FAIL_COND_V((int64_t)unix_time_val < 0, Dictionary()); OS::Date date; OS::Time time; @@ -705,18 +682,18 @@ Dictionary _OS::get_datetime_from_unix_time( uint64_t unix_time_val) const { } /// Add 1 to month to make sure months are indexed starting at 1 - date.month = static_cast(imonth+1); + date.month = static_cast(imonth + 1); date.day = dayno + 1; Dictionary timed; - timed[HOUR_KEY]=time.hour; - timed[MINUTE_KEY]=time.min; - timed[SECOND_KEY]=time.sec; - timed[YEAR_KEY]=date.year; - timed[MONTH_KEY]=date.month; - timed[DAY_KEY]=date.day; - timed[WEEKDAY_KEY]=date.weekday; + timed[HOUR_KEY] = time.hour; + timed[MINUTE_KEY] = time.min; + timed[SECOND_KEY] = time.sec; + timed[YEAR_KEY] = date.year; + timed[MONTH_KEY] = date.month; + timed[DAY_KEY] = date.day; + timed[WEEKDAY_KEY] = date.weekday; return timed; } @@ -745,7 +722,7 @@ void _OS::delay_usec(uint32_t p_usec) const { void _OS::delay_msec(uint32_t p_msec) const { - OS::get_singleton()->delay_usec(int64_t(p_msec)*1000); + OS::get_singleton()->delay_usec(int64_t(p_msec) * 1000); } uint32_t _OS::get_ticks_msec() const { @@ -768,7 +745,6 @@ bool _OS::can_draw() const { return OS::get_singleton()->can_draw(); } - int _OS::get_processor_count() const { return OS::get_singleton()->get_processor_count(); @@ -777,10 +753,9 @@ int _OS::get_processor_count() const { bool _OS::is_stdout_verbose() const { return OS::get_singleton()->is_stdout_verbose(); - } -void _OS::dump_memory_to_file(const String& p_file) { +void _OS::dump_memory_to_file(const String &p_file) { OS::get_singleton()->dump_memory_to_file(p_file.utf8().get_data()); } @@ -792,19 +767,18 @@ struct _OSCoreBindImg { int fmt; ObjectID id; int vram; - bool operator<(const _OSCoreBindImg& p_img) const { return vram==p_img.vram ? id p_img.vram; } + bool operator<(const _OSCoreBindImg &p_img) const { return vram == p_img.vram ? id < p_img.id : vram > p_img.vram; } }; void _OS::print_all_textures_by_size() { - List<_OSCoreBindImg> imgs; - int total=0; + int total = 0; { List > rsrc; ResourceCache::get_cached_resources(&rsrc); - for (List >::Element *E=rsrc.front();E;E=E->next()) { + for (List >::Element *E = rsrc.front(); E; E = E->next()) { if (!E->get()->is_class("ImageTexture")) continue; @@ -813,27 +787,27 @@ void _OS::print_all_textures_by_size() { int fmt = E->get()->call("get_format"); _OSCoreBindImg img; - img.size=size; - img.fmt=fmt; - img.path=E->get()->get_path(); - img.vram=Image::get_image_data_size(img.size.width,img.size.height,Image::Format(img.fmt)); - img.id=E->get()->get_instance_ID(); - total+=img.vram; + img.size = size; + img.fmt = fmt; + img.path = E->get()->get_path(); + img.vram = Image::get_image_data_size(img.size.width, img.size.height, Image::Format(img.fmt)); + img.id = E->get()->get_instance_ID(); + total += img.vram; imgs.push_back(img); } } imgs.sort(); - for(List<_OSCoreBindImg>::Element *E=imgs.front();E;E=E->next()) { + for (List<_OSCoreBindImg>::Element *E = imgs.front(); E; E = E->next()) { - total-=E->get().vram; + total -= E->get().vram; } } -void _OS::print_resources_by_type(const Vector& p_types) { +void _OS::print_resources_by_type(const Vector &p_types) { - Map type_count; + Map type_count; List > resources; ResourceCache::get_cached_resources(&resources); @@ -841,13 +815,13 @@ void _OS::print_resources_by_type(const Vector& p_types) { List > rsrc; ResourceCache::get_cached_resources(&rsrc); - for (List >::Element *E=rsrc.front();E;E=E->next()) { + for (List >::Element *E = rsrc.front(); E; E = E->next()) { Ref r = E->get(); bool found = false; - for (int i=0; iis_class(p_types[i])) found = true; } @@ -855,20 +829,18 @@ void _OS::print_resources_by_type(const Vector& p_types) { continue; if (!type_count.has(r->get_class())) { - type_count[r->get_class()]=0; + type_count[r->get_class()] = 0; } - type_count[r->get_class()]++; } - }; bool _OS::has_virtual_keyboard() const { return OS::get_singleton()->has_virtual_keyboard(); } -void _OS::show_virtual_keyboard(const String& p_existing_text) { +void _OS::show_virtual_keyboard(const String &p_existing_text) { OS::get_singleton()->show_virtual_keyboard(p_existing_text, Rect2()); } @@ -876,7 +848,7 @@ void _OS::hide_virtual_keyboard() { OS::get_singleton()->hide_virtual_keyboard(); } -void _OS::print_all_resources(const String& p_to_file ) { +void _OS::print_all_resources(const String &p_to_file) { OS::get_singleton()->print_all_resources(p_to_file); } @@ -886,7 +858,7 @@ void _OS::print_resources_in_use(bool p_short) { OS::get_singleton()->print_resources_in_use(p_short); } -void _OS::dump_resources_to_file(const String& p_file) { +void _OS::dump_resources_to_file(const String &p_file) { OS::get_singleton()->dump_resources_to_file(p_file.utf8().get_data()); } @@ -932,7 +904,6 @@ bool _OS::is_debug_build() const { #else return false; #endif - } void _OS::set_screen_orientation(ScreenOrientation p_orientation) { @@ -960,8 +931,6 @@ String _OS::get_system_dir(SystemDir p_dir) const { return OS::get_singleton()->get_system_dir(OS::SystemDir(p_dir)); } - - String _OS::get_scancode_string(uint32_t p_code) const { return keycode_get_string(p_code); @@ -970,25 +939,25 @@ bool _OS::is_scancode_unicode(uint32_t p_unicode) const { return keycode_has_unicode(p_unicode); } -int _OS::find_scancode_from_string(const String& p_code) const { +int _OS::find_scancode_from_string(const String &p_code) const { return find_keycode(p_code); } -void _OS::alert(const String& p_alert,const String& p_title) { +void _OS::alert(const String &p_alert, const String &p_title) { - OS::get_singleton()->alert(p_alert,p_title); + OS::get_singleton()->alert(p_alert, p_title); } -_OS *_OS::singleton=NULL; +_OS *_OS::singleton = NULL; void _OS::_bind_methods() { //ClassDB::bind_method(D_METHOD("get_mouse_pos"),&_OS::get_mouse_pos); //ClassDB::bind_method(D_METHOD("is_mouse_grab_enabled"),&_OS::is_mouse_grab_enabled); - ClassDB::bind_method(D_METHOD("set_clipboard","clipboard"),&_OS::set_clipboard); - ClassDB::bind_method(D_METHOD("get_clipboard"),&_OS::get_clipboard); + ClassDB::bind_method(D_METHOD("set_clipboard", "clipboard"), &_OS::set_clipboard); + ClassDB::bind_method(D_METHOD("get_clipboard"), &_OS::get_clipboard); //will not delete for now, just unexpose //ClassDB::bind_method(D_METHOD("set_video_mode","size","fullscreen","resizable","screen"),&_OS::set_video_mode,DEFVAL(0)); @@ -997,219 +966,212 @@ void _OS::_bind_methods() { //ClassDB::bind_method(D_METHOD("is_video_mode_resizable","screen"),&_OS::is_video_mode_resizable,DEFVAL(0)); //ClassDB::bind_method(D_METHOD("get_fullscreen_mode_list","screen"),&_OS::get_fullscreen_mode_list,DEFVAL(0)); - - ClassDB::bind_method(D_METHOD("get_screen_count"),&_OS::get_screen_count); - ClassDB::bind_method(D_METHOD("get_current_screen"),&_OS::get_current_screen); - ClassDB::bind_method(D_METHOD("set_current_screen","screen"),&_OS::set_current_screen); - ClassDB::bind_method(D_METHOD("get_screen_position","screen"),&_OS::get_screen_position,DEFVAL(0)); - ClassDB::bind_method(D_METHOD("get_screen_size","screen"),&_OS::get_screen_size,DEFVAL(0)); - ClassDB::bind_method(D_METHOD("get_screen_dpi","screen"),&_OS::get_screen_dpi,DEFVAL(0)); - ClassDB::bind_method(D_METHOD("get_window_position"),&_OS::get_window_position); - ClassDB::bind_method(D_METHOD("set_window_position","position"),&_OS::set_window_position); - ClassDB::bind_method(D_METHOD("get_window_size"),&_OS::get_window_size); - ClassDB::bind_method(D_METHOD("set_window_size","size"),&_OS::set_window_size); - ClassDB::bind_method(D_METHOD("set_window_fullscreen","enabled"),&_OS::set_window_fullscreen); - ClassDB::bind_method(D_METHOD("is_window_fullscreen"),&_OS::is_window_fullscreen); - ClassDB::bind_method(D_METHOD("set_window_resizable","enabled"),&_OS::set_window_resizable); - ClassDB::bind_method(D_METHOD("is_window_resizable"),&_OS::is_window_resizable); - ClassDB::bind_method(D_METHOD("set_window_minimized", "enabled"),&_OS::set_window_minimized); - ClassDB::bind_method(D_METHOD("is_window_minimized"),&_OS::is_window_minimized); - ClassDB::bind_method(D_METHOD("set_window_maximized", "enabled"),&_OS::set_window_maximized); - ClassDB::bind_method(D_METHOD("is_window_maximized"),&_OS::is_window_maximized); + ClassDB::bind_method(D_METHOD("get_screen_count"), &_OS::get_screen_count); + ClassDB::bind_method(D_METHOD("get_current_screen"), &_OS::get_current_screen); + ClassDB::bind_method(D_METHOD("set_current_screen", "screen"), &_OS::set_current_screen); + ClassDB::bind_method(D_METHOD("get_screen_position", "screen"), &_OS::get_screen_position, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_screen_size", "screen"), &_OS::get_screen_size, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_screen_dpi", "screen"), &_OS::get_screen_dpi, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_window_position"), &_OS::get_window_position); + ClassDB::bind_method(D_METHOD("set_window_position", "position"), &_OS::set_window_position); + ClassDB::bind_method(D_METHOD("get_window_size"), &_OS::get_window_size); + ClassDB::bind_method(D_METHOD("set_window_size", "size"), &_OS::set_window_size); + ClassDB::bind_method(D_METHOD("set_window_fullscreen", "enabled"), &_OS::set_window_fullscreen); + ClassDB::bind_method(D_METHOD("is_window_fullscreen"), &_OS::is_window_fullscreen); + ClassDB::bind_method(D_METHOD("set_window_resizable", "enabled"), &_OS::set_window_resizable); + ClassDB::bind_method(D_METHOD("is_window_resizable"), &_OS::is_window_resizable); + ClassDB::bind_method(D_METHOD("set_window_minimized", "enabled"), &_OS::set_window_minimized); + ClassDB::bind_method(D_METHOD("is_window_minimized"), &_OS::is_window_minimized); + ClassDB::bind_method(D_METHOD("set_window_maximized", "enabled"), &_OS::set_window_maximized); + ClassDB::bind_method(D_METHOD("is_window_maximized"), &_OS::is_window_maximized); ClassDB::bind_method(D_METHOD("request_attention"), &_OS::request_attention); ClassDB::bind_method(D_METHOD("set_borderless_window", "borderless"), &_OS::set_borderless_window); ClassDB::bind_method(D_METHOD("get_borderless_window"), &_OS::get_borderless_window); - ClassDB::bind_method(D_METHOD("set_screen_orientation","orientation"),&_OS::set_screen_orientation); - ClassDB::bind_method(D_METHOD("get_screen_orientation"),&_OS::get_screen_orientation); + ClassDB::bind_method(D_METHOD("set_screen_orientation", "orientation"), &_OS::set_screen_orientation); + ClassDB::bind_method(D_METHOD("get_screen_orientation"), &_OS::get_screen_orientation); - ClassDB::bind_method(D_METHOD("set_keep_screen_on","enabled"),&_OS::set_keep_screen_on); - ClassDB::bind_method(D_METHOD("is_keep_screen_on"),&_OS::is_keep_screen_on); + ClassDB::bind_method(D_METHOD("set_keep_screen_on", "enabled"), &_OS::set_keep_screen_on); + ClassDB::bind_method(D_METHOD("is_keep_screen_on"), &_OS::is_keep_screen_on); + ClassDB::bind_method(D_METHOD("has_touchscreen_ui_hint"), &_OS::has_touchscreen_ui_hint); - ClassDB::bind_method(D_METHOD("has_touchscreen_ui_hint"),&_OS::has_touchscreen_ui_hint); + ClassDB::bind_method(D_METHOD("set_window_title", "title"), &_OS::set_window_title); - ClassDB::bind_method(D_METHOD("set_window_title","title"),&_OS::set_window_title); + ClassDB::bind_method(D_METHOD("set_low_processor_usage_mode", "enable"), &_OS::set_low_processor_usage_mode); + ClassDB::bind_method(D_METHOD("is_in_low_processor_usage_mode"), &_OS::is_in_low_processor_usage_mode); - ClassDB::bind_method(D_METHOD("set_low_processor_usage_mode","enable"),&_OS::set_low_processor_usage_mode); - ClassDB::bind_method(D_METHOD("is_in_low_processor_usage_mode"),&_OS::is_in_low_processor_usage_mode); + ClassDB::bind_method(D_METHOD("get_processor_count"), &_OS::get_processor_count); - ClassDB::bind_method(D_METHOD("get_processor_count"),&_OS::get_processor_count); + ClassDB::bind_method(D_METHOD("get_executable_path"), &_OS::get_executable_path); + ClassDB::bind_method(D_METHOD("execute", "path", "arguments", "blocking", "output"), &_OS::execute, DEFVAL(Array())); + ClassDB::bind_method(D_METHOD("kill", "pid"), &_OS::kill); + ClassDB::bind_method(D_METHOD("shell_open", "uri"), &_OS::shell_open); + ClassDB::bind_method(D_METHOD("get_process_ID"), &_OS::get_process_ID); - ClassDB::bind_method(D_METHOD("get_executable_path"),&_OS::get_executable_path); - ClassDB::bind_method(D_METHOD("execute","path","arguments","blocking","output"),&_OS::execute,DEFVAL(Array())); - ClassDB::bind_method(D_METHOD("kill","pid"),&_OS::kill); - ClassDB::bind_method(D_METHOD("shell_open","uri"),&_OS::shell_open); - ClassDB::bind_method(D_METHOD("get_process_ID"),&_OS::get_process_ID); + ClassDB::bind_method(D_METHOD("get_environment", "environment"), &_OS::get_environment); + ClassDB::bind_method(D_METHOD("has_environment", "environment"), &_OS::has_environment); - ClassDB::bind_method(D_METHOD("get_environment","environment"),&_OS::get_environment); - ClassDB::bind_method(D_METHOD("has_environment","environment"),&_OS::has_environment); + ClassDB::bind_method(D_METHOD("get_name"), &_OS::get_name); + ClassDB::bind_method(D_METHOD("get_cmdline_args"), &_OS::get_cmdline_args); - ClassDB::bind_method(D_METHOD("get_name"),&_OS::get_name); - ClassDB::bind_method(D_METHOD("get_cmdline_args"),&_OS::get_cmdline_args); - - ClassDB::bind_method(D_METHOD("get_datetime","utc"),&_OS::get_datetime,DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_date","utc"),&_OS::get_date,DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_time","utc"),&_OS::get_time,DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_time_zone_info"),&_OS::get_time_zone_info); - ClassDB::bind_method(D_METHOD("get_unix_time"),&_OS::get_unix_time); + ClassDB::bind_method(D_METHOD("get_datetime", "utc"), &_OS::get_datetime, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_date", "utc"), &_OS::get_date, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_time", "utc"), &_OS::get_time, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_time_zone_info"), &_OS::get_time_zone_info); + ClassDB::bind_method(D_METHOD("get_unix_time"), &_OS::get_unix_time); ClassDB::bind_method(D_METHOD("get_datetime_from_unix_time", "unix_time_val"), &_OS::get_datetime_from_unix_time); ClassDB::bind_method(D_METHOD("get_unix_time_from_datetime", "datetime"), &_OS::get_unix_time_from_datetime); ClassDB::bind_method(D_METHOD("get_system_time_secs"), &_OS::get_system_time_secs); - ClassDB::bind_method(D_METHOD("set_icon","icon"),&_OS::set_icon); - - ClassDB::bind_method(D_METHOD("get_exit_code"),&_OS::get_exit_code); - ClassDB::bind_method(D_METHOD("set_exit_code","code"),&_OS::set_exit_code); + ClassDB::bind_method(D_METHOD("set_icon", "icon"), &_OS::set_icon); - ClassDB::bind_method(D_METHOD("delay_usec","usec"),&_OS::delay_usec); - ClassDB::bind_method(D_METHOD("delay_msec","msec"),&_OS::delay_msec); - ClassDB::bind_method(D_METHOD("get_ticks_msec"),&_OS::get_ticks_msec); - ClassDB::bind_method(D_METHOD("get_splash_tick_msec"),&_OS::get_splash_tick_msec); - ClassDB::bind_method(D_METHOD("get_locale"),&_OS::get_locale); - ClassDB::bind_method(D_METHOD("get_latin_keyboard_variant"),&_OS::get_latin_keyboard_variant); - ClassDB::bind_method(D_METHOD("get_model_name"),&_OS::get_model_name); + ClassDB::bind_method(D_METHOD("get_exit_code"), &_OS::get_exit_code); + ClassDB::bind_method(D_METHOD("set_exit_code", "code"), &_OS::set_exit_code); + ClassDB::bind_method(D_METHOD("delay_usec", "usec"), &_OS::delay_usec); + ClassDB::bind_method(D_METHOD("delay_msec", "msec"), &_OS::delay_msec); + ClassDB::bind_method(D_METHOD("get_ticks_msec"), &_OS::get_ticks_msec); + ClassDB::bind_method(D_METHOD("get_splash_tick_msec"), &_OS::get_splash_tick_msec); + ClassDB::bind_method(D_METHOD("get_locale"), &_OS::get_locale); + ClassDB::bind_method(D_METHOD("get_latin_keyboard_variant"), &_OS::get_latin_keyboard_variant); + ClassDB::bind_method(D_METHOD("get_model_name"), &_OS::get_model_name); - ClassDB::bind_method(D_METHOD("can_draw"),&_OS::can_draw); - ClassDB::bind_method(D_METHOD("is_stdout_verbose"),&_OS::is_stdout_verbose); + ClassDB::bind_method(D_METHOD("can_draw"), &_OS::can_draw); + ClassDB::bind_method(D_METHOD("is_stdout_verbose"), &_OS::is_stdout_verbose); - ClassDB::bind_method(D_METHOD("can_use_threads"),&_OS::can_use_threads); + ClassDB::bind_method(D_METHOD("can_use_threads"), &_OS::can_use_threads); - ClassDB::bind_method(D_METHOD("is_debug_build"),&_OS::is_debug_build); + ClassDB::bind_method(D_METHOD("is_debug_build"), &_OS::is_debug_build); //ClassDB::bind_method(D_METHOD("get_mouse_button_state"),&_OS::get_mouse_button_state); - ClassDB::bind_method(D_METHOD("dump_memory_to_file","file"),&_OS::dump_memory_to_file); - ClassDB::bind_method(D_METHOD("dump_resources_to_file","file"),&_OS::dump_resources_to_file); - ClassDB::bind_method(D_METHOD("has_virtual_keyboard"),&_OS::has_virtual_keyboard); - ClassDB::bind_method(D_METHOD("show_virtual_keyboard", "existing_text"),&_OS::show_virtual_keyboard,DEFVAL("")); - ClassDB::bind_method(D_METHOD("hide_virtual_keyboard"),&_OS::hide_virtual_keyboard); - ClassDB::bind_method(D_METHOD("print_resources_in_use","short"),&_OS::print_resources_in_use,DEFVAL(false)); - ClassDB::bind_method(D_METHOD("print_all_resources","tofile"),&_OS::print_all_resources,DEFVAL("")); - - ClassDB::bind_method(D_METHOD("get_static_memory_usage"),&_OS::get_static_memory_usage); - ClassDB::bind_method(D_METHOD("get_static_memory_peak_usage"),&_OS::get_static_memory_peak_usage); - ClassDB::bind_method(D_METHOD("get_dynamic_memory_usage"),&_OS::get_dynamic_memory_usage); - - ClassDB::bind_method(D_METHOD("get_data_dir"),&_OS::get_data_dir); - ClassDB::bind_method(D_METHOD("get_system_dir","dir"),&_OS::get_system_dir); - ClassDB::bind_method(D_METHOD("get_unique_ID"),&_OS::get_unique_ID); - - ClassDB::bind_method(D_METHOD("is_ok_left_and_cancel_right"),&_OS::is_ok_left_and_cancel_right); - - - ClassDB::bind_method(D_METHOD("print_all_textures_by_size"),&_OS::print_all_textures_by_size); - ClassDB::bind_method(D_METHOD("print_resources_by_type","types"),&_OS::print_resources_by_type); - - ClassDB::bind_method(D_METHOD("native_video_play","path","volume","audio_track","subtitle_track"),&_OS::native_video_play); - ClassDB::bind_method(D_METHOD("native_video_is_playing"),&_OS::native_video_is_playing); - ClassDB::bind_method(D_METHOD("native_video_stop"),&_OS::native_video_stop); - ClassDB::bind_method(D_METHOD("native_video_pause"),&_OS::native_video_pause); - ClassDB::bind_method(D_METHOD("native_video_unpause"),&_OS::native_video_unpause); - - ClassDB::bind_method(D_METHOD("get_scancode_string","code"),&_OS::get_scancode_string); - ClassDB::bind_method(D_METHOD("is_scancode_unicode","code"),&_OS::is_scancode_unicode); - ClassDB::bind_method(D_METHOD("find_scancode_from_string","string"),&_OS::find_scancode_from_string); - - ClassDB::bind_method(D_METHOD("set_use_file_access_save_and_swap","enabled"),&_OS::set_use_file_access_save_and_swap); - - ClassDB::bind_method(D_METHOD("alert","text","title"),&_OS::alert,DEFVAL("Alert!")); - - ClassDB::bind_method(D_METHOD("set_thread_name","name"),&_OS::set_thread_name); - - ClassDB::bind_method(D_METHOD("set_use_vsync","enable"),&_OS::set_use_vsync); - ClassDB::bind_method(D_METHOD("is_vsync_enabled"),&_OS::is_vsync_enabled); - - ClassDB::bind_method(D_METHOD("get_power_state"),&_OS::get_power_state); - ClassDB::bind_method(D_METHOD("get_power_seconds_left"),&_OS::get_power_seconds_left); - ClassDB::bind_method(D_METHOD("get_power_percent_left"),&_OS::get_power_percent_left); - - BIND_CONSTANT( DAY_SUNDAY ); - BIND_CONSTANT( DAY_MONDAY ); - BIND_CONSTANT( DAY_TUESDAY ); - BIND_CONSTANT( DAY_WEDNESDAY ); - BIND_CONSTANT( DAY_THURSDAY ); - BIND_CONSTANT( DAY_FRIDAY ); - BIND_CONSTANT( DAY_SATURDAY ); - - BIND_CONSTANT( MONTH_JANUARY ); - BIND_CONSTANT( MONTH_FEBRUARY ); - BIND_CONSTANT( MONTH_MARCH ); - BIND_CONSTANT( MONTH_APRIL ); - BIND_CONSTANT( MONTH_MAY ); - BIND_CONSTANT( MONTH_JUNE ); - BIND_CONSTANT( MONTH_JULY ); - BIND_CONSTANT( MONTH_AUGUST ); - BIND_CONSTANT( MONTH_SEPTEMBER ); - BIND_CONSTANT( MONTH_OCTOBER ); - BIND_CONSTANT( MONTH_NOVEMBER ); - BIND_CONSTANT( MONTH_DECEMBER ); - - BIND_CONSTANT( SCREEN_ORIENTATION_LANDSCAPE ); - BIND_CONSTANT( SCREEN_ORIENTATION_PORTRAIT ); - BIND_CONSTANT( SCREEN_ORIENTATION_REVERSE_LANDSCAPE ); - BIND_CONSTANT( SCREEN_ORIENTATION_REVERSE_PORTRAIT ); - BIND_CONSTANT( SCREEN_ORIENTATION_SENSOR_LANDSCAPE ); - BIND_CONSTANT( SCREEN_ORIENTATION_SENSOR_PORTRAIT ); - BIND_CONSTANT( SCREEN_ORIENTATION_SENSOR ); - - BIND_CONSTANT( SYSTEM_DIR_DESKTOP); - BIND_CONSTANT( SYSTEM_DIR_DCIM ); - BIND_CONSTANT( SYSTEM_DIR_DOCUMENTS ); - BIND_CONSTANT( SYSTEM_DIR_DOWNLOADS ); - BIND_CONSTANT( SYSTEM_DIR_MOVIES ); - BIND_CONSTANT( SYSTEM_DIR_MUSIC ); - BIND_CONSTANT( SYSTEM_DIR_PICTURES ); - BIND_CONSTANT( SYSTEM_DIR_RINGTONES ); - - BIND_CONSTANT( POWERSTATE_UNKNOWN ); - BIND_CONSTANT( POWERSTATE_ON_BATTERY ); - BIND_CONSTANT( POWERSTATE_NO_BATTERY ); - BIND_CONSTANT( POWERSTATE_CHARGING ); - BIND_CONSTANT( POWERSTATE_CHARGED ); - + ClassDB::bind_method(D_METHOD("dump_memory_to_file", "file"), &_OS::dump_memory_to_file); + ClassDB::bind_method(D_METHOD("dump_resources_to_file", "file"), &_OS::dump_resources_to_file); + ClassDB::bind_method(D_METHOD("has_virtual_keyboard"), &_OS::has_virtual_keyboard); + ClassDB::bind_method(D_METHOD("show_virtual_keyboard", "existing_text"), &_OS::show_virtual_keyboard, DEFVAL("")); + ClassDB::bind_method(D_METHOD("hide_virtual_keyboard"), &_OS::hide_virtual_keyboard); + ClassDB::bind_method(D_METHOD("print_resources_in_use", "short"), &_OS::print_resources_in_use, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("print_all_resources", "tofile"), &_OS::print_all_resources, DEFVAL("")); + + ClassDB::bind_method(D_METHOD("get_static_memory_usage"), &_OS::get_static_memory_usage); + ClassDB::bind_method(D_METHOD("get_static_memory_peak_usage"), &_OS::get_static_memory_peak_usage); + ClassDB::bind_method(D_METHOD("get_dynamic_memory_usage"), &_OS::get_dynamic_memory_usage); + + ClassDB::bind_method(D_METHOD("get_data_dir"), &_OS::get_data_dir); + ClassDB::bind_method(D_METHOD("get_system_dir", "dir"), &_OS::get_system_dir); + ClassDB::bind_method(D_METHOD("get_unique_ID"), &_OS::get_unique_ID); + + ClassDB::bind_method(D_METHOD("is_ok_left_and_cancel_right"), &_OS::is_ok_left_and_cancel_right); + + ClassDB::bind_method(D_METHOD("print_all_textures_by_size"), &_OS::print_all_textures_by_size); + ClassDB::bind_method(D_METHOD("print_resources_by_type", "types"), &_OS::print_resources_by_type); + + ClassDB::bind_method(D_METHOD("native_video_play", "path", "volume", "audio_track", "subtitle_track"), &_OS::native_video_play); + ClassDB::bind_method(D_METHOD("native_video_is_playing"), &_OS::native_video_is_playing); + ClassDB::bind_method(D_METHOD("native_video_stop"), &_OS::native_video_stop); + ClassDB::bind_method(D_METHOD("native_video_pause"), &_OS::native_video_pause); + ClassDB::bind_method(D_METHOD("native_video_unpause"), &_OS::native_video_unpause); + + ClassDB::bind_method(D_METHOD("get_scancode_string", "code"), &_OS::get_scancode_string); + ClassDB::bind_method(D_METHOD("is_scancode_unicode", "code"), &_OS::is_scancode_unicode); + ClassDB::bind_method(D_METHOD("find_scancode_from_string", "string"), &_OS::find_scancode_from_string); + + ClassDB::bind_method(D_METHOD("set_use_file_access_save_and_swap", "enabled"), &_OS::set_use_file_access_save_and_swap); + + ClassDB::bind_method(D_METHOD("alert", "text", "title"), &_OS::alert, DEFVAL("Alert!")); + + ClassDB::bind_method(D_METHOD("set_thread_name", "name"), &_OS::set_thread_name); + + ClassDB::bind_method(D_METHOD("set_use_vsync", "enable"), &_OS::set_use_vsync); + ClassDB::bind_method(D_METHOD("is_vsync_enabled"), &_OS::is_vsync_enabled); + + ClassDB::bind_method(D_METHOD("get_power_state"), &_OS::get_power_state); + ClassDB::bind_method(D_METHOD("get_power_seconds_left"), &_OS::get_power_seconds_left); + ClassDB::bind_method(D_METHOD("get_power_percent_left"), &_OS::get_power_percent_left); + + BIND_CONSTANT(DAY_SUNDAY); + BIND_CONSTANT(DAY_MONDAY); + BIND_CONSTANT(DAY_TUESDAY); + BIND_CONSTANT(DAY_WEDNESDAY); + BIND_CONSTANT(DAY_THURSDAY); + BIND_CONSTANT(DAY_FRIDAY); + BIND_CONSTANT(DAY_SATURDAY); + + BIND_CONSTANT(MONTH_JANUARY); + BIND_CONSTANT(MONTH_FEBRUARY); + BIND_CONSTANT(MONTH_MARCH); + BIND_CONSTANT(MONTH_APRIL); + BIND_CONSTANT(MONTH_MAY); + BIND_CONSTANT(MONTH_JUNE); + BIND_CONSTANT(MONTH_JULY); + BIND_CONSTANT(MONTH_AUGUST); + BIND_CONSTANT(MONTH_SEPTEMBER); + BIND_CONSTANT(MONTH_OCTOBER); + BIND_CONSTANT(MONTH_NOVEMBER); + BIND_CONSTANT(MONTH_DECEMBER); + + BIND_CONSTANT(SCREEN_ORIENTATION_LANDSCAPE); + BIND_CONSTANT(SCREEN_ORIENTATION_PORTRAIT); + BIND_CONSTANT(SCREEN_ORIENTATION_REVERSE_LANDSCAPE); + BIND_CONSTANT(SCREEN_ORIENTATION_REVERSE_PORTRAIT); + BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR_LANDSCAPE); + BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR_PORTRAIT); + BIND_CONSTANT(SCREEN_ORIENTATION_SENSOR); + + BIND_CONSTANT(SYSTEM_DIR_DESKTOP); + BIND_CONSTANT(SYSTEM_DIR_DCIM); + BIND_CONSTANT(SYSTEM_DIR_DOCUMENTS); + BIND_CONSTANT(SYSTEM_DIR_DOWNLOADS); + BIND_CONSTANT(SYSTEM_DIR_MOVIES); + BIND_CONSTANT(SYSTEM_DIR_MUSIC); + BIND_CONSTANT(SYSTEM_DIR_PICTURES); + BIND_CONSTANT(SYSTEM_DIR_RINGTONES); + + BIND_CONSTANT(POWERSTATE_UNKNOWN); + BIND_CONSTANT(POWERSTATE_ON_BATTERY); + BIND_CONSTANT(POWERSTATE_NO_BATTERY); + BIND_CONSTANT(POWERSTATE_CHARGING); + BIND_CONSTANT(POWERSTATE_CHARGED); } _OS::_OS() { - singleton=this; + singleton = this; } - ///////////////////// GEOMETRY - -_Geometry *_Geometry::singleton=NULL; +_Geometry *_Geometry::singleton = NULL; _Geometry *_Geometry::get_singleton() { return singleton; } -PoolVector _Geometry::build_box_planes(const Vector3& p_extents) { +PoolVector _Geometry::build_box_planes(const Vector3 &p_extents) { return Geometry::build_box_planes(p_extents); } PoolVector _Geometry::build_cylinder_planes(float p_radius, float p_height, int p_sides, Vector3::Axis p_axis) { - return Geometry::build_cylinder_planes(p_radius,p_height,p_sides,p_axis); + return Geometry::build_cylinder_planes(p_radius, p_height, p_sides, p_axis); } PoolVector _Geometry::build_capsule_planes(float p_radius, float p_height, int p_sides, int p_lats, Vector3::Axis p_axis) { - return Geometry::build_capsule_planes(p_radius,p_height,p_sides,p_lats,p_axis); + return Geometry::build_capsule_planes(p_radius, p_height, p_sides, p_lats, p_axis); } -real_t _Geometry::segment_intersects_circle(const Vector2& p_from, const Vector2& p_to, const Vector2& p_circle_pos, real_t p_circle_radius) { +real_t _Geometry::segment_intersects_circle(const Vector2 &p_from, const Vector2 &p_to, const Vector2 &p_circle_pos, real_t p_circle_radius) { - return Geometry::segment_intersects_circle(p_from,p_to,p_circle_pos,p_circle_radius); + return Geometry::segment_intersects_circle(p_from, p_to, p_circle_pos, p_circle_radius); } -Variant _Geometry::segment_intersects_segment_2d(const Vector2& p_from_a,const Vector2& p_to_a,const Vector2& p_from_b,const Vector2& p_to_b) { +Variant _Geometry::segment_intersects_segment_2d(const Vector2 &p_from_a, const Vector2 &p_to_a, const Vector2 &p_from_b, const Vector2 &p_to_b) { Vector2 result; if (Geometry::segment_intersects_segment_2d(p_from_a, p_to_a, p_from_b, p_to_b, &result)) { @@ -1220,122 +1182,117 @@ Variant _Geometry::segment_intersects_segment_2d(const Vector2& p_from_a,const V }; }; -PoolVector _Geometry::get_closest_points_between_segments_2d( const Vector2& p1,const Vector2& q1, const Vector2& p2,const Vector2& q2) { +PoolVector _Geometry::get_closest_points_between_segments_2d(const Vector2 &p1, const Vector2 &q1, const Vector2 &p2, const Vector2 &q2) { Vector2 r1, r2; - Geometry::get_closest_points_between_segments(p1,q1,p2,q2,r1,r2); + Geometry::get_closest_points_between_segments(p1, q1, p2, q2, r1, r2); PoolVector r; r.resize(2); - r.set(0,r1); - r.set(1,r2); + r.set(0, r1); + r.set(1, r2); return r; } -PoolVector _Geometry::get_closest_points_between_segments(const Vector3& p1,const Vector3& p2,const Vector3& q1,const Vector3& q2) { +PoolVector _Geometry::get_closest_points_between_segments(const Vector3 &p1, const Vector3 &p2, const Vector3 &q1, const Vector3 &q2) { Vector3 r1, r2; - Geometry::get_closest_points_between_segments(p1,p2,q1,q2,r1,r2); + Geometry::get_closest_points_between_segments(p1, p2, q1, q2, r1, r2); PoolVector r; r.resize(2); - r.set(0,r1); - r.set(1,r2); + r.set(0, r1); + r.set(1, r2); return r; - } -Vector2 _Geometry::get_closest_point_to_segment_2d(const Vector2& p_point, const Vector2& p_a,const Vector2& p_b) { +Vector2 _Geometry::get_closest_point_to_segment_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) { - Vector2 s[2]={p_a,p_b}; - return Geometry::get_closest_point_to_segment_2d(p_point,s); + Vector2 s[2] = { p_a, p_b }; + return Geometry::get_closest_point_to_segment_2d(p_point, s); } -Vector3 _Geometry::get_closest_point_to_segment(const Vector3& p_point, const Vector3& p_a,const Vector3& p_b) { +Vector3 _Geometry::get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) { - Vector3 s[2]={p_a,p_b}; - return Geometry::get_closest_point_to_segment(p_point,s); + Vector3 s[2] = { p_a, p_b }; + return Geometry::get_closest_point_to_segment(p_point, s); } -Vector2 _Geometry::get_closest_point_to_segment_uncapped_2d(const Vector2& p_point, const Vector2& p_a,const Vector2& p_b) { +Vector2 _Geometry::get_closest_point_to_segment_uncapped_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) { - Vector2 s[2]={p_a,p_b}; - return Geometry::get_closest_point_to_segment_uncapped_2d(p_point,s); + Vector2 s[2] = { p_a, p_b }; + return Geometry::get_closest_point_to_segment_uncapped_2d(p_point, s); } -Vector3 _Geometry::get_closest_point_to_segment_uncapped(const Vector3& p_point, const Vector3& p_a,const Vector3& p_b) { +Vector3 _Geometry::get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) { - Vector3 s[2]={p_a,p_b}; - return Geometry::get_closest_point_to_segment_uncapped(p_point,s); + Vector3 s[2] = { p_a, p_b }; + return Geometry::get_closest_point_to_segment_uncapped(p_point, s); } -Variant _Geometry::ray_intersects_triangle( const Vector3& p_from, const Vector3& p_dir, const Vector3& p_v0,const Vector3& p_v1,const Vector3& p_v2) { +Variant _Geometry::ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2) { Vector3 res; - if (Geometry::ray_intersects_triangle(p_from,p_dir,p_v0,p_v1,p_v2,&res)) + if (Geometry::ray_intersects_triangle(p_from, p_dir, p_v0, p_v1, p_v2, &res)) return res; else return Variant(); - - } -Variant _Geometry::segment_intersects_triangle( const Vector3& p_from, const Vector3& p_to, const Vector3& p_v0,const Vector3& p_v1,const Vector3& p_v2) { +Variant _Geometry::segment_intersects_triangle(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2) { Vector3 res; - if (Geometry::segment_intersects_triangle(p_from,p_to,p_v0,p_v1,p_v2,&res)) + if (Geometry::segment_intersects_triangle(p_from, p_to, p_v0, p_v1, p_v2, &res)) return res; else return Variant(); - } -bool _Geometry::point_is_inside_triangle(const Vector2& s, const Vector2& a, const Vector2& b, const Vector2& c) const { +bool _Geometry::point_is_inside_triangle(const Vector2 &s, const Vector2 &a, const Vector2 &b, const Vector2 &c) const { - return Geometry::is_point_in_triangle(s,a,b,c); + return Geometry::is_point_in_triangle(s, a, b, c); } -PoolVector _Geometry::segment_intersects_sphere( const Vector3& p_from, const Vector3& p_to, const Vector3& p_sphere_pos,real_t p_sphere_radius) { +PoolVector _Geometry::segment_intersects_sphere(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_sphere_pos, real_t p_sphere_radius) { PoolVector r; - Vector3 res,norm; - if (!Geometry::segment_intersects_sphere(p_from,p_to,p_sphere_pos,p_sphere_radius,&res,&norm)) + Vector3 res, norm; + if (!Geometry::segment_intersects_sphere(p_from, p_to, p_sphere_pos, p_sphere_radius, &res, &norm)) return r; r.resize(2); - r.set(0,res); - r.set(1,norm); + r.set(0, res); + r.set(1, norm); return r; } -PoolVector _Geometry::segment_intersects_cylinder( const Vector3& p_from, const Vector3& p_to, float p_height,float p_radius) { +PoolVector _Geometry::segment_intersects_cylinder(const Vector3 &p_from, const Vector3 &p_to, float p_height, float p_radius) { PoolVector r; - Vector3 res,norm; - if (!Geometry::segment_intersects_cylinder(p_from,p_to,p_height,p_radius,&res,&norm)) + Vector3 res, norm; + if (!Geometry::segment_intersects_cylinder(p_from, p_to, p_height, p_radius, &res, &norm)) return r; r.resize(2); - r.set(0,res); - r.set(1,norm); + r.set(0, res); + r.set(1, norm); return r; - } -PoolVector _Geometry::segment_intersects_convex(const Vector3& p_from, const Vector3& p_to,const Vector& p_planes) { +PoolVector _Geometry::segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Vector &p_planes) { PoolVector r; - Vector3 res,norm; - if (!Geometry::segment_intersects_convex(p_from,p_to,p_planes.ptr(),p_planes.size(),&res,&norm)) + Vector3 res, norm; + if (!Geometry::segment_intersects_convex(p_from, p_to, p_planes.ptr(), p_planes.size(), &res, &norm)) return r; r.resize(2); - r.set(0,res); - r.set(1,norm); + r.set(0, res); + r.set(1, norm); return r; } -Vector _Geometry::triangulate_polygon(const Vector& p_polygon) { +Vector _Geometry::triangulate_polygon(const Vector &p_polygon) { return Geometry::triangulate_polygon(p_polygon); } -Dictionary _Geometry::make_atlas(const Vector& p_rects) { +Dictionary _Geometry::make_atlas(const Vector &p_rects) { Dictionary ret; Vector rects; - for (int i=0; i& p_rects) { Size2 r_size = size; Vector r_result; - for (int i=0; i &p_key) { - -Error _File::open_encrypted(const String& p_path, int p_mode_flags,const Vector& p_key) { - - Error err = open(p_path,p_mode_flags); + Error err = open(p_path, p_mode_flags); if (err) return err; - FileAccessEncrypted *fae = memnew( FileAccessEncrypted ); - err = fae->open_and_parse(f,p_key,(p_mode_flags==WRITE)?FileAccessEncrypted::MODE_WRITE_AES256:FileAccessEncrypted::MODE_READ); + FileAccessEncrypted *fae = memnew(FileAccessEncrypted); + err = fae->open_and_parse(f, p_key, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ); if (err) { memdelete(fae); close(); return err; } - f=fae; + f = fae; return OK; } -Error _File::open_encrypted_pass(const String& p_path, int p_mode_flags,const String& p_pass) { +Error _File::open_encrypted_pass(const String &p_path, int p_mode_flags, const String &p_pass) { - Error err = open(p_path,p_mode_flags); + Error err = open(p_path, p_mode_flags); if (err) return err; - FileAccessEncrypted *fae = memnew( FileAccessEncrypted ); - err = fae->open_and_parse_password(f,p_pass,(p_mode_flags==WRITE)?FileAccessEncrypted::MODE_WRITE_AES256:FileAccessEncrypted::MODE_READ); + FileAccessEncrypted *fae = memnew(FileAccessEncrypted); + err = fae->open_and_parse_password(f, p_pass, (p_mode_flags == WRITE) ? FileAccessEncrypted::MODE_WRITE_AES256 : FileAccessEncrypted::MODE_READ); if (err) { memdelete(fae); close(); return err; } - f=fae; + f = fae; return OK; - } - -Error _File::open(const String& p_path, int p_mode_flags) { +Error _File::open(const String &p_path, int p_mode_flags) { close(); Error err; - f = FileAccess::open(p_path,p_mode_flags,&err); + f = FileAccess::open(p_path, p_mode_flags, &err); if (f) f->set_endian_swap(eswap); return err; - } -void _File::close(){ +void _File::close() { if (f) memdelete(f); - f=NULL; + f = NULL; } -bool _File::is_open() const{ - +bool _File::is_open() const { - return f!=NULL; + return f != NULL; } -void _File::seek(int64_t p_position){ +void _File::seek(int64_t p_position) { ERR_FAIL_COND(!f); f->seek(p_position); - } -void _File::seek_end(int64_t p_position){ - +void _File::seek_end(int64_t p_position) { ERR_FAIL_COND(!f); f->seek_end(p_position); } -int64_t _File::get_pos() const{ +int64_t _File::get_pos() const { - - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_pos(); } -int64_t _File::get_len() const{ +int64_t _File::get_len() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_len(); } -bool _File::eof_reached() const{ +bool _File::eof_reached() const { - ERR_FAIL_COND_V(!f,false); + ERR_FAIL_COND_V(!f, false); return f->eof_reached(); } -uint8_t _File::get_8() const{ +uint8_t _File::get_8() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_8(); - } -uint16_t _File::get_16() const{ +uint16_t _File::get_16() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_16(); - } -uint32_t _File::get_32() const{ +uint32_t _File::get_32() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_32(); - } -uint64_t _File::get_64() const{ +uint64_t _File::get_64() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_64(); - } -float _File::get_float() const{ +float _File::get_float() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_float(); - } -double _File::get_double() const{ +double _File::get_double() const { - - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_double(); } -real_t _File::get_real() const{ - +real_t _File::get_real() const { - ERR_FAIL_COND_V(!f,0); + ERR_FAIL_COND_V(!f, 0); return f->get_real(); } -PoolVector _File::get_buffer(int p_length) const{ +PoolVector _File::get_buffer(int p_length) const { PoolVector data; - ERR_FAIL_COND_V(!f,data); + ERR_FAIL_COND_V(!f, data); - ERR_FAIL_COND_V(p_length<0,data); - if (p_length==0) + ERR_FAIL_COND_V(p_length < 0, data); + if (p_length == 0) return data; Error err = data.resize(p_length); - ERR_FAIL_COND_V(err!=OK,data); + ERR_FAIL_COND_V(err != OK, data); PoolVector::Write w = data.write(); - int len = f->get_buffer(&w[0],p_length); - ERR_FAIL_COND_V( len < 0 , PoolVector()); + int len = f->get_buffer(&w[0], p_length); + ERR_FAIL_COND_V(len < 0, PoolVector()); w = PoolVector::Write(); @@ -1563,10 +1498,8 @@ PoolVector _File::get_buffer(int p_length) const{ data.resize(p_length); return data; - } - String _File::get_as_text() const { ERR_FAIL_COND_V(!f, String()); @@ -1576,42 +1509,35 @@ String _File::get_as_text() const { f->seek(0); String l = get_line(); - while(!eof_reached()) { - text+=l+"\n"; + while (!eof_reached()) { + text += l + "\n"; l = get_line(); } - text+=l; + text += l; f->seek(original_pos); return text; - - } - -String _File::get_md5(const String& p_path) const { +String _File::get_md5(const String &p_path) const { return FileAccess::get_md5(p_path); - } -String _File::get_sha256(const String& p_path) const { +String _File::get_sha256(const String &p_path) const { return FileAccess::get_sha256(p_path); - } +String _File::get_line() const { -String _File::get_line() const{ - - ERR_FAIL_COND_V(!f,String()); + ERR_FAIL_COND_V(!f, String()); return f->get_line(); - } Vector _File::get_csv_line(String delim) const { - ERR_FAIL_COND_V(!f,Vector()); + ERR_FAIL_COND_V(!f, Vector()); return f->get_csv_line(delim); } @@ -1620,79 +1546,76 @@ Vector _File::get_csv_line(String delim) const { * this flags get reset to false (little endian) on each open */ -void _File::set_endian_swap(bool p_swap){ +void _File::set_endian_swap(bool p_swap) { - - eswap=p_swap; + eswap = p_swap; if (f) f->set_endian_swap(p_swap); - } -bool _File::get_endian_swap(){ - +bool _File::get_endian_swap() { return eswap; } -Error _File::get_error() const{ +Error _File::get_error() const { if (!f) return ERR_UNCONFIGURED; return f->get_error(); } -void _File::store_8(uint8_t p_dest){ +void _File::store_8(uint8_t p_dest) { ERR_FAIL_COND(!f); f->store_8(p_dest); } -void _File::store_16(uint16_t p_dest){ +void _File::store_16(uint16_t p_dest) { ERR_FAIL_COND(!f); f->store_16(p_dest); } -void _File::store_32(uint32_t p_dest){ +void _File::store_32(uint32_t p_dest) { ERR_FAIL_COND(!f); f->store_32(p_dest); } -void _File::store_64(uint64_t p_dest){ +void _File::store_64(uint64_t p_dest) { ERR_FAIL_COND(!f); f->store_64(p_dest); } -void _File::store_float(float p_dest){ +void _File::store_float(float p_dest) { ERR_FAIL_COND(!f); f->store_float(p_dest); } -void _File::store_double(double p_dest){ +void _File::store_double(double p_dest) { ERR_FAIL_COND(!f); f->store_double(p_dest); } -void _File::store_real(real_t p_real){ +void _File::store_real(real_t p_real) { ERR_FAIL_COND(!f); f->store_real(p_real); } -void _File::store_string(const String& p_string){ +void _File::store_string(const String &p_string) { ERR_FAIL_COND(!f); f->store_string(p_string); } -void _File::store_pascal_string(const String& p_string) { +void _File::store_pascal_string(const String &p_string) { ERR_FAIL_COND(!f); @@ -1706,46 +1629,44 @@ String _File::get_pascal_string() { return f->get_pascal_string(); }; -void _File::store_line(const String& p_string){ +void _File::store_line(const String &p_string) { ERR_FAIL_COND(!f); f->store_line(p_string); } -void _File::store_buffer(const PoolVector& p_buffer){ +void _File::store_buffer(const PoolVector &p_buffer) { ERR_FAIL_COND(!f); int len = p_buffer.size(); - if (len==0) + if (len == 0) return; PoolVector::Read r = p_buffer.read(); - f->store_buffer(&r[0],len); + f->store_buffer(&r[0], len); } -bool _File::file_exists(const String& p_name) const{ +bool _File::file_exists(const String &p_name) const { return FileAccess::exists(p_name); - - } -void _File::store_var(const Variant& p_var) { +void _File::store_var(const Variant &p_var) { ERR_FAIL_COND(!f); int len; - Error err = encode_variant(p_var,NULL,len); - ERR_FAIL_COND( err != OK ); + Error err = encode_variant(p_var, NULL, len); + ERR_FAIL_COND(err != OK); PoolVector buff; buff.resize(len); PoolVector::Write w = buff.write(); - err = encode_variant(p_var,&w[0],len); - ERR_FAIL_COND( err != OK ); - w=PoolVector::Write(); + err = encode_variant(p_var, &w[0], len); + ERR_FAIL_COND(err != OK); + w = PoolVector::Write(); store_32(len); store_buffer(buff); @@ -1753,7 +1674,7 @@ void _File::store_var(const Variant& p_var) { Variant _File::get_var() const { - ERR_FAIL_COND_V(!f,Variant()); + ERR_FAIL_COND_V(!f, Variant()); uint32_t len = get_32(); PoolVector buff = get_buffer(len); ERR_FAIL_COND_V(buff.size() != len, Variant()); @@ -1761,8 +1682,8 @@ Variant _File::get_var() const { PoolVector::Read r = buff.read(); Variant v; - Error err = decode_variant(v,&r[0],len); - ERR_FAIL_COND_V( err!=OK, Variant() ); + Error err = decode_variant(v, &r[0], len); + ERR_FAIL_COND_V(err != OK, Variant()); return v; } @@ -1774,95 +1695,89 @@ uint64_t _File::get_modified_time(const String &p_file) const { void _File::_bind_methods() { - - ClassDB::bind_method(D_METHOD("open_encrypted","path","mode_flags","key"),&_File::open_encrypted); - ClassDB::bind_method(D_METHOD("open_encrypted_with_pass","path","mode_flags","pass"),&_File::open_encrypted_pass); - - ClassDB::bind_method(D_METHOD("open","path","flags"),&_File::open); - ClassDB::bind_method(D_METHOD("close"),&_File::close); - ClassDB::bind_method(D_METHOD("is_open"),&_File::is_open); - ClassDB::bind_method(D_METHOD("seek","pos"),&_File::seek); - ClassDB::bind_method(D_METHOD("seek_end","pos"),&_File::seek_end,DEFVAL(0)); - ClassDB::bind_method(D_METHOD("get_pos"),&_File::get_pos); - ClassDB::bind_method(D_METHOD("get_len"),&_File::get_len); - ClassDB::bind_method(D_METHOD("eof_reached"),&_File::eof_reached); - ClassDB::bind_method(D_METHOD("get_8"),&_File::get_8); - ClassDB::bind_method(D_METHOD("get_16"),&_File::get_16); - ClassDB::bind_method(D_METHOD("get_32"),&_File::get_32); - ClassDB::bind_method(D_METHOD("get_64"),&_File::get_64); - ClassDB::bind_method(D_METHOD("get_float"),&_File::get_float); - ClassDB::bind_method(D_METHOD("get_double"),&_File::get_double); - ClassDB::bind_method(D_METHOD("get_real"),&_File::get_real); - ClassDB::bind_method(D_METHOD("get_buffer","len"),&_File::get_buffer); - ClassDB::bind_method(D_METHOD("get_line"),&_File::get_line); - ClassDB::bind_method(D_METHOD("get_as_text"),&_File::get_as_text); - ClassDB::bind_method(D_METHOD("get_md5","path"),&_File::get_md5); - ClassDB::bind_method(D_METHOD("get_sha256","path"),&_File::get_sha256); - ClassDB::bind_method(D_METHOD("get_endian_swap"),&_File::get_endian_swap); - ClassDB::bind_method(D_METHOD("set_endian_swap","enable"),&_File::set_endian_swap); - ClassDB::bind_method(D_METHOD("get_error:Error"),&_File::get_error); - ClassDB::bind_method(D_METHOD("get_var"),&_File::get_var); - ClassDB::bind_method(D_METHOD("get_csv_line","delim"),&_File::get_csv_line,DEFVAL(",")); - - ClassDB::bind_method(D_METHOD("store_8","value"),&_File::store_8); - ClassDB::bind_method(D_METHOD("store_16","value"),&_File::store_16); - ClassDB::bind_method(D_METHOD("store_32","value"),&_File::store_32); - ClassDB::bind_method(D_METHOD("store_64","value"),&_File::store_64); - ClassDB::bind_method(D_METHOD("store_float","value"),&_File::store_float); - ClassDB::bind_method(D_METHOD("store_double","value"),&_File::store_double); - ClassDB::bind_method(D_METHOD("store_real","value"),&_File::store_real); - ClassDB::bind_method(D_METHOD("store_buffer","buffer"),&_File::store_buffer); - ClassDB::bind_method(D_METHOD("store_line","line"),&_File::store_line); - ClassDB::bind_method(D_METHOD("store_string","string"),&_File::store_string); - ClassDB::bind_method(D_METHOD("store_var","value"),&_File::store_var); - - ClassDB::bind_method(D_METHOD("store_pascal_string","string"),&_File::store_pascal_string); - ClassDB::bind_method(D_METHOD("get_pascal_string"),&_File::get_pascal_string); - - ClassDB::bind_method(D_METHOD("file_exists","path"),&_File::file_exists); - ClassDB::bind_method(D_METHOD("get_modified_time", "file"),&_File::get_modified_time); - - BIND_CONSTANT( READ ); - BIND_CONSTANT( WRITE ); - BIND_CONSTANT( READ_WRITE ); - BIND_CONSTANT( WRITE_READ ); -} - -_File::_File(){ + ClassDB::bind_method(D_METHOD("open_encrypted", "path", "mode_flags", "key"), &_File::open_encrypted); + ClassDB::bind_method(D_METHOD("open_encrypted_with_pass", "path", "mode_flags", "pass"), &_File::open_encrypted_pass); + + ClassDB::bind_method(D_METHOD("open", "path", "flags"), &_File::open); + ClassDB::bind_method(D_METHOD("close"), &_File::close); + ClassDB::bind_method(D_METHOD("is_open"), &_File::is_open); + ClassDB::bind_method(D_METHOD("seek", "pos"), &_File::seek); + ClassDB::bind_method(D_METHOD("seek_end", "pos"), &_File::seek_end, DEFVAL(0)); + ClassDB::bind_method(D_METHOD("get_pos"), &_File::get_pos); + ClassDB::bind_method(D_METHOD("get_len"), &_File::get_len); + ClassDB::bind_method(D_METHOD("eof_reached"), &_File::eof_reached); + ClassDB::bind_method(D_METHOD("get_8"), &_File::get_8); + ClassDB::bind_method(D_METHOD("get_16"), &_File::get_16); + ClassDB::bind_method(D_METHOD("get_32"), &_File::get_32); + ClassDB::bind_method(D_METHOD("get_64"), &_File::get_64); + ClassDB::bind_method(D_METHOD("get_float"), &_File::get_float); + ClassDB::bind_method(D_METHOD("get_double"), &_File::get_double); + ClassDB::bind_method(D_METHOD("get_real"), &_File::get_real); + ClassDB::bind_method(D_METHOD("get_buffer", "len"), &_File::get_buffer); + ClassDB::bind_method(D_METHOD("get_line"), &_File::get_line); + ClassDB::bind_method(D_METHOD("get_as_text"), &_File::get_as_text); + ClassDB::bind_method(D_METHOD("get_md5", "path"), &_File::get_md5); + ClassDB::bind_method(D_METHOD("get_sha256", "path"), &_File::get_sha256); + ClassDB::bind_method(D_METHOD("get_endian_swap"), &_File::get_endian_swap); + ClassDB::bind_method(D_METHOD("set_endian_swap", "enable"), &_File::set_endian_swap); + ClassDB::bind_method(D_METHOD("get_error:Error"), &_File::get_error); + ClassDB::bind_method(D_METHOD("get_var"), &_File::get_var); + ClassDB::bind_method(D_METHOD("get_csv_line", "delim"), &_File::get_csv_line, DEFVAL(",")); + + ClassDB::bind_method(D_METHOD("store_8", "value"), &_File::store_8); + ClassDB::bind_method(D_METHOD("store_16", "value"), &_File::store_16); + ClassDB::bind_method(D_METHOD("store_32", "value"), &_File::store_32); + ClassDB::bind_method(D_METHOD("store_64", "value"), &_File::store_64); + ClassDB::bind_method(D_METHOD("store_float", "value"), &_File::store_float); + ClassDB::bind_method(D_METHOD("store_double", "value"), &_File::store_double); + ClassDB::bind_method(D_METHOD("store_real", "value"), &_File::store_real); + ClassDB::bind_method(D_METHOD("store_buffer", "buffer"), &_File::store_buffer); + ClassDB::bind_method(D_METHOD("store_line", "line"), &_File::store_line); + ClassDB::bind_method(D_METHOD("store_string", "string"), &_File::store_string); + ClassDB::bind_method(D_METHOD("store_var", "value"), &_File::store_var); + + ClassDB::bind_method(D_METHOD("store_pascal_string", "string"), &_File::store_pascal_string); + ClassDB::bind_method(D_METHOD("get_pascal_string"), &_File::get_pascal_string); + + ClassDB::bind_method(D_METHOD("file_exists", "path"), &_File::file_exists); + ClassDB::bind_method(D_METHOD("get_modified_time", "file"), &_File::get_modified_time); + + BIND_CONSTANT(READ); + BIND_CONSTANT(WRITE); + BIND_CONSTANT(READ_WRITE); + BIND_CONSTANT(WRITE_READ); +} + +_File::_File() { f = NULL; - eswap=false; - + eswap = false; } -_File::~_File(){ +_File::~_File() { if (f) memdelete(f); - } /////////////////////////////////////////////////////// - - - -Error _Directory::open(const String& p_path) { +Error _Directory::open(const String &p_path) { Error err; - DirAccess *alt=DirAccess::open(p_path,&err); + DirAccess *alt = DirAccess::open(p_path, &err); if (!alt) return err; if (d) memdelete(d); - d=alt; + d = alt; return OK; } Error _Directory::list_dir_begin(bool p_skip_navigational, bool p_skip_hidden) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); _list_skip_navigational = p_skip_navigational; _list_skip_hidden = p_skip_hidden; @@ -1870,84 +1785,80 @@ Error _Directory::list_dir_begin(bool p_skip_navigational, bool p_skip_hidden) { return d->list_dir_begin(); } -String _Directory::get_next(){ +String _Directory::get_next() { - ERR_FAIL_COND_V(!d,""); + ERR_FAIL_COND_V(!d, ""); String next = d->get_next(); - while (next != "" - && ((_list_skip_navigational && (next == "." || next == "..")) - || (_list_skip_hidden && d->current_is_hidden()))) { + while (next != "" && ((_list_skip_navigational && (next == "." || next == "..")) || (_list_skip_hidden && d->current_is_hidden()))) { next = d->get_next(); } return next; } -bool _Directory::current_is_dir() const{ +bool _Directory::current_is_dir() const { - ERR_FAIL_COND_V(!d,false); + ERR_FAIL_COND_V(!d, false); return d->current_is_dir(); } -void _Directory::list_dir_end(){ +void _Directory::list_dir_end() { ERR_FAIL_COND(!d); return d->list_dir_end(); } -int _Directory::get_drive_count(){ +int _Directory::get_drive_count() { - ERR_FAIL_COND_V(!d,0); + ERR_FAIL_COND_V(!d, 0); return d->get_drive_count(); } -String _Directory::get_drive(int p_drive){ +String _Directory::get_drive(int p_drive) { - ERR_FAIL_COND_V(!d,""); + ERR_FAIL_COND_V(!d, ""); return d->get_drive(p_drive); } int _Directory::get_current_drive() { - ERR_FAIL_COND_V(!d,0); + ERR_FAIL_COND_V(!d, 0); return d->get_current_drive(); } -Error _Directory::change_dir(String p_dir){ +Error _Directory::change_dir(String p_dir) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); return d->change_dir(p_dir); } String _Directory::get_current_dir() { - ERR_FAIL_COND_V(!d,""); + ERR_FAIL_COND_V(!d, ""); return d->get_current_dir(); } -Error _Directory::make_dir(String p_dir){ +Error _Directory::make_dir(String p_dir) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); if (!p_dir.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_dir); Error err = d->make_dir(p_dir); memdelete(d); return err; - } return d->make_dir(p_dir); } -Error _Directory::make_dir_recursive(String p_dir){ +Error _Directory::make_dir_recursive(String p_dir) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); if (!p_dir.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_dir); Error err = d->make_dir_recursive(p_dir); memdelete(d); return err; - } return d->make_dir_recursive(p_dir); } -bool _Directory::file_exists(String p_file){ +bool _Directory::file_exists(String p_file) { - ERR_FAIL_COND_V(!d,false); + ERR_FAIL_COND_V(!d, false); if (!p_file.is_rel_path()) { return FileAccess::exists(p_file); @@ -1957,7 +1868,7 @@ bool _Directory::file_exists(String p_file){ } bool _Directory::dir_exists(String p_dir) { - ERR_FAIL_COND_V(!d,false); + ERR_FAIL_COND_V(!d, false); if (!p_dir.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_dir); @@ -1970,33 +1881,32 @@ bool _Directory::dir_exists(String p_dir) { } } -int _Directory::get_space_left(){ +int _Directory::get_space_left() { - ERR_FAIL_COND_V(!d,0); - return d->get_space_left()/1024*1024; //return value in megabytes, given binding is int + ERR_FAIL_COND_V(!d, 0); + return d->get_space_left() / 1024 * 1024; //return value in megabytes, given binding is int } -Error _Directory::copy(String p_from,String p_to){ +Error _Directory::copy(String p_from, String p_to) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); - return d->copy(p_from,p_to); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); + return d->copy(p_from, p_to); } -Error _Directory::rename(String p_from, String p_to){ +Error _Directory::rename(String p_from, String p_to) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); if (!p_from.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_from); - Error err = d->rename(p_from,p_to); + Error err = d->rename(p_from, p_to); memdelete(d); return err; } - return d->rename(p_from,p_to); - + return d->rename(p_from, p_to); } -Error _Directory::remove(String p_name){ +Error _Directory::remove(String p_name) { - ERR_FAIL_COND_V(!d,ERR_UNCONFIGURED); + ERR_FAIL_COND_V(!d, ERR_UNCONFIGURED); if (!p_name.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_name); Error err = d->remove(p_name); @@ -2009,27 +1919,25 @@ Error _Directory::remove(String p_name){ void _Directory::_bind_methods() { - - ClassDB::bind_method(D_METHOD("open:Error","path"),&_Directory::open); + ClassDB::bind_method(D_METHOD("open:Error", "path"), &_Directory::open); ClassDB::bind_method(D_METHOD("list_dir_begin", "skip_navigational", "skip_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_next"),&_Directory::get_next); - ClassDB::bind_method(D_METHOD("current_is_dir"),&_Directory::current_is_dir); - ClassDB::bind_method(D_METHOD("list_dir_end"),&_Directory::list_dir_end); - ClassDB::bind_method(D_METHOD("get_drive_count"),&_Directory::get_drive_count); - ClassDB::bind_method(D_METHOD("get_drive","idx"),&_Directory::get_drive); - ClassDB::bind_method(D_METHOD("get_current_drive"),&_Directory::get_current_drive); - ClassDB::bind_method(D_METHOD("change_dir:Error","todir"),&_Directory::change_dir); - ClassDB::bind_method(D_METHOD("get_current_dir"),&_Directory::get_current_dir); - ClassDB::bind_method(D_METHOD("make_dir:Error","path"),&_Directory::make_dir); - ClassDB::bind_method(D_METHOD("make_dir_recursive:Error","path"),&_Directory::make_dir_recursive); - ClassDB::bind_method(D_METHOD("file_exists","path"),&_Directory::file_exists); - ClassDB::bind_method(D_METHOD("dir_exists","path"),&_Directory::dir_exists); + ClassDB::bind_method(D_METHOD("get_next"), &_Directory::get_next); + ClassDB::bind_method(D_METHOD("current_is_dir"), &_Directory::current_is_dir); + ClassDB::bind_method(D_METHOD("list_dir_end"), &_Directory::list_dir_end); + ClassDB::bind_method(D_METHOD("get_drive_count"), &_Directory::get_drive_count); + ClassDB::bind_method(D_METHOD("get_drive", "idx"), &_Directory::get_drive); + ClassDB::bind_method(D_METHOD("get_current_drive"), &_Directory::get_current_drive); + ClassDB::bind_method(D_METHOD("change_dir:Error", "todir"), &_Directory::change_dir); + ClassDB::bind_method(D_METHOD("get_current_dir"), &_Directory::get_current_dir); + ClassDB::bind_method(D_METHOD("make_dir:Error", "path"), &_Directory::make_dir); + ClassDB::bind_method(D_METHOD("make_dir_recursive:Error", "path"), &_Directory::make_dir_recursive); + ClassDB::bind_method(D_METHOD("file_exists", "path"), &_Directory::file_exists); + ClassDB::bind_method(D_METHOD("dir_exists", "path"), &_Directory::dir_exists); //ClassDB::bind_method(D_METHOD("get_modified_time","file"),&_Directory::get_modified_time); - ClassDB::bind_method(D_METHOD("get_space_left"),&_Directory::get_space_left); - ClassDB::bind_method(D_METHOD("copy:Error","from","to"),&_Directory::copy); - ClassDB::bind_method(D_METHOD("rename:Error","from","to"),&_Directory::rename); - ClassDB::bind_method(D_METHOD("remove:Error","path"),&_Directory::remove); - + ClassDB::bind_method(D_METHOD("get_space_left"), &_Directory::get_space_left); + ClassDB::bind_method(D_METHOD("copy:Error", "from", "to"), &_Directory::copy); + ClassDB::bind_method(D_METHOD("rename:Error", "from", "to"), &_Directory::rename); + ClassDB::bind_method(D_METHOD("remove:Error", "path"), &_Directory::remove); } _Directory::_Directory() { @@ -2043,40 +1951,39 @@ _Directory::~_Directory() { memdelete(d); } -_Marshalls* _Marshalls::singleton=NULL; +_Marshalls *_Marshalls::singleton = NULL; -_Marshalls *_Marshalls::get_singleton() -{ +_Marshalls *_Marshalls::get_singleton() { return singleton; } -String _Marshalls::variant_to_base64(const Variant& p_var) { +String _Marshalls::variant_to_base64(const Variant &p_var) { int len; - Error err = encode_variant(p_var,NULL,len); - ERR_FAIL_COND_V( err != OK, "" ); + Error err = encode_variant(p_var, NULL, len); + ERR_FAIL_COND_V(err != OK, ""); PoolVector buff; buff.resize(len); PoolVector::Write w = buff.write(); - err = encode_variant(p_var,&w[0],len); - ERR_FAIL_COND_V( err != OK, "" ); + err = encode_variant(p_var, &w[0], len); + ERR_FAIL_COND_V(err != OK, ""); int b64len = len / 3 * 4 + 4 + 1; PoolVector b64buff; b64buff.resize(b64len); PoolVector::Write w64 = b64buff.write(); - int strlen = base64_encode((char*)(&w64[0]), (char*)(&w[0]), len); + int strlen = base64_encode((char *)(&w64[0]), (char *)(&w[0]), len); //OS::get_singleton()->print("len is %i, vector size is %i\n", b64len, strlen); w64[strlen] = 0; - String ret = (char*)&w64[0]; + String ret = (char *)&w64[0]; return ret; }; -Variant _Marshalls::base64_to_variant(const String& p_str) { +Variant _Marshalls::base64_to_variant(const String &p_str) { int strlen = p_str.length(); CharString cstr = p_str.ascii(); @@ -2085,11 +1992,11 @@ Variant _Marshalls::base64_to_variant(const String& p_str) { buf.resize(strlen / 4 * 3 + 1); PoolVector::Write w = buf.write(); - int len = base64_decode((char*)(&w[0]), (char*)cstr.get_data(), strlen); + int len = base64_decode((char *)(&w[0]), (char *)cstr.get_data(), strlen); Variant v; Error err = decode_variant(v, &w[0], len); - ERR_FAIL_COND_V( err!=OK, Variant() ); + ERR_FAIL_COND_V(err != OK, Variant()); return v; }; @@ -2104,9 +2011,9 @@ String _Marshalls::raw_to_base64(const PoolVector &p_arr) { b64buff.resize(b64len); PoolVector::Write w64 = b64buff.write(); - int strlen = base64_encode((char*)(&w64[0]), (char*)(&r[0]), len); + int strlen = base64_encode((char *)(&w64[0]), (char *)(&r[0]), len); w64[strlen] = 0; - String ret = (char*)&w64[0]; + String ret = (char *)&w64[0]; return ret; }; @@ -2122,7 +2029,7 @@ PoolVector _Marshalls::base64_to_raw(const String &p_str) { buf.resize(strlen / 4 * 3 + 1); PoolVector::Write w = buf.write(); - arr_len = base64_decode((char*)(&w[0]), (char*)cstr.get_data(), strlen); + arr_len = base64_decode((char *)(&w[0]), (char *)cstr.get_data(), strlen); }; buf.resize(arr_len); @@ -2130,7 +2037,7 @@ PoolVector _Marshalls::base64_to_raw(const String &p_str) { return buf; }; -String _Marshalls::utf8_to_base64(const String& p_str) { +String _Marshalls::utf8_to_base64(const String &p_str) { CharString cstr = p_str.utf8(); int len = cstr.length(); @@ -2140,15 +2047,15 @@ String _Marshalls::utf8_to_base64(const String& p_str) { b64buff.resize(b64len); PoolVector::Write w64 = b64buff.write(); - int strlen = base64_encode((char*)(&w64[0]), (char*)cstr.get_data(), len); + int strlen = base64_encode((char *)(&w64[0]), (char *)cstr.get_data(), len); w64[strlen] = 0; - String ret = (char*)&w64[0]; + String ret = (char *)&w64[0]; return ret; }; -String _Marshalls::base64_to_utf8(const String& p_str) { +String _Marshalls::base64_to_utf8(const String &p_str) { int strlen = p_str.length(); CharString cstr = p_str.ascii(); @@ -2157,35 +2064,28 @@ String _Marshalls::base64_to_utf8(const String& p_str) { buf.resize(strlen / 4 * 3 + 1 + 1); PoolVector::Write w = buf.write(); - int len = base64_decode((char*)(&w[0]), (char*)cstr.get_data(), strlen); + int len = base64_decode((char *)(&w[0]), (char *)cstr.get_data(), strlen); w[len] = 0; - String ret = String::utf8((char*)&w[0]); + String ret = String::utf8((char *)&w[0]); return ret; }; - void _Marshalls::_bind_methods() { - ClassDB::bind_method(D_METHOD("variant_to_base64:String","variant"),&_Marshalls::variant_to_base64); - ClassDB::bind_method(D_METHOD("base64_to_variant:Variant","base64_str"),&_Marshalls::base64_to_variant); - - ClassDB::bind_method(D_METHOD("raw_to_base64:String","array"),&_Marshalls::raw_to_base64); - ClassDB::bind_method(D_METHOD("base64_to_raw:RawArray","base64_str"),&_Marshalls::base64_to_raw); + ClassDB::bind_method(D_METHOD("variant_to_base64:String", "variant"), &_Marshalls::variant_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_variant:Variant", "base64_str"), &_Marshalls::base64_to_variant); - ClassDB::bind_method(D_METHOD("utf8_to_base64:String","utf8_str"),&_Marshalls::utf8_to_base64); - ClassDB::bind_method(D_METHOD("base64_to_utf8:String","base64_str"),&_Marshalls::base64_to_utf8); + ClassDB::bind_method(D_METHOD("raw_to_base64:String", "array"), &_Marshalls::raw_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_raw:RawArray", "base64_str"), &_Marshalls::base64_to_raw); + ClassDB::bind_method(D_METHOD("utf8_to_base64:String", "utf8_str"), &_Marshalls::utf8_to_base64); + ClassDB::bind_method(D_METHOD("base64_to_utf8:String", "base64_str"), &_Marshalls::base64_to_utf8); }; - - //////////////// - - - Error _Semaphore::wait() { return semaphore->wait(); @@ -2196,133 +2096,120 @@ Error _Semaphore::post() { return semaphore->post(); } - void _Semaphore::_bind_methods() { - ClassDB::bind_method(D_METHOD("wait:Error"),&_Semaphore::wait); - ClassDB::bind_method(D_METHOD("post:Error"),&_Semaphore::post); - + ClassDB::bind_method(D_METHOD("wait:Error"), &_Semaphore::wait); + ClassDB::bind_method(D_METHOD("post:Error"), &_Semaphore::post); } - _Semaphore::_Semaphore() { - semaphore =Semaphore::create(); + semaphore = Semaphore::create(); } -_Semaphore::~_Semaphore(){ +_Semaphore::~_Semaphore() { memdelete(semaphore); } - /////////////// - void _Mutex::lock() { mutex->lock(); } -Error _Mutex::try_lock(){ +Error _Mutex::try_lock() { return mutex->try_lock(); } -void _Mutex::unlock(){ +void _Mutex::unlock() { mutex->unlock(); } void _Mutex::_bind_methods() { - ClassDB::bind_method(D_METHOD("lock"),&_Mutex::lock); - ClassDB::bind_method(D_METHOD("try_lock:Error"),&_Mutex::try_lock); - ClassDB::bind_method(D_METHOD("unlock"),&_Mutex::unlock); - + ClassDB::bind_method(D_METHOD("lock"), &_Mutex::lock); + ClassDB::bind_method(D_METHOD("try_lock:Error"), &_Mutex::try_lock); + ClassDB::bind_method(D_METHOD("unlock"), &_Mutex::unlock); } - _Mutex::_Mutex() { - mutex =Mutex::create(); + mutex = Mutex::create(); } -_Mutex::~_Mutex(){ +_Mutex::~_Mutex() { memdelete(mutex); } - /////////////// - - void _Thread::_start_func(void *ud) { - Ref<_Thread>* tud=(Ref<_Thread>*)ud; - Ref<_Thread> t=*tud; + Ref<_Thread> *tud = (Ref<_Thread> *)ud; + Ref<_Thread> t = *tud; memdelete(tud); Variant::CallError ce; - const Variant* arg[1]={&t->userdata}; + const Variant *arg[1] = { &t->userdata }; Thread::set_name(t->target_method); - t->ret=t->target_instance->call(t->target_method,arg,1,ce); - if (ce.error!=Variant::CallError::CALL_OK) { + t->ret = t->target_instance->call(t->target_method, arg, 1, ce); + if (ce.error != Variant::CallError::CALL_OK) { String reason; - switch(ce.error) { + switch (ce.error) { case Variant::CallError::CALL_ERROR_INVALID_ARGUMENT: { - reason="Invalid Argument #"+itos(ce.argument); + reason = "Invalid Argument #" + itos(ce.argument); } break; case Variant::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS: { - reason="Too Many Arguments"; + reason = "Too Many Arguments"; } break; case Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS: { - reason="Too Many Arguments"; + reason = "Too Many Arguments"; } break; case Variant::CallError::CALL_ERROR_INVALID_METHOD: { - reason="Method Not Found"; + reason = "Method Not Found"; } break; default: {} } - - ERR_EXPLAIN("Could not call function '"+t->target_method.operator String()+"'' starting thread ID: "+t->get_id()+" Reason: "+reason); + ERR_EXPLAIN("Could not call function '" + t->target_method.operator String() + "'' starting thread ID: " + t->get_id() + " Reason: " + reason); ERR_FAIL(); } - } -Error _Thread::start(Object *p_instance,const StringName& p_method,const Variant& p_userdata,int p_priority) { +Error _Thread::start(Object *p_instance, const StringName &p_method, const Variant &p_userdata, int p_priority) { - ERR_FAIL_COND_V(active,ERR_ALREADY_IN_USE); - ERR_FAIL_COND_V(!p_instance,ERR_INVALID_PARAMETER); - ERR_FAIL_COND_V(p_method==StringName(),ERR_INVALID_PARAMETER); - ERR_FAIL_INDEX_V(p_priority,3,ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V(active, ERR_ALREADY_IN_USE); + ERR_FAIL_COND_V(!p_instance, ERR_INVALID_PARAMETER); + ERR_FAIL_COND_V(p_method == StringName(), ERR_INVALID_PARAMETER); + ERR_FAIL_INDEX_V(p_priority, 3, ERR_INVALID_PARAMETER); + ret = Variant(); + target_method = p_method; + target_instance = p_instance; + userdata = p_userdata; + active = true; - ret=Variant(); - target_method=p_method; - target_instance=p_instance; - userdata=p_userdata; - active=true; - - Ref<_Thread> *ud = memnew( Ref<_Thread>(this) ); + Ref<_Thread> *ud = memnew(Ref<_Thread>(this)); Thread::Settings s; - s.priority=(Thread::Priority)p_priority; - thread = Thread::create(_start_func,ud,s); + s.priority = (Thread::Priority)p_priority; + thread = Thread::create(_start_func, ud, s); if (!thread) { - active=false; - target_method=StringName(); - target_instance=NULL; - userdata=Variant(); + active = false; + target_method = StringName(); + target_instance = NULL; + userdata = Variant(); return ERR_CANT_CREATE; } @@ -2343,36 +2230,35 @@ bool _Thread::is_active() const { } Variant _Thread::wait_to_finish() { - ERR_FAIL_COND_V(!thread,Variant()); - ERR_FAIL_COND_V(!active,Variant()); + ERR_FAIL_COND_V(!thread, Variant()); + ERR_FAIL_COND_V(!active, Variant()); Thread::wait_to_finish(thread); Variant r = ret; - active=false; - target_method=StringName(); - target_instance=NULL; - userdata=Variant(); - thread=NULL; + active = false; + target_method = StringName(); + target_instance = NULL; + userdata = Variant(); + thread = NULL; return r; } void _Thread::_bind_methods() { - ClassDB::bind_method(D_METHOD("start:Error","instance","method","userdata","priority"),&_Thread::start,DEFVAL(Variant()),DEFVAL(PRIORITY_NORMAL)); - ClassDB::bind_method(D_METHOD("get_id"),&_Thread::get_id); - ClassDB::bind_method(D_METHOD("is_active"),&_Thread::is_active); - ClassDB::bind_method(D_METHOD("wait_to_finish:Variant"),&_Thread::wait_to_finish); - - BIND_CONSTANT( PRIORITY_LOW ); - BIND_CONSTANT( PRIORITY_NORMAL ); - BIND_CONSTANT( PRIORITY_HIGH ); + ClassDB::bind_method(D_METHOD("start:Error", "instance", "method", "userdata", "priority"), &_Thread::start, DEFVAL(Variant()), DEFVAL(PRIORITY_NORMAL)); + ClassDB::bind_method(D_METHOD("get_id"), &_Thread::get_id); + ClassDB::bind_method(D_METHOD("is_active"), &_Thread::is_active); + ClassDB::bind_method(D_METHOD("wait_to_finish:Variant"), &_Thread::wait_to_finish); + BIND_CONSTANT(PRIORITY_LOW); + BIND_CONSTANT(PRIORITY_NORMAL); + BIND_CONSTANT(PRIORITY_HIGH); } _Thread::_Thread() { - active=false; - thread=NULL; - target_instance=NULL; + active = false; + thread = NULL; + target_instance = NULL; } _Thread::~_Thread() { @@ -2380,11 +2266,10 @@ _Thread::~_Thread() { if (active) { ERR_EXPLAIN("Reference to a Thread object object was lost while the thread is still running.."); } - ERR_FAIL_COND(active==true); + ERR_FAIL_COND(active == true); } ///////////////////////////////////// - PoolStringArray _ClassDB::get_class_list() const { List classes; @@ -2392,29 +2277,28 @@ PoolStringArray _ClassDB::get_class_list() const { PoolStringArray ret; ret.resize(classes.size()); - int idx=0; - for (List::Element *E=classes.front();E;E=E->next()) { - ret.set(idx++,E->get()); + int idx = 0; + for (List::Element *E = classes.front(); E; E = E->next()) { + ret.set(idx++, E->get()); } return ret; - } -PoolStringArray _ClassDB::get_inheriters_from_class( const StringName& p_class) const { +PoolStringArray _ClassDB::get_inheriters_from_class(const StringName &p_class) const { List classes; - ClassDB::get_inheriters_from_class(p_class,&classes); + ClassDB::get_inheriters_from_class(p_class, &classes); PoolStringArray ret; ret.resize(classes.size()); - int idx=0; - for (List::Element *E=classes.front();E;E=E->next()) { - ret.set(idx++,E->get()); + int idx = 0; + for (List::Element *E = classes.front(); E; E = E->next()) { + ret.set(idx++, E->get()); } return ret; } -StringName _ClassDB::get_parent_class(const StringName& p_class) const { +StringName _ClassDB::get_parent_class(const StringName &p_class) const { return ClassDB::get_parent_class(p_class); } @@ -2422,9 +2306,9 @@ bool _ClassDB::class_exists(const StringName &p_class) const { return ClassDB::class_exists(p_class); } -bool _ClassDB::is_parent_class(const StringName &p_class,const StringName& p_inherits) const { +bool _ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) const { - return ClassDB::is_parent_class(p_class,p_inherits); + return ClassDB::is_parent_class(p_class, p_inherits); } bool _ClassDB::can_instance(const StringName &p_class) const { @@ -2444,27 +2328,26 @@ Variant _ClassDB::instance(const StringName &p_class) const { } } -bool _ClassDB::has_signal(StringName p_class,StringName p_signal) const { +bool _ClassDB::has_signal(StringName p_class, StringName p_signal) const { - return ClassDB::has_signal(p_class,p_signal); + return ClassDB::has_signal(p_class, p_signal); } -Dictionary _ClassDB::get_signal(StringName p_class,StringName p_signal) const { +Dictionary _ClassDB::get_signal(StringName p_class, StringName p_signal) const { MethodInfo signal; - if (ClassDB::get_signal(p_class,p_signal,&signal)) { + if (ClassDB::get_signal(p_class, p_signal, &signal)) { return signal.operator Dictionary(); } else { return Dictionary(); } - } -Array _ClassDB::get_signal_list(StringName p_class,bool p_no_inheritance) const { +Array _ClassDB::get_signal_list(StringName p_class, bool p_no_inheritance) const { List signals; - ClassDB::get_signal_list(p_class,&signals,p_no_inheritance); + ClassDB::get_signal_list(p_class, &signals, p_no_inheritance); Array ret; - for (List::Element *E=signals.front();E;E=E->next()) { + for (List::Element *E = signals.front(); E; E = E->next()) { ret.push_back(E->get().operator Dictionary()); } @@ -2474,67 +2357,63 @@ Array _ClassDB::get_signal_list(StringName p_class,bool p_no_inheritance) const Array _ClassDB::get_property_list(StringName p_class, bool p_no_inheritance) const { List plist; - ClassDB::get_property_list(p_class,&plist,p_no_inheritance); + ClassDB::get_property_list(p_class, &plist, p_no_inheritance); Array ret; - for (List::Element *E=plist.front();E;E=E->next()) { + for (List::Element *E = plist.front(); E; E = E->next()) { ret.push_back(E->get().operator Dictionary()); } return ret; - - } -bool _ClassDB::has_method(StringName p_class,StringName p_method,bool p_no_inheritance) const { +bool _ClassDB::has_method(StringName p_class, StringName p_method, bool p_no_inheritance) const { - return ClassDB::has_method(p_class,p_method,p_no_inheritance); + return ClassDB::has_method(p_class, p_method, p_no_inheritance); } - -Array _ClassDB::get_method_list(StringName p_class,bool p_no_inheritance) const { +Array _ClassDB::get_method_list(StringName p_class, bool p_no_inheritance) const { List methods; - ClassDB::get_method_list(p_class,&methods,p_no_inheritance); + ClassDB::get_method_list(p_class, &methods, p_no_inheritance); Array ret; - for (List::Element *E=methods.front();E;E=E->next()) { + for (List::Element *E = methods.front(); E; E = E->next()) { ret.push_back(E->get().operator Dictionary()); } return ret; } -PoolStringArray _ClassDB::get_integer_constant_list(const StringName& p_class, bool p_no_inheritance) const { +PoolStringArray _ClassDB::get_integer_constant_list(const StringName &p_class, bool p_no_inheritance) const { List constants; - ClassDB::get_integer_constant_list(p_class,&constants,p_no_inheritance); + ClassDB::get_integer_constant_list(p_class, &constants, p_no_inheritance); PoolStringArray ret; ret.resize(constants.size()); - int idx=0; - for (List::Element *E=constants.front();E;E=E->next()) { - ret.set(idx++,E->get()); + int idx = 0; + for (List::Element *E = constants.front(); E; E = E->next()) { + ret.set(idx++, E->get()); } return ret; } -bool _ClassDB::has_integer_constant(const StringName& p_class, const StringName &p_name) const { +bool _ClassDB::has_integer_constant(const StringName &p_class, const StringName &p_name) const { bool success; - ClassDB::get_integer_constant(p_class,p_name,&success); + ClassDB::get_integer_constant(p_class, p_name, &success); return success; } -int _ClassDB::get_integer_constant(const StringName& p_class, const StringName &p_name) const { +int _ClassDB::get_integer_constant(const StringName &p_class, const StringName &p_name) const { bool found; - int c = ClassDB::get_integer_constant(p_class,p_name,&found); - ERR_FAIL_COND_V(!found,0); + int c = ClassDB::get_integer_constant(p_class, p_name, &found); + ERR_FAIL_COND_V(!found, 0); return c; - } -StringName _ClassDB::get_category(const StringName& p_node) const { +StringName _ClassDB::get_category(const StringName &p_node) const { return ClassDB::get_category(p_node); } @@ -2546,46 +2425,39 @@ bool _ClassDB::is_class_enabled(StringName p_class) const { void _ClassDB::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_class_list"),&_ClassDB::get_class_list); - ClassDB::bind_method(D_METHOD("get_inheriters_from_class","class"),&_ClassDB::get_inheriters_from_class); - ClassDB::bind_method(D_METHOD("get_parent_class","class"),&_ClassDB::get_parent_class); - ClassDB::bind_method(D_METHOD("class_exists","class"),&_ClassDB::class_exists); - ClassDB::bind_method(D_METHOD("is_parent_class","class","inherits"),&_ClassDB::is_parent_class); - ClassDB::bind_method(D_METHOD("can_instance","class"),&_ClassDB::can_instance); - ClassDB::bind_method(D_METHOD("instance:Variant","class"),&_ClassDB::instance); + ClassDB::bind_method(D_METHOD("get_class_list"), &_ClassDB::get_class_list); + ClassDB::bind_method(D_METHOD("get_inheriters_from_class", "class"), &_ClassDB::get_inheriters_from_class); + ClassDB::bind_method(D_METHOD("get_parent_class", "class"), &_ClassDB::get_parent_class); + ClassDB::bind_method(D_METHOD("class_exists", "class"), &_ClassDB::class_exists); + ClassDB::bind_method(D_METHOD("is_parent_class", "class", "inherits"), &_ClassDB::is_parent_class); + ClassDB::bind_method(D_METHOD("can_instance", "class"), &_ClassDB::can_instance); + ClassDB::bind_method(D_METHOD("instance:Variant", "class"), &_ClassDB::instance); - ClassDB::bind_method(D_METHOD("class_has_signal","class","signal"),&_ClassDB::has_signal); - ClassDB::bind_method(D_METHOD("class_get_signal","class","signal"),&_ClassDB::get_signal); - ClassDB::bind_method(D_METHOD("class_get_signal_list","class","no_inheritance"),&_ClassDB::get_signal_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_has_signal", "class", "signal"), &_ClassDB::has_signal); + ClassDB::bind_method(D_METHOD("class_get_signal", "class", "signal"), &_ClassDB::get_signal); + ClassDB::bind_method(D_METHOD("class_get_signal_list", "class", "no_inheritance"), &_ClassDB::get_signal_list, DEFVAL(false)); - ClassDB::bind_method(D_METHOD("class_get_property_list","class","no_inheritance"),&_ClassDB::get_property_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_get_property_list", "class", "no_inheritance"), &_ClassDB::get_property_list, DEFVAL(false)); - ClassDB::bind_method(D_METHOD("class_has_method","class","method","no_inheritance"),&_ClassDB::has_method,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_has_method", "class", "method", "no_inheritance"), &_ClassDB::has_method, DEFVAL(false)); - ClassDB::bind_method(D_METHOD("class_get_method_list","class","no_inheritance"),&_ClassDB::get_method_list,DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_get_method_list", "class", "no_inheritance"), &_ClassDB::get_method_list, DEFVAL(false)); - ClassDB::bind_method(D_METHOD("class_get_integer_constant_list","class","no_inheritance"),&_ClassDB::get_integer_constant_list,DEFVAL(false)); - - ClassDB::bind_method(D_METHOD("class_has_integer_constant","class","name"),&_ClassDB::has_integer_constant); - ClassDB::bind_method(D_METHOD("class_get_integer_constant","class","name"),&_ClassDB::get_integer_constant); - - ClassDB::bind_method(D_METHOD("class_get_category","class"),&_ClassDB::get_category); - ClassDB::bind_method(D_METHOD("is_class_enabled","class"),&_ClassDB::is_class_enabled); + ClassDB::bind_method(D_METHOD("class_get_integer_constant_list", "class", "no_inheritance"), &_ClassDB::get_integer_constant_list, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("class_has_integer_constant", "class", "name"), &_ClassDB::has_integer_constant); + ClassDB::bind_method(D_METHOD("class_get_integer_constant", "class", "name"), &_ClassDB::get_integer_constant); + ClassDB::bind_method(D_METHOD("class_get_category", "class"), &_ClassDB::get_category); + ClassDB::bind_method(D_METHOD("is_class_enabled", "class"), &_ClassDB::is_class_enabled); } -_ClassDB::_ClassDB(){ - - +_ClassDB::_ClassDB() { } -_ClassDB::~_ClassDB(){ - - +_ClassDB::~_ClassDB() { } /////////////////////////////// - void _Engine::set_iterations_per_second(int p_ips) { Engine::get_singleton()->set_iterations_per_second(p_ips); @@ -2593,7 +2465,6 @@ void _Engine::set_iterations_per_second(int p_ips) { int _Engine::get_iterations_per_second() const { return Engine::get_singleton()->get_iterations_per_second(); - } void _Engine::set_target_fps(int p_fps) { @@ -2604,8 +2475,6 @@ float _Engine::get_target_fps() const { return Engine::get_singleton()->get_target_fps(); } - - float _Engine::get_frames_per_second() const { return Engine::get_singleton()->get_frames_per_second(); @@ -2625,7 +2494,7 @@ float _Engine::get_time_scale() { return Engine::get_singleton()->get_time_scale(); } -int _Engine::get_frames_drawn() { +int _Engine::get_frames_drawn() { return Engine::get_singleton()->get_frames_drawn(); } @@ -2641,30 +2510,28 @@ Dictionary _Engine::get_version_info() const { return Engine::get_singleton()->get_version_info(); } - void _Engine::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_iterations_per_second","iterations_per_second"),&_Engine::set_iterations_per_second); - ClassDB::bind_method(D_METHOD("get_iterations_per_second"),&_Engine::get_iterations_per_second); - ClassDB::bind_method(D_METHOD("set_target_fps","target_fps"),&_Engine::set_target_fps); - ClassDB::bind_method(D_METHOD("get_target_fps"),&_Engine::get_target_fps); - - ClassDB::bind_method(D_METHOD("set_time_scale","time_scale"),&_Engine::set_time_scale); - ClassDB::bind_method(D_METHOD("get_time_scale"),&_Engine::get_time_scale); + ClassDB::bind_method(D_METHOD("set_iterations_per_second", "iterations_per_second"), &_Engine::set_iterations_per_second); + ClassDB::bind_method(D_METHOD("get_iterations_per_second"), &_Engine::get_iterations_per_second); + ClassDB::bind_method(D_METHOD("set_target_fps", "target_fps"), &_Engine::set_target_fps); + ClassDB::bind_method(D_METHOD("get_target_fps"), &_Engine::get_target_fps); - ClassDB::bind_method(D_METHOD("get_custom_level"),&_Engine::get_custom_level); + ClassDB::bind_method(D_METHOD("set_time_scale", "time_scale"), &_Engine::set_time_scale); + ClassDB::bind_method(D_METHOD("get_time_scale"), &_Engine::get_time_scale); - ClassDB::bind_method(D_METHOD("get_frames_drawn"),&_Engine::get_frames_drawn); - ClassDB::bind_method(D_METHOD("get_frames_per_second"),&_Engine::get_frames_per_second); + ClassDB::bind_method(D_METHOD("get_custom_level"), &_Engine::get_custom_level); - ClassDB::bind_method(D_METHOD("get_main_loop:MainLoop"),&_Engine::get_main_loop); + ClassDB::bind_method(D_METHOD("get_frames_drawn"), &_Engine::get_frames_drawn); + ClassDB::bind_method(D_METHOD("get_frames_per_second"), &_Engine::get_frames_per_second); - ClassDB::bind_method(D_METHOD("get_version_info"),&_Engine::get_version_info); + ClassDB::bind_method(D_METHOD("get_main_loop:MainLoop"), &_Engine::get_main_loop); + ClassDB::bind_method(D_METHOD("get_version_info"), &_Engine::get_version_info); } _Engine *_Engine::singleton = NULL; _Engine::_Engine() { - singleton=this; + singleton = this; } diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 6b9ae198ef..1d231ff033 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -31,73 +31,67 @@ #include "io/resource_loader.h" #include "io/resource_saver.h" -#include "os/file_access.h" #include "os/dir_access.h" -#include "os/thread.h" -#include "os/semaphore.h" +#include "os/file_access.h" #include "os/power.h" +#include "os/semaphore.h" +#include "os/thread.h" - -class _ResourceLoader : public Object { - GDCLASS(_ResourceLoader,Object); +class _ResourceLoader : public Object { + GDCLASS(_ResourceLoader, Object); protected: - static void _bind_methods(); static _ResourceLoader *singleton; -public: - +public: static _ResourceLoader *get_singleton() { return singleton; } - Ref load_interactive(const String& p_path,const String& p_type_hint=""); - RES load(const String &p_path,const String& p_type_hint="", bool p_no_cache = false); - PoolVector get_recognized_extensions_for_type(const String& p_type); + Ref load_interactive(const String &p_path, const String &p_type_hint = ""); + RES load(const String &p_path, const String &p_type_hint = "", bool p_no_cache = false); + PoolVector get_recognized_extensions_for_type(const String &p_type); void set_abort_on_missing_resources(bool p_abort); - PoolStringArray get_dependencies(const String& p_path); - bool has(const String& p_path); + PoolStringArray get_dependencies(const String &p_path); + bool has(const String &p_path); _ResourceLoader(); }; -class _ResourceSaver : public Object { - GDCLASS(_ResourceSaver,Object); +class _ResourceSaver : public Object { + GDCLASS(_ResourceSaver, Object); protected: - static void _bind_methods(); static _ResourceSaver *singleton; -public: +public: enum SaverFlags { - FLAG_RELATIVE_PATHS=1, - FLAG_BUNDLE_RESOURCES=2, - FLAG_CHANGE_PATH=4, - FLAG_OMIT_EDITOR_PROPERTIES=8, - FLAG_SAVE_BIG_ENDIAN=16, - FLAG_COMPRESS=32, + FLAG_RELATIVE_PATHS = 1, + FLAG_BUNDLE_RESOURCES = 2, + FLAG_CHANGE_PATH = 4, + FLAG_OMIT_EDITOR_PROPERTIES = 8, + FLAG_SAVE_BIG_ENDIAN = 16, + FLAG_COMPRESS = 32, }; static _ResourceSaver *get_singleton() { return singleton; } - Error save(const String &p_path,const RES& p_resource, uint32_t p_flags); - PoolVector get_recognized_extensions(const RES& p_resource); - + Error save(const String &p_path, const RES &p_resource, uint32_t p_flags); + PoolVector get_recognized_extensions(const RES &p_resource); _ResourceSaver(); }; class MainLoop; -class _OS : public Object { - GDCLASS(_OS,Object); +class _OS : public Object { + GDCLASS(_OS, Object); protected: - static void _bind_methods(); static _OS *singleton; -public: +public: enum Weekday { DAY_SUNDAY, DAY_MONDAY, @@ -126,30 +120,28 @@ public: }; Point2 get_mouse_pos() const; - void set_window_title(const String& p_title); + void set_window_title(const String &p_title); int get_mouse_button_state() const; - - void set_clipboard(const String& p_text); + void set_clipboard(const String &p_text); String get_clipboard() const; - void set_video_mode(const Size2& p_size, bool p_fullscreen,bool p_resizeable,int p_screen=0); - Size2 get_video_mode(int p_screen=0) const; - bool is_video_mode_fullscreen(int p_screen=0) const; - bool is_video_mode_resizable(int p_screen=0) const; - Array get_fullscreen_mode_list(int p_screen=0) const; - + void set_video_mode(const Size2 &p_size, bool p_fullscreen, bool p_resizeable, int p_screen = 0); + Size2 get_video_mode(int p_screen = 0) const; + bool is_video_mode_fullscreen(int p_screen = 0) const; + bool is_video_mode_resizable(int p_screen = 0) const; + Array get_fullscreen_mode_list(int p_screen = 0) const; virtual int get_screen_count() const; virtual int get_current_screen() const; virtual void set_current_screen(int p_screen); - virtual Point2 get_screen_position(int p_screen=0) const; - virtual Size2 get_screen_size(int p_screen=0) const; - virtual int get_screen_dpi(int p_screen=0) const; + virtual Point2 get_screen_position(int p_screen = 0) const; + virtual Size2 get_screen_size(int p_screen = 0) const; + virtual int get_screen_dpi(int p_screen = 0) const; virtual Point2 get_window_position() const; - virtual void set_window_position(const Point2& p_position); + virtual void set_window_position(const Point2 &p_position); virtual Size2 get_window_size() const; - virtual void set_window_size(const Size2& p_size); + virtual void set_window_size(const Size2 &p_size); virtual void set_window_fullscreen(bool p_enabled); virtual bool is_window_fullscreen() const; virtual void set_window_resizable(bool p_enabled); @@ -173,15 +165,15 @@ public: bool is_in_low_processor_usage_mode() const; String get_executable_path() const; - int execute(const String& p_path, const Vector & p_arguments,bool p_blocking,Array p_output=Array()); + int execute(const String &p_path, const Vector &p_arguments, bool p_blocking, Array p_output = Array()); Error kill(int p_pid); Error shell_open(String p_uri); int get_process_ID() const; - bool has_environment(const String& p_var) const; - String get_environment(const String& p_var) const; + bool has_environment(const String &p_var) const; + String get_environment(const String &p_var) const; String get_name() const; Vector get_cmdline_args(); @@ -191,18 +183,17 @@ public: String get_model_name() const; - - void dump_memory_to_file(const String& p_file); - void dump_resources_to_file(const String& p_file); + void dump_memory_to_file(const String &p_file); + void dump_resources_to_file(const String &p_file); bool has_virtual_keyboard() const; - void show_virtual_keyboard(const String& p_existing_text=""); + void show_virtual_keyboard(const String &p_existing_text = ""); void hide_virtual_keyboard(); - void print_resources_in_use(bool p_short=false); - void print_all_resources(const String& p_to_file); + void print_resources_in_use(bool p_short = false); + void print_all_resources(const String &p_to_file); void print_all_textures_by_size(); - void print_resources_by_type(const Vector& p_types); + void print_resources_by_type(const Vector &p_types); bool has_touchscreen_ui_hint() const; @@ -212,8 +203,7 @@ public: String get_scancode_string(uint32_t p_code) const; bool is_scancode_unicode(uint32_t p_unicode) const; - int find_scancode_from_string(const String& p_code) const; - + int find_scancode_from_string(const String &p_code) const; /* struct Date { @@ -235,7 +225,7 @@ public: void set_use_file_access_save_and_swap(bool p_enable); - void set_icon(const Image& p_icon); + void set_icon(const Image &p_icon); int get_exit_code() const; void set_exit_code(int p_code); @@ -289,11 +279,9 @@ public: String get_system_dir(SystemDir p_dir) const; - String get_data_dir() const; - void alert(const String& p_alert,const String& p_title="ALERT!"); - + void alert(const String &p_alert, const String &p_title = "ALERT!"); void set_screen_orientation(ScreenOrientation p_orientation); ScreenOrientation get_screen_orientation() const; @@ -301,10 +289,9 @@ public: void set_keep_screen_on(bool p_enabled); bool is_keep_screen_on() const; - bool is_ok_left_and_cancel_right() const; - Error set_thread_name(const String& p_name); + Error set_thread_name(const String &p_name); void set_use_vsync(bool p_enable); bool is_vsync_enabled() const; @@ -321,76 +308,71 @@ public: VARIANT_ENUM_CAST(_OS::SystemDir); VARIANT_ENUM_CAST(_OS::ScreenOrientation); - class _Geometry : public Object { GDCLASS(_Geometry, Object); static _Geometry *singleton; -protected: +protected: static void _bind_methods(); -public: +public: static _Geometry *get_singleton(); - PoolVector build_box_planes(const Vector3& p_extents); - PoolVector build_cylinder_planes(float p_radius, float p_height, int p_sides, Vector3::Axis p_axis=Vector3::AXIS_Z); - PoolVector build_capsule_planes(float p_radius, float p_height, int p_sides, int p_lats, Vector3::Axis p_axis=Vector3::AXIS_Z); - Variant segment_intersects_segment_2d(const Vector2& p_from_a,const Vector2& p_to_a,const Vector2& p_from_b,const Vector2& p_to_b); - PoolVector get_closest_points_between_segments_2d( const Vector2& p1,const Vector2& q1, const Vector2& p2,const Vector2& q2); - PoolVector get_closest_points_between_segments(const Vector3& p1,const Vector3& p2,const Vector3& q1,const Vector3& q2); - Vector2 get_closest_point_to_segment_2d(const Vector2& p_point, const Vector2& p_a,const Vector2& p_b); - Vector3 get_closest_point_to_segment(const Vector3& p_point, const Vector3& p_a,const Vector3& p_b); - Vector2 get_closest_point_to_segment_uncapped_2d(const Vector2& p_point, const Vector2& p_a,const Vector2& p_b); - Vector3 get_closest_point_to_segment_uncapped(const Vector3& p_point, const Vector3& p_a,const Vector3& p_b); - Variant ray_intersects_triangle( const Vector3& p_from, const Vector3& p_dir, const Vector3& p_v0,const Vector3& p_v1,const Vector3& p_v2); - Variant segment_intersects_triangle( const Vector3& p_from, const Vector3& p_to, const Vector3& p_v0,const Vector3& p_v1,const Vector3& p_v2); - bool point_is_inside_triangle(const Vector2& s, const Vector2& a, const Vector2& b, const Vector2& c) const; - - PoolVector segment_intersects_sphere( const Vector3& p_from, const Vector3& p_to, const Vector3& p_sphere_pos,real_t p_sphere_radius); - PoolVector segment_intersects_cylinder( const Vector3& p_from, const Vector3& p_to, float p_height,float p_radius); - PoolVector segment_intersects_convex(const Vector3& p_from, const Vector3& p_to,const Vector& p_planes); - real_t segment_intersects_circle(const Vector2& p_from, const Vector2& p_to, const Vector2& p_circle_pos, real_t p_circle_radius); - int get_uv84_normal_bit(const Vector3& p_vector); - - Vector triangulate_polygon(const Vector& p_polygon); - - Dictionary make_atlas(const Vector& p_rects); + PoolVector build_box_planes(const Vector3 &p_extents); + PoolVector build_cylinder_planes(float p_radius, float p_height, int p_sides, Vector3::Axis p_axis = Vector3::AXIS_Z); + PoolVector build_capsule_planes(float p_radius, float p_height, int p_sides, int p_lats, Vector3::Axis p_axis = Vector3::AXIS_Z); + Variant segment_intersects_segment_2d(const Vector2 &p_from_a, const Vector2 &p_to_a, const Vector2 &p_from_b, const Vector2 &p_to_b); + PoolVector get_closest_points_between_segments_2d(const Vector2 &p1, const Vector2 &q1, const Vector2 &p2, const Vector2 &q2); + PoolVector get_closest_points_between_segments(const Vector3 &p1, const Vector3 &p2, const Vector3 &q1, const Vector3 &q2); + Vector2 get_closest_point_to_segment_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b); + Vector3 get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b); + Vector2 get_closest_point_to_segment_uncapped_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b); + Vector3 get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b); + Variant ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2); + Variant segment_intersects_triangle(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2); + bool point_is_inside_triangle(const Vector2 &s, const Vector2 &a, const Vector2 &b, const Vector2 &c) const; + + PoolVector segment_intersects_sphere(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_sphere_pos, real_t p_sphere_radius); + PoolVector segment_intersects_cylinder(const Vector3 &p_from, const Vector3 &p_to, float p_height, float p_radius); + PoolVector segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Vector &p_planes); + real_t segment_intersects_circle(const Vector2 &p_from, const Vector2 &p_to, const Vector2 &p_circle_pos, real_t p_circle_radius); + int get_uv84_normal_bit(const Vector3 &p_vector); + + Vector triangulate_polygon(const Vector &p_polygon); + + Dictionary make_atlas(const Vector &p_rects); _Geometry(); }; - - - class _File : public Reference { - GDCLASS(_File,Reference); + GDCLASS(_File, Reference); FileAccess *f; bool eswap; -protected: +protected: static void _bind_methods(); -public: - enum ModeFlags { +public: + enum ModeFlags { - READ=1, - WRITE=2, - READ_WRITE=3, - WRITE_READ=7, + READ = 1, + WRITE = 2, + READ_WRITE = 3, + WRITE_READ = 7, }; - Error open_encrypted(const String& p_path, int p_mode_flags,const Vector& p_key); - Error open_encrypted_pass(const String& p_path, int p_mode_flags,const String& p_pass); - + Error open_encrypted(const String &p_path, int p_mode_flags, const Vector &p_key); + Error open_encrypted_pass(const String &p_path, int p_mode_flags, const String &p_pass); - Error open(const String& p_path, int p_mode_flags); ///< open a file + Error open(const String &p_path, int p_mode_flags); ///< open a file void close(); ///< close a file bool is_open() const; ///< true when file is open void seek(int64_t p_position); ///< seek to a given position - void seek_end(int64_t p_position=0); ///< seek from the end of file + void seek_end(int64_t p_position = 0); ///< seek from the end of file int64_t get_pos() const; ///< get position in the file int64_t get_len() const; ///< get size of the file @@ -410,8 +392,8 @@ public: PoolVector get_buffer(int p_length) const; ///< get an array of bytes String get_line() const; String get_as_text() const; - String get_md5(const String& p_path) const; - String get_sha256(const String& p_path) const; + String get_md5(const String &p_path) const; + String get_sha256(const String &p_path) const; /**< use this for files WRITTEN in _big_ endian machines (ie, amiga/mac) * It's not about the current CPU type but file formats. @@ -432,38 +414,36 @@ public: void store_double(double p_dest); void store_real(real_t p_real); - void store_string(const String& p_string); - void store_line(const String& p_string); + void store_string(const String &p_string); + void store_line(const String &p_string); - virtual void store_pascal_string(const String& p_string); + virtual void store_pascal_string(const String &p_string); virtual String get_pascal_string(); - Vector get_csv_line(String delim=",") const; + Vector get_csv_line(String delim = ",") const; + void store_buffer(const PoolVector &p_buffer); ///< store an array of bytes - void store_buffer(const PoolVector& p_buffer); ///< store an array of bytes + void store_var(const Variant &p_var); - void store_var(const Variant& p_var); + bool file_exists(const String &p_name) const; ///< return true if a file exists - bool file_exists(const String& p_name) const; ///< return true if a file exists - - uint64_t get_modified_time(const String& p_file) const; + uint64_t get_modified_time(const String &p_file) const; _File(); virtual ~_File(); - }; class _Directory : public Reference { - GDCLASS(_Directory,Reference); + GDCLASS(_Directory, Reference); DirAccess *d; -protected: +protected: static void _bind_methods(); -public: - Error open(const String& p_path); +public: + Error open(const String &p_path); Error list_dir_begin(bool p_skip_internal = false, bool p_skip_hidden = false); ///< This starts dir listing String get_next(); @@ -486,11 +466,10 @@ public: int get_space_left(); - Error copy(String p_from,String p_to); + Error copy(String p_from, String p_to); Error rename(String p_from, String p_to); Error remove(String p_name); - _Directory(); virtual ~_Directory(); @@ -501,41 +480,37 @@ private: class _Marshalls : public Reference { - GDCLASS(_Marshalls,Reference); + GDCLASS(_Marshalls, Reference); - static _Marshalls* singleton; + static _Marshalls *singleton; protected: - static void _bind_methods(); - public: + static _Marshalls *get_singleton(); - static _Marshalls* get_singleton(); - - String variant_to_base64(const Variant& p_var); - Variant base64_to_variant(const String& p_str); + String variant_to_base64(const Variant &p_var); + Variant base64_to_variant(const String &p_str); - String raw_to_base64(const PoolVector& p_arr); - PoolVector base64_to_raw(const String& p_str); + String raw_to_base64(const PoolVector &p_arr); + PoolVector base64_to_raw(const String &p_str); - String utf8_to_base64(const String& p_str); - String base64_to_utf8(const String& p_str); + String utf8_to_base64(const String &p_str); + String base64_to_utf8(const String &p_str); _Marshalls() { singleton = this; } ~_Marshalls() { singleton = NULL; } }; - class _Mutex : public Reference { - GDCLASS(_Mutex,Reference); + GDCLASS(_Mutex, Reference); Mutex *mutex; static void _bind_methods(); -public: +public: void lock(); Error try_lock(); void unlock(); @@ -546,12 +521,12 @@ public: class _Semaphore : public Reference { - GDCLASS(_Semaphore,Reference); + GDCLASS(_Semaphore, Reference); Semaphore *semaphore; static void _bind_methods(); -public: +public: Error wait(); Error post(); @@ -561,10 +536,9 @@ public: class _Thread : public Reference { - GDCLASS(_Thread,Reference); + GDCLASS(_Thread, Reference); protected: - Variant ret; Variant userdata; volatile bool active; @@ -573,8 +547,8 @@ protected: Thread *thread; static void _bind_methods(); static void _start_func(void *ud); -public: +public: enum Priority { PRIORITY_LOW, @@ -582,7 +556,7 @@ public: PRIORITY_HIGH }; - Error start(Object *p_instance,const StringName& p_method,const Variant& p_userdata=Variant(),int p_priority=PRIORITY_NORMAL); + Error start(Object *p_instance, const StringName &p_method, const Variant &p_userdata = Variant(), int p_priority = PRIORITY_NORMAL); String get_id() const; bool is_active() const; Variant wait_to_finish(); @@ -593,35 +567,34 @@ public: class _ClassDB : public Object { - GDCLASS(_ClassDB,Object) + GDCLASS(_ClassDB, Object) protected: static void _bind_methods(); -public: +public: PoolStringArray get_class_list() const; - PoolStringArray get_inheriters_from_class( const StringName& p_class) const; - StringName get_parent_class(const StringName& p_class) const; + PoolStringArray get_inheriters_from_class(const StringName &p_class) const; + StringName get_parent_class(const StringName &p_class) const; bool class_exists(const StringName &p_class) const; - bool is_parent_class(const StringName &p_class,const StringName& p_inherits) const; + bool is_parent_class(const StringName &p_class, const StringName &p_inherits) const; bool can_instance(const StringName &p_class) const; Variant instance(const StringName &p_class) const; - bool has_signal(StringName p_class,StringName p_signal) const; - Dictionary get_signal(StringName p_class,StringName p_signal) const; - Array get_signal_list(StringName p_class,bool p_no_inheritance=false) const; + bool has_signal(StringName p_class, StringName p_signal) const; + Dictionary get_signal(StringName p_class, StringName p_signal) const; + Array get_signal_list(StringName p_class, bool p_no_inheritance = false) const; - Array get_property_list(StringName p_class, bool p_no_inheritance=false) const; + Array get_property_list(StringName p_class, bool p_no_inheritance = false) const; - bool has_method(StringName p_class,StringName p_method,bool p_no_inheritance=false) const; + bool has_method(StringName p_class, StringName p_method, bool p_no_inheritance = false) const; + Array get_method_list(StringName p_class, bool p_no_inheritance = false) const; - Array get_method_list(StringName p_class,bool p_no_inheritance=false) const; - - PoolStringArray get_integer_constant_list(const StringName& p_class, bool p_no_inheritance=false) const; - bool has_integer_constant(const StringName& p_class, const StringName &p_name) const; - int get_integer_constant(const StringName& p_class, const StringName &p_name) const; - StringName get_category(const StringName& p_node) const; + PoolStringArray get_integer_constant_list(const StringName &p_class, bool p_no_inheritance = false) const; + bool has_integer_constant(const StringName &p_class, const StringName &p_name) const; + int get_integer_constant(const StringName &p_class, const StringName &p_name) const; + StringName get_category(const StringName &p_node) const; bool is_class_enabled(StringName p_class) const; @@ -629,18 +602,15 @@ public: ~_ClassDB(); }; - -class _Engine : public Object { - GDCLASS(_Engine,Object); +class _Engine : public Object { + GDCLASS(_Engine, Object); protected: - static void _bind_methods(); static _Engine *singleton; public: - - static _Engine* get_singleton() { return singleton; } + static _Engine *get_singleton() { return singleton; } void set_iterations_per_second(int p_ips); int get_iterations_per_second() const; @@ -649,7 +619,7 @@ public: float get_frames_per_second() const; - int get_frames_drawn(); + int get_frames_drawn(); void set_time_scale(float p_scale); float get_time_scale(); @@ -663,5 +633,4 @@ public: _Engine(); }; - #endif // CORE_BIND_H -- cgit v1.2.3