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

Bring that Whole New World to the Old Continent too

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

215
core/os/os.cpp
View File

@@ -27,23 +27,24 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "os.h"
#include "os/file_access.h"
#include <stdarg.h>
#include "dir_access.h"
#include "globals.h"
#include "input.h"
#include "os/file_access.h"
#include <stdarg.h>
// For get_engine_version, could be removed if it's moved to a new Engine singleton
#include "version.h"
OS* OS::singleton=NULL;
OS *OS::singleton = NULL;
OS* OS::get_singleton() {
OS *OS::get_singleton() {
return singleton;
}
uint32_t OS::get_ticks_msec() const
{ return get_ticks_usec()/1000; }
uint32_t OS::get_ticks_msec() const {
return get_ticks_usec() / 1000;
}
uint64_t OS::get_splash_tick_msec() const {
return _msec_splash;
@@ -55,28 +56,26 @@ uint64_t OS::get_unix_time() const {
uint64_t OS::get_system_time_secs() const {
return 0;
}
void OS::debug_break() {
void OS::debug_break(){
// something
};
void OS::print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type) {
void OS::print_error(const char* p_function,const char* p_file,int p_line,const char *p_code,const char*p_rationale,ErrorType p_type) {
const char* err_type;
switch(p_type) {
case ERR_ERROR: err_type="**ERROR**"; break;
case ERR_WARNING: err_type="**WARNING**"; break;
case ERR_SCRIPT: err_type="**SCRIPT ERROR**"; break;
const char *err_type;
switch (p_type) {
case ERR_ERROR: err_type = "**ERROR**"; break;
case ERR_WARNING: err_type = "**WARNING**"; break;
case ERR_SCRIPT: err_type = "**SCRIPT ERROR**"; break;
}
if (p_rationale && *p_rationale)
print("%s: %s\n ",err_type,p_rationale);
print("%s: At: %s:%i:%s() - %s\n",err_type,p_file,p_line,p_function,p_code);
print("%s: %s\n ", err_type, p_rationale);
print("%s: At: %s:%i:%s() - %s\n", err_type, p_file, p_line, p_function, p_code);
}
void OS::print(const char* p_format, ...) {
void OS::print(const char *p_format, ...) {
va_list argp;
va_start(argp, p_format);
@@ -86,7 +85,7 @@ void OS::print(const char* p_format, ...) {
va_end(argp);
};
void OS::printerr(const char* p_format, ...) {
void OS::printerr(const char *p_format, ...) {
va_list argp;
va_start(argp, p_format);
@@ -96,10 +95,9 @@ void OS::printerr(const char* p_format, ...) {
va_end(argp);
};
void OS::set_iterations_per_second(int p_ips) {
ips=p_ips;
ips = p_ips;
}
int OS::get_iterations_per_second() const {
@@ -107,7 +105,7 @@ int OS::get_iterations_per_second() const {
}
void OS::set_target_fps(int p_fps) {
_target_fps=p_fps>0? p_fps : 0;
_target_fps = p_fps > 0 ? p_fps : 0;
}
float OS::get_target_fps() const {
@@ -115,7 +113,7 @@ float OS::get_target_fps() const {
}
void OS::set_keep_screen_on(bool p_enabled) {
_keep_screen_on=p_enabled;
_keep_screen_on = p_enabled;
}
bool OS::is_keep_screen_on() const {
@@ -124,7 +122,7 @@ bool OS::is_keep_screen_on() const {
void OS::set_low_processor_usage_mode(bool p_enabled) {
low_processor_usage_mode=p_enabled;
low_processor_usage_mode = p_enabled;
}
bool OS::is_in_low_processor_usage_mode() const {
@@ -132,9 +130,9 @@ bool OS::is_in_low_processor_usage_mode() const {
return low_processor_usage_mode;
}
void OS::set_clipboard(const String& p_text) {
void OS::set_clipboard(const String &p_text) {
_local_clipboard=p_text;
_local_clipboard = p_text;
}
String OS::get_clipboard() const {
@@ -161,35 +159,35 @@ bool OS::is_stdout_verbose() const {
return _verbose_stdout;
}
void OS::set_last_error(const char* p_error) {
void OS::set_last_error(const char *p_error) {
GLOBAL_LOCK_FUNCTION
if (p_error==NULL)
p_error="Unknown Error";
if (p_error == NULL)
p_error = "Unknown Error";
if (last_error)
memfree(last_error);
last_error=NULL;
int len =0;
while(p_error[len++]);
last_error=(char*)memalloc(len);
for(int i=0;i<len;i++)
last_error[i]=p_error[i];
last_error = NULL;
int len = 0;
while (p_error[len++])
;
last_error = (char *)memalloc(len);
for (int i = 0; i < len; i++)
last_error[i] = p_error[i];
}
const char *OS::get_last_error() const {
GLOBAL_LOCK_FUNCTION
return last_error?last_error:"";
return last_error ? last_error : "";
}
void OS::dump_memory_to_file(const char* p_file) {
void OS::dump_memory_to_file(const char *p_file) {
Memory::dump_static_mem_to_file(p_file);
}
static FileAccess *_OSPRF=NULL;
static FileAccess *_OSPRF = NULL;
static void _OS_printres(Object *p_obj) {
@@ -197,12 +195,11 @@ static void _OS_printres(Object *p_obj) {
if (!res)
return;
String str = itos(res->get_instance_ID())+String(res->get_type())+":"+String(res->get_name())+" - "+res->get_path();
String str = itos(res->get_instance_ID()) + String(res->get_type()) + ":" + String(res->get_name()) + " - " + res->get_path();
if (_OSPRF)
_OSPRF->store_line(str);
else
print_line(str);
}
bool OS::has_virtual_keyboard() const {
@@ -210,59 +207,55 @@ bool OS::has_virtual_keyboard() const {
return false;
}
void OS::show_virtual_keyboard(const String& p_existing_text,const Rect2& p_screen_rect) {
void OS::show_virtual_keyboard(const String &p_existing_text, const Rect2 &p_screen_rect) {
}
void OS::hide_virtual_keyboard(){
void OS::hide_virtual_keyboard() {
}
void OS::print_all_resources(String p_to_file) {
ERR_FAIL_COND(p_to_file!="" && _OSPRF);
if (p_to_file!="") {
ERR_FAIL_COND(p_to_file != "" && _OSPRF);
if (p_to_file != "") {
Error err;
_OSPRF=FileAccess::open(p_to_file,FileAccess::WRITE,&err);
if (err!=OK) {
_OSPRF=NULL;
ERR_FAIL_COND(err!=OK);
_OSPRF = FileAccess::open(p_to_file, FileAccess::WRITE, &err);
if (err != OK) {
_OSPRF = NULL;
ERR_FAIL_COND(err != OK);
}
}
ObjectDB::debug_objects(_OS_printres);
if (p_to_file!="") {
if (p_to_file != "") {
if (_OSPRF)
memdelete(_OSPRF);
_OSPRF=NULL;
_OSPRF = NULL;
}
}
void OS::print_resources_in_use(bool p_short) {
ResourceCache::dump(NULL,p_short);
ResourceCache::dump(NULL, p_short);
}
void OS::dump_resources_to_file(const char* p_file) {
void OS::dump_resources_to_file(const char *p_file) {
ResourceCache::dump(p_file);
}
void OS::clear_last_error() {
GLOBAL_LOCK_FUNCTION
if (last_error)
memfree(last_error);
last_error=NULL;
last_error = NULL;
}
void OS::set_frame_delay(uint32_t p_msec) {
_frame_delay=p_msec;
_frame_delay = p_msec;
}
uint32_t OS::get_frame_delay() const {
@@ -272,7 +265,7 @@ uint32_t OS::get_frame_delay() const {
void OS::set_no_window_mode(bool p_enable) {
_no_window=p_enable;
_no_window = p_enable;
}
bool OS::is_no_window_mode_enabled() const {
@@ -286,7 +279,7 @@ int OS::get_exit_code() const {
}
void OS::set_exit_code(int p_code) {
_exit_code=p_code;
_exit_code = p_code;
}
String OS::get_locale() const {
@@ -299,7 +292,6 @@ String OS::get_resource_dir() const {
return Globals::get_singleton()->get_resource_path();
}
String OS::get_system_dir(SystemDir p_dir) const {
return ".";
@@ -308,8 +300,8 @@ String OS::get_system_dir(SystemDir p_dir) const {
String OS::get_safe_application_name() const {
String an = Globals::get_singleton()->get("application/name");
Vector<String> invalid_char = String("\\ / : * ? \" < > |").split(" ");
for (int i=0;i<invalid_char.size();i++) {
an = an.replace(invalid_char[i],"-");
for (int i = 0; i < invalid_char.size(); i++) {
an = an.replace(invalid_char[i], "-");
}
return an;
}
@@ -324,14 +316,14 @@ Error OS::shell_open(String p_uri) {
};
// implement these with the canvas?
Error OS::dialog_show(String p_title, String p_description, Vector<String> p_buttons, Object* p_obj, String p_callback) {
Error OS::dialog_show(String p_title, String p_description, Vector<String> p_buttons, Object *p_obj, String p_callback) {
while (true) {
print("%ls\n--------\n%ls\n", p_title.c_str(), p_description.c_str());
for (int i=0; i<p_buttons.size(); i++) {
if (i>0) print(", ");
print("%i=%ls", i+1, p_buttons[i].c_str());
for (int i = 0; i < p_buttons.size(); i++) {
if (i > 0) print(", ");
print("%i=%ls", i + 1, p_buttons[i].c_str());
};
print("\n");
String res = get_stdin_string().strip_edges();
@@ -347,7 +339,7 @@ Error OS::dialog_show(String p_title, String p_description, Vector<String> p_but
return OK;
};
Error OS::dialog_input_text(String p_title, String p_description, String p_partial, Object* p_obj, String p_callback) {
Error OS::dialog_input_text(String p_title, String p_description, String p_partial, Object *p_obj, String p_callback) {
ERR_FAIL_COND_V(!p_obj, FAILED);
ERR_FAIL_COND_V(p_callback == "", FAILED);
@@ -368,7 +360,7 @@ int OS::get_static_memory_usage() const {
return Memory::get_static_mem_usage();
}
int OS::get_dynamic_memory_usage() const{
int OS::get_dynamic_memory_usage() const {
return Memory::get_dynamic_mem_usage();
}
@@ -378,7 +370,7 @@ int OS::get_static_memory_peak_usage() const {
return Memory::get_static_mem_max_usage();
}
Error OS::set_cwd(const String& p_cwd) {
Error OS::set_cwd(const String &p_cwd) {
return ERR_CANT_OPEN;
}
@@ -395,13 +387,11 @@ int OS::get_free_static_memory() const {
}
void OS::yield() {
}
void OS::set_screen_orientation(ScreenOrientation p_orientation) {
_orientation=p_orientation;
_orientation = p_orientation;
}
OS::ScreenOrientation OS::get_screen_orientation() const {
@@ -409,7 +399,6 @@ OS::ScreenOrientation OS::get_screen_orientation() const {
return (OS::ScreenOrientation)_orientation;
}
void OS::_ensure_data_dir() {
String dd = get_data_dir();
@@ -421,45 +410,35 @@ void OS::_ensure_data_dir() {
da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
Error err = da->make_dir_recursive(dd);
if (err!=OK) {
ERR_EXPLAIN("Error attempting to create data dir: "+dd);
if (err != OK) {
ERR_EXPLAIN("Error attempting to create data dir: " + dd);
}
ERR_FAIL_COND(err!=OK);
ERR_FAIL_COND(err != OK);
memdelete(da);
}
void OS::set_icon(const Image& p_icon) {
void OS::set_icon(const Image &p_icon) {
}
String OS::get_model_name() const {
return "GenericDevice";
return "GenericDevice";
}
void OS::set_cmdline(const char* p_execpath, const List<String>& p_args) {
void OS::set_cmdline(const char *p_execpath, const List<String> &p_args) {
_execpath = p_execpath;
_cmdline = p_args;
};
void OS::release_rendering_thread() {
}
void OS::make_rendering_thread() {
}
void OS::swap_buffers() {
}
String OS::get_unique_ID() const {
@@ -482,20 +461,19 @@ bool OS::native_video_is_playing() const {
return false;
};
void OS::native_video_pause() {
void OS::native_video_pause(){
};
void OS::native_video_unpause() {
void OS::native_video_unpause(){
};
void OS::native_video_stop() {
void OS::native_video_stop(){
};
void OS::set_mouse_mode(MouseMode p_mode) {
}
bool OS::can_use_threads() const {
@@ -507,14 +485,14 @@ bool OS::can_use_threads() const {
#endif
}
OS::MouseMode OS::get_mouse_mode() const{
OS::MouseMode OS::get_mouse_mode() const {
return MOUSE_MODE_VISIBLE;
}
void OS::set_time_scale(float p_scale) {
_time_scale=p_scale;
_time_scale = p_scale;
}
OS::LatinKeyboardVariant OS::get_latin_keyboard_variant() const {
@@ -536,13 +514,11 @@ String OS::get_joy_guid(int p_device) const {
}
void OS::set_context(int p_context) {
}
void OS::set_use_vsync(bool p_enable) {
}
bool OS::is_vsync_enabled() const{
bool OS::is_vsync_enabled() const {
return true;
}
@@ -570,30 +546,27 @@ Dictionary OS::get_engine_version() const {
}
OS::OS() {
last_error=NULL;
frames_drawn=0;
singleton=this;
ips=60;
_keep_screen_on=true; // set default value to true, because this had been true before godot 2.0.
low_processor_usage_mode=false;
_verbose_stdout=false;
_frame_delay=0;
_no_window=false;
_exit_code=0;
_orientation=SCREEN_LANDSCAPE;
_fps=1;
_target_fps=0;
_render_thread_mode=RENDER_THREAD_SAFE;
_time_scale=1.0;
_pixel_snap=false;
_allow_hidpi=true;
last_error = NULL;
frames_drawn = 0;
singleton = this;
ips = 60;
_keep_screen_on = true; // set default value to true, because this had been true before godot 2.0.
low_processor_usage_mode = false;
_verbose_stdout = false;
_frame_delay = 0;
_no_window = false;
_exit_code = 0;
_orientation = SCREEN_LANDSCAPE;
_fps = 1;
_target_fps = 0;
_render_thread_mode = RENDER_THREAD_SAFE;
_time_scale = 1.0;
_pixel_snap = false;
_allow_hidpi = true;
Math::seed(1234567);
}
OS::~OS() {
singleton=NULL;
singleton = NULL;
}