From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- main/main.cpp | 1114 ++++++++++++++++++++++++++------------------------------- 1 file changed, 514 insertions(+), 600 deletions(-) (limited to 'main/main.cpp') diff --git a/main/main.cpp b/main/main.cpp index 99ae7c7b5..4ccc1e98c 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -27,31 +27,30 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "main.h" -#include "os/os.h" -#include "globals.h" -#include "splash.h" #include "core/register_core_types.h" -#include "scene/register_scene_types.h" #include "drivers/register_driver_types.h" -#include "servers/register_server_types.h" -#include "modules/register_module_types.h" -#include "script_debugger_local.h" -#include "script_debugger_remote.h" -#include "message_queue.h" -#include "path_remap.h" +#include "globals.h" #include "input_map.h" #include "io/resource_loader.h" +#include "message_queue.h" +#include "modules/register_module_types.h" +#include "os/os.h" +#include "path_remap.h" #include "scene/main/scene_main_loop.h" +#include "scene/register_scene_types.h" +#include "script_debugger_local.h" +#include "script_debugger_remote.h" +#include "servers/register_server_types.h" +#include "splash.h" - -#include "script_language.h" #include "io/resource_loader.h" +#include "script_language.h" +#include "core/io/ip.h" #include "main/tests/test_main.h" #include "os/dir_access.h" -#include "core/io/ip.h" -#include "scene/resources/packed_scene.h" #include "scene/main/viewport.h" +#include "scene/resources/packed_scene.h" #ifdef TOOLS_ENABLED #include "editor/doc/doc_data.h" @@ -61,59 +60,58 @@ #include "io/file_access_network.h" -#include "servers/spatial_sound_server.h" -#include "servers/spatial_sound_2d_server.h" #include "servers/physics_2d_server.h" +#include "servers/spatial_sound_2d_server.h" +#include "servers/spatial_sound_server.h" -#include "core/io/stream_peer_tcp.h" -#include "core/os/thread.h" #include "core/io/file_access_pack.h" #include "core/io/file_access_zip.h" #include "core/io/stream_peer_ssl.h" -#include "translation.h" -#include "version.h" +#include "core/io/stream_peer_tcp.h" +#include "core/os/thread.h" #include "main/input_default.h" #include "performance.h" +#include "translation.h" +#include "version.h" -static Globals *globals=NULL; -static InputMap *input_map=NULL; -static bool _start_success=false; -static ScriptDebugger *script_debugger=NULL; +static Globals *globals = NULL; +static InputMap *input_map = NULL; +static bool _start_success = false; +static ScriptDebugger *script_debugger = NULL; -static MessageQueue *message_queue=NULL; +static MessageQueue *message_queue = NULL; static Performance *performance = NULL; static PathRemap *path_remap; -static PackedData *packed_data=NULL; +static PackedData *packed_data = NULL; #ifdef MINIZIP_ENABLED -static ZipArchive *zip_packed_data=NULL; +static ZipArchive *zip_packed_data = NULL; #endif -static FileAccessNetworkClient *file_access_network_client=NULL; +static FileAccessNetworkClient *file_access_network_client = NULL; static TranslationServer *translation_server = NULL; static OS::VideoMode video_mode; -static bool init_maximized=false; -static bool init_windowed=false; -static bool init_fullscreen=false; -static bool init_use_custom_pos=false; -static bool debug_collisions=false; -static bool debug_navigation=false; -static int frame_delay=0; +static bool init_maximized = false; +static bool init_windowed = false; +static bool init_fullscreen = false; +static bool init_use_custom_pos = false; +static bool debug_collisions = false; +static bool debug_navigation = false; +static int frame_delay = 0; static Vector2 init_custom_pos; -static int video_driver_idx=-1; -static int audio_driver_idx=-1; +static int video_driver_idx = -1; +static int audio_driver_idx = -1; static String locale; -static bool use_debug_profiler=false; -static bool force_lowdpi=false; -static int init_screen=-1; -static bool use_vsync=true; -static bool editor=false; +static bool use_debug_profiler = false; +static bool force_lowdpi = false; +static int init_screen = -1; +static bool use_vsync = true; +static bool editor = false; -static String unescape_cmdline(const String& p_str) { +static String unescape_cmdline(const String &p_str) { - return p_str.replace("%20"," "); + return p_str.replace("%20", " "); } - //#define DEBUG_INIT #ifdef DEBUG_INIT @@ -122,10 +120,10 @@ static String unescape_cmdline(const String& p_str) { #define MAIN_PRINT(m_txt) #endif -void Main::print_help(const char* p_binary) { +void Main::print_help(const char *p_binary) { - OS::get_singleton()->print(VERSION_FULL_NAME" (c) 2008-2017 Juan Linietsky, Ariel Manzur.\n"); - OS::get_singleton()->print("Usage: %s [options] [scene]\n",p_binary); + OS::get_singleton()->print(VERSION_FULL_NAME " (c) 2008-2017 Juan Linietsky, Ariel Manzur.\n"); + OS::get_singleton()->print("Usage: %s [options] [scene]\n", p_binary); OS::get_singleton()->print("Options:\n"); OS::get_singleton()->print("\t-path [dir] : Path to a game, containing engine.cfg\n"); #ifdef TOOLS_ENABLED @@ -133,9 +131,9 @@ void Main::print_help(const char* p_binary) { #endif OS::get_singleton()->print("\t-test [test] : Run a test.\n"); OS::get_singleton()->print("\t\t("); - const char **test_names=tests_get_names(); - const char* coma = ""; - while(*test_names) { + const char **test_names = tests_get_names(); + const char *coma = ""; + while (*test_names) { OS::get_singleton()->print("%s%s", coma, *test_names); test_names++; @@ -149,23 +147,23 @@ void Main::print_help(const char* p_binary) { OS::get_singleton()->print("\t-mx\t\t Request Maximized\n"); OS::get_singleton()->print("\t-w\t\t Request Windowed\n"); OS::get_singleton()->print("\t-vd DRIVER\t : Video Driver ("); - for (int i=0;iget_video_driver_count();i++) { + for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) { - if (i!=0) + if (i != 0) OS::get_singleton()->print(", "); - OS::get_singleton()->print("%s",OS::get_singleton()->get_video_driver_name(i)); + OS::get_singleton()->print("%s", OS::get_singleton()->get_video_driver_name(i)); } OS::get_singleton()->print(")\n"); OS::get_singleton()->print("\t-ldpi\t : Force low-dpi mode (OSX Only)\n"); OS::get_singleton()->print("\t-ad DRIVER\t : Audio Driver ("); - for (int i=0;iget_audio_driver_count();i++) { + for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) { - if (i!=0) + if (i != 0) OS::get_singleton()->print(", "); - OS::get_singleton()->print("%s",OS::get_singleton()->get_audio_driver_name(i)); + OS::get_singleton()->print("%s", OS::get_singleton()->get_audio_driver_name(i)); } - OS::get_singleton()->print(")\n"); + OS::get_singleton()->print(")\n"); OS::get_singleton()->print("\t-rthread \t : Render Thread Mode ('unsafe', 'safe', 'separate').\n"); OS::get_singleton()->print("\t-s,-script [script] : Run a script.\n"); OS::get_singleton()->print("\t-d,-debug : Debug (local stdout debugger).\n"); @@ -186,8 +184,7 @@ void Main::print_help(const char* p_binary) { #endif } - -Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phase) { +Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_phase) { RID_OwnerBase::init_rid(); @@ -201,17 +198,15 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas MAIN_PRINT("Main: Initialize Globals"); - Thread::_main_thread_id = Thread::get_caller_ID(); - globals = memnew( Globals ); - input_map = memnew( InputMap ); + globals = memnew(Globals); + input_map = memnew(InputMap); - - path_remap = memnew( PathRemap ); - translation_server = memnew( TranslationServer ); - performance = memnew( Performance ); - globals->add_singleton(Globals::Singleton("Performance",performance)); + path_remap = memnew(PathRemap); + translation_server = memnew(TranslationServer); + performance = memnew(Performance); + globals->add_singleton(Globals::Singleton("Performance", performance)); MAIN_PRINT("Main: Parse CMDLine"); @@ -219,34 +214,34 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas List args; List main_args; - for(int i=0;i::Element *I=args.front(); + List::Element *I = args.front(); - I=args.front(); + I = args.front(); while (I) { - I->get()=unescape_cmdline(I->get().strip_escapes()); -// print_line("CMD: "+I->get()); - I=I->next(); + I->get() = unescape_cmdline(I->get().strip_escapes()); + // print_line("CMD: "+I->get()); + I = I->next(); } - I=args.front(); + I = args.front(); video_mode = OS::get_singleton()->get_default_video_mode(); - String video_driver=""; - String audio_driver=""; - String game_path="."; + String video_driver = ""; + String audio_driver = ""; + String game_path = "."; String debug_mode; String debug_host; String main_pack; - bool quiet_stdout=false; - int rtm=-1; + bool quiet_stdout = false; + int rtm = -1; String remotefs; String remotefs_pass; @@ -255,10 +250,10 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas List pack_list; Vector breakpoints; - bool use_custom_res=true; - bool force_res=false; + bool use_custom_res = true; + bool force_res = false; - I=args.front(); + I = args.front(); packed_data = PackedData::get_singleton(); if (!packed_data) @@ -276,233 +271,207 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas packed_data->add_pack_source(zip_packed_data); #endif + while (I) { - - while(I) { - - List::Element *N=I->next(); + List::Element *N = I->next(); if (I->get() == "-noop") { // no op - } else if (I->get()=="-h" || I->get()=="--help" || I->get()=="/?") { // resolution + } else if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // resolution goto error; - - } else if (I->get()=="-r") { // resolution + } else if (I->get() == "-r") { // resolution if (I->next()) { - String vm=I->next()->get(); + String vm = I->next()->get(); - if (vm.find("x")==-1) { // invalid parameter format + if (vm.find("x") == -1) { // invalid parameter format - OS::get_singleton()->print("Invalid -r argument: %s\n",vm.utf8().get_data()); + OS::get_singleton()->print("Invalid -r argument: %s\n", vm.utf8().get_data()); goto error; - - } - int w=vm.get_slice("x",0).to_int(); - int h=vm.get_slice("x",1).to_int(); + int w = vm.get_slice("x", 0).to_int(); + int h = vm.get_slice("x", 1).to_int(); - if (w==0 || h==0) { + if (w == 0 || h == 0) { OS::get_singleton()->print("Invalid -r resolution, x and y must be >0\n"); goto error; - } - video_mode.width=w; - video_mode.height=h; - force_res=true; + video_mode.width = w; + video_mode.height = h; + force_res = true; - N=I->next()->next(); + N = I->next()->next(); } else { OS::get_singleton()->print("Invalid -p argument, needs resolution\n"); goto error; - - } - } else if (I->get()=="-p") { // position + } else if (I->get() == "-p") { // position if (I->next()) { - String vm=I->next()->get(); + String vm = I->next()->get(); - if (vm.find("x")==-1) { // invalid parameter format + if (vm.find("x") == -1) { // invalid parameter format - OS::get_singleton()->print("Invalid -p argument: %s\n",vm.utf8().get_data()); + OS::get_singleton()->print("Invalid -p argument: %s\n", vm.utf8().get_data()); goto error; - - } - int x=vm.get_slice("x",0).to_int(); - int y=vm.get_slice("x",1).to_int(); + int x = vm.get_slice("x", 0).to_int(); + int y = vm.get_slice("x", 1).to_int(); - init_custom_pos=Point2(x,y); - init_use_custom_pos=true; + init_custom_pos = Point2(x, y); + init_use_custom_pos = true; - N=I->next()->next(); + N = I->next()->next(); } else { OS::get_singleton()->print("Invalid -r argument, needs position\n"); goto error; - - } + } else if (I->get() == "-mx") { // video driver - } else if (I->get()=="-mx") { // video driver + init_maximized = true; + } else if (I->get() == "-w") { // video driver - init_maximized=true; - } else if (I->get()=="-w") { // video driver + init_windowed = true; + } else if (I->get() == "-profile") { // video driver - init_windowed=true; - } else if (I->get()=="-profile") { // video driver - - use_debug_profiler=true; - } else if (I->get()=="-vd") { // video driver + use_debug_profiler = true; + } else if (I->get() == "-vd") { // video driver if (I->next()) { - video_driver=I->next()->get(); - N=I->next()->next(); + video_driver = I->next()->get(); + N = I->next()->next(); } else { OS::get_singleton()->print("Invalid -cd argument, needs driver name\n"); goto error; - } - } else if (I->get()=="-lang") { // language + } else if (I->get() == "-lang") { // language if (I->next()) { - locale=I->next()->get(); - N=I->next()->next(); + locale = I->next()->get(); + N = I->next()->next(); } else { OS::get_singleton()->print("Invalid -lang argument, needs language code\n"); goto error; - } - } else if (I->get()=="-ldpi") { // language + } else if (I->get() == "-ldpi") { // language - force_lowdpi=true; - } else if (I->get()=="-rfs") { // language + force_lowdpi = true; + } else if (I->get() == "-rfs") { // language if (I->next()) { - remotefs=I->next()->get(); - N=I->next()->next(); + remotefs = I->next()->get(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-rfs_pass") { // language + } else if (I->get() == "-rfs_pass") { // language if (I->next()) { - remotefs_pass=I->next()->get(); - N=I->next()->next(); + remotefs_pass = I->next()->get(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-rthread") { // language + } else if (I->get() == "-rthread") { // language if (I->next()) { - if (I->next()->get()=="safe") - rtm=OS::RENDER_THREAD_SAFE; - else if (I->next()->get()=="unsafe") - rtm=OS::RENDER_THREAD_UNSAFE; - else if (I->next()->get()=="separate") - rtm=OS::RENDER_SEPARATE_THREAD; - + if (I->next()->get() == "safe") + rtm = OS::RENDER_THREAD_SAFE; + else if (I->next()->get() == "unsafe") + rtm = OS::RENDER_THREAD_UNSAFE; + else if (I->next()->get() == "separate") + rtm = OS::RENDER_SEPARATE_THREAD; - N=I->next()->next(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-ad") { // video driver + } else if (I->get() == "-ad") { // video driver if (I->next()) { - audio_driver=I->next()->get(); - N=I->next()->next(); + audio_driver = I->next()->get(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-f") { // fullscreen + } else if (I->get() == "-f") { // fullscreen //video_mode.fullscreen=false; - init_fullscreen=true; - } else if (I->get()=="-e" || I->get()=="-editor") { // fonud editor + init_fullscreen = true; + } else if (I->get() == "-e" || I->get() == "-editor") { // fonud editor - editor=true; - } else if (I->get()=="-nowindow") { // fullscreen + editor = true; + } else if (I->get() == "-nowindow") { // fullscreen OS::get_singleton()->set_no_window_mode(true); - } else if (I->get()=="-quiet") { // fullscreen + } else if (I->get() == "-quiet") { // fullscreen - quiet_stdout=true; - } else if (I->get()=="-v") { // fullscreen - OS::get_singleton()->_verbose_stdout=true; - } else if (I->get()=="-path") { // resolution + quiet_stdout = true; + } else if (I->get() == "-v") { // fullscreen + OS::get_singleton()->_verbose_stdout = true; + } else if (I->get() == "-path") { // resolution if (I->next()) { String p = I->next()->get(); - if (OS::get_singleton()->set_cwd(p)==OK) { + if (OS::get_singleton()->set_cwd(p) == OK) { //nothing } else { - game_path=I->next()->get(); //use game_path instead + game_path = I->next()->get(); //use game_path instead } - N=I->next()->next(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-bp") { // /breakpoints + } else if (I->get() == "-bp") { // /breakpoints if (I->next()) { String bplist = I->next()->get(); - breakpoints= bplist.split(","); - N=I->next()->next(); + breakpoints = bplist.split(","); + N = I->next()->next(); } else { goto error; - } - - } else if (I->get()=="-fdelay") { // resolution + } else if (I->get() == "-fdelay") { // resolution if (I->next()) { - frame_delay=I->next()->get().to_int(); - N=I->next()->next(); + frame_delay = I->next()->get().to_int(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-timescale") { // resolution + } else if (I->get() == "-timescale") { // resolution if (I->next()) { OS::get_singleton()->set_time_scale(I->next()->get().to_double()); - N=I->next()->next(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get() == "-pack") { if (I->next()) { @@ -518,66 +487,62 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (I->next()) { - main_pack=I->next()->get(); + main_pack = I->next()->get(); N = I->next()->next(); } else { goto error; }; - } else if (I->get()=="-debug" || I->get()=="-d") { - debug_mode="local"; - } else if (I->get()=="-debugcol" || I->get()=="-dc") { - debug_collisions=true; - } else if (I->get()=="-debugnav" || I->get()=="-dn") { - debug_navigation=true; - } else if (I->get()=="-editor_scene") { + } else if (I->get() == "-debug" || I->get() == "-d") { + debug_mode = "local"; + } else if (I->get() == "-debugcol" || I->get() == "-dc") { + debug_collisions = true; + } else if (I->get() == "-debugnav" || I->get() == "-dn") { + debug_navigation = true; + } else if (I->get() == "-editor_scene") { if (I->next()) { - Globals::get_singleton()->set("editor_scene",game_path=I->next()->get()); + Globals::get_singleton()->set("editor_scene", game_path = I->next()->get()); } else { goto error; - } - } else if (I->get()=="-rdebug") { + } else if (I->get() == "-rdebug") { if (I->next()) { - debug_mode="remote"; - debug_host=I->next()->get(); - if (debug_host.find(":")==-1) { //wrong host + debug_mode = "remote"; + debug_host = I->next()->get(); + if (debug_host.find(":") == -1) { //wrong host OS::get_singleton()->print("Invalid debug host string\n"); goto error; } - N=I->next()->next(); + N = I->next()->next(); } else { goto error; - } - } else if (I->get()=="-epid") { + } else if (I->get() == "-epid") { if (I->next()) { - int editor_pid=I->next()->get().to_int(); - Globals::get_singleton()->set("editor_pid",editor_pid); - N=I->next()->next(); + int editor_pid = I->next()->get().to_int(); + Globals::get_singleton()->set("editor_pid", editor_pid); + N = I->next()->next(); } else { goto error; - } } else { //test for game path - bool gpfound=false; + bool gpfound = false; - if (!I->get().begins_with("-") && game_path=="") { - DirAccess* da = DirAccess::open(I->get()); - if (da!=NULL) { - game_path=I->get(); - gpfound=true; + if (!I->get().begins_with("-") && game_path == "") { + DirAccess *da = DirAccess::open(I->get()); + if (da != NULL) { + game_path = I->get(); + gpfound = true; memdelete(da); } - } if (!gpfound) { @@ -585,47 +550,44 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas } } - I=N; + I = N; } - - GLOBAL_DEF("debug/max_remote_stdout_chars_per_second",2048); + GLOBAL_DEF("debug/max_remote_stdout_chars_per_second", 2048); if (debug_mode == "remote") { - ScriptDebuggerRemote *sdr = memnew( ScriptDebuggerRemote ); - uint16_t debug_port = GLOBAL_DEF("debug/remote_port",6007); - if (debug_host.find(":")!=-1) { - debug_port=debug_host.get_slicec(':',1).to_int(); - debug_host=debug_host.get_slicec(':',0); + ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote); + uint16_t debug_port = GLOBAL_DEF("debug/remote_port", 6007); + if (debug_host.find(":") != -1) { + debug_port = debug_host.get_slicec(':', 1).to_int(); + debug_host = debug_host.get_slicec(':', 0); } - Error derr = sdr->connect_to_host(debug_host,debug_port); + Error derr = sdr->connect_to_host(debug_host, debug_port); - if (derr!=OK) { + if (derr != OK) { memdelete(sdr); } else { - script_debugger=sdr; + script_debugger = sdr; } - } else if (debug_mode=="local") { - - script_debugger = memnew( ScriptDebuggerLocal ); + } else if (debug_mode == "local") { + script_debugger = memnew(ScriptDebuggerLocal); } + if (remotefs != "") { - if (remotefs!="") { - - file_access_network_client=memnew(FileAccessNetworkClient); + file_access_network_client = memnew(FileAccessNetworkClient); int port; - if (remotefs.find(":")!=-1) { - port=remotefs.get_slicec(':',1).to_int(); - remotefs=remotefs.get_slicec(':',0); + if (remotefs.find(":") != -1) { + port = remotefs.get_slicec(':', 1).to_int(); + remotefs = remotefs.get_slicec(':', 0); } else { - port=6010; + port = 6010; } - Error err = file_access_network_client->connect(remotefs,port,remotefs_pass); + Error err = file_access_network_client->connect(remotefs, port, remotefs_pass); if (err) { - OS::get_singleton()->printerr("Could not connect to remotefs: %s:%i\n",remotefs.utf8().get_data(),port); + OS::get_singleton()->printerr("Could not connect to remotefs: %s:%i\n", remotefs.utf8().get_data(), port); goto error; } @@ -634,36 +596,34 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (script_debugger) { //there is a debugger, parse breakpoints - for(int i=0;iinsert_breakpoint(bp.substr(sp+1,bp.length()).to_int(),bp.substr(0,sp)); + script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp)); } } - #ifdef TOOLS_ENABLED if (editor) { packed_data->set_disabled(true); globals->set_disable_platform_override(true); - StreamPeerSSL::initialize_certs=false; //will be initialized by editor + StreamPeerSSL::initialize_certs = false; //will be initialized by editor } #endif - - if (globals->setup(game_path,main_pack)!=OK) { + if (globals->setup(game_path, main_pack) != OK) { #ifdef TOOLS_ENABLED - editor=false; + editor = false; #else - OS::get_singleton()->print("error: Couldn't load game path '%s'\n",game_path.ascii().get_data()); + OS::get_singleton()->print("error: Couldn't load game path '%s'\n", game_path.ascii().get_data()); goto error; #endif @@ -671,26 +631,26 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (editor) { main_args.push_back("-editor"); - init_maximized=true; - use_custom_res=false; + init_maximized = true; + use_custom_res = false; } if (bool(Globals::get_singleton()->get("application/disable_stdout"))) { - quiet_stdout=true; + quiet_stdout = true; } if (bool(Globals::get_singleton()->get("application/disable_stderr"))) { _print_error_enabled = false; }; if (quiet_stdout) - _print_line_enabled=false; + _print_line_enabled = false; OS::get_singleton()->set_cmdline(execpath, main_args); #ifdef TOOLS_ENABLED - if (main_args.size()==0 && (!Globals::get_singleton()->has("application/main_loop_type")) && (!Globals::get_singleton()->has("application/main_scene") || String(Globals::get_singleton()->get("application/main_scene"))=="")) - use_custom_res=false; //project manager (run without arguments) + if (main_args.size() == 0 && (!Globals::get_singleton()->has("application/main_loop_type")) && (!Globals::get_singleton()->has("application/main_scene") || String(Globals::get_singleton()->get("application/main_scene")) == "")) + use_custom_res = false; //project manager (run without arguments) #endif @@ -699,146 +659,139 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas else input_map->load_from_globals(); //keys for game - if (video_driver=="") // specified in engine.cfg - video_driver=_GLOBAL_DEF("display/driver",Variant((const char*)OS::get_singleton()->get_video_driver_name(0))); + if (video_driver == "") // specified in engine.cfg + video_driver = _GLOBAL_DEF("display/driver", Variant((const char *)OS::get_singleton()->get_video_driver_name(0))); if (!force_res && use_custom_res && globals->has("display/width")) - video_mode.width=globals->get("display/width"); - if (!force_res &&use_custom_res && globals->has("display/height")) - video_mode.height=globals->get("display/height"); + video_mode.width = globals->get("display/width"); + if (!force_res && use_custom_res && globals->has("display/height")) + video_mode.height = globals->get("display/height"); if (!editor && (!bool(globals->get("display/allow_hidpi")) || force_lowdpi)) { - OS::get_singleton()->_allow_hidpi=false; + OS::get_singleton()->_allow_hidpi = false; } if (use_custom_res && globals->has("display/fullscreen")) - video_mode.fullscreen=globals->get("display/fullscreen"); + video_mode.fullscreen = globals->get("display/fullscreen"); if (use_custom_res && globals->has("display/resizable")) - video_mode.resizable=globals->get("display/resizable"); + video_mode.resizable = globals->get("display/resizable"); if (use_custom_res && globals->has("display/borderless_window")) video_mode.borderless_window = globals->get("display/borderless_window"); if (!force_res && use_custom_res && globals->has("display/test_width") && globals->has("display/test_height")) { int tw = globals->get("display/test_width"); int th = globals->get("display/test_height"); - if (tw>0 && th>0) { - video_mode.width=tw; - video_mode.height=th; + if (tw > 0 && th > 0) { + video_mode.width = tw; + video_mode.height = th; } } - - GLOBAL_DEF("display/width",video_mode.width); - GLOBAL_DEF("display/height",video_mode.height); - GLOBAL_DEF("display/allow_hidpi",false); - GLOBAL_DEF("display/fullscreen",video_mode.fullscreen); - GLOBAL_DEF("display/resizable",video_mode.resizable); + GLOBAL_DEF("display/width", video_mode.width); + GLOBAL_DEF("display/height", video_mode.height); + GLOBAL_DEF("display/allow_hidpi", false); + GLOBAL_DEF("display/fullscreen", video_mode.fullscreen); + GLOBAL_DEF("display/resizable", video_mode.resizable); GLOBAL_DEF("display/borderless_window", video_mode.borderless_window); use_vsync = GLOBAL_DEF("display/use_vsync", use_vsync); - GLOBAL_DEF("display/test_width",0); - GLOBAL_DEF("display/test_height",0); - OS::get_singleton()->_pixel_snap=GLOBAL_DEF("display/use_2d_pixel_snap",false); - OS::get_singleton()->_keep_screen_on=GLOBAL_DEF("display/keep_screen_on",true); - if (rtm==-1) { - rtm=GLOBAL_DEF("render/thread_model",OS::RENDER_THREAD_SAFE); - if (rtm>=1) //hack for now - rtm=1; - + GLOBAL_DEF("display/test_width", 0); + GLOBAL_DEF("display/test_height", 0); + OS::get_singleton()->_pixel_snap = GLOBAL_DEF("display/use_2d_pixel_snap", false); + OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/keep_screen_on", true); + if (rtm == -1) { + rtm = GLOBAL_DEF("render/thread_model", OS::RENDER_THREAD_SAFE); + if (rtm >= 1) //hack for now + rtm = 1; } - if (rtm>=0 && rtm<3) { + if (rtm >= 0 && rtm < 3) { if (editor) { - rtm=OS::RENDER_THREAD_SAFE; + rtm = OS::RENDER_THREAD_SAFE; } - OS::get_singleton()->_render_thread_mode=OS::RenderThreadMode(rtm); + OS::get_singleton()->_render_thread_mode = OS::RenderThreadMode(rtm); } - - /* Determine Video Driver */ - if (audio_driver=="") { // specified in engine.cfg - audio_driver=GLOBAL_DEF("audio/driver",OS::get_singleton()->get_audio_driver_name(0)); + if (audio_driver == "") { // specified in engine.cfg + audio_driver = GLOBAL_DEF("audio/driver", OS::get_singleton()->get_audio_driver_name(0)); } + for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) { - for (int i=0;iget_video_driver_count();i++) { + if (video_driver == OS::get_singleton()->get_video_driver_name(i)) { - if (video_driver==OS::get_singleton()->get_video_driver_name(i)) { - - video_driver_idx=i; + video_driver_idx = i; break; } } - if (video_driver_idx<0) { + if (video_driver_idx < 0) { - OS::get_singleton()->alert( "Invalid Video Driver: "+video_driver ); + OS::get_singleton()->alert("Invalid Video Driver: " + video_driver); video_driver_idx = 0; //goto error; } - for (int i=0;iget_audio_driver_count();i++) { + for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) { - if (audio_driver==OS::get_singleton()->get_audio_driver_name(i)) { + if (audio_driver == OS::get_singleton()->get_audio_driver_name(i)) { - audio_driver_idx=i; + audio_driver_idx = i; break; } } - if (audio_driver_idx<0) { + if (audio_driver_idx < 0) { - OS::get_singleton()->alert( "Invalid Audio Driver: "+audio_driver ); + OS::get_singleton()->alert("Invalid Audio Driver: " + audio_driver); audio_driver_idx = 0; //goto error; } { - String orientation = GLOBAL_DEF("display/orientation","landscape"); + String orientation = GLOBAL_DEF("display/orientation", "landscape"); - if (orientation=="portrait") + if (orientation == "portrait") OS::get_singleton()->set_screen_orientation(OS::SCREEN_PORTRAIT); - else if (orientation=="reverse_landscape") + else if (orientation == "reverse_landscape") OS::get_singleton()->set_screen_orientation(OS::SCREEN_REVERSE_LANDSCAPE); - else if (orientation=="reverse_portrait") + else if (orientation == "reverse_portrait") OS::get_singleton()->set_screen_orientation(OS::SCREEN_REVERSE_PORTRAIT); - else if (orientation=="sensor_landscape") + else if (orientation == "sensor_landscape") OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR_LANDSCAPE); - else if (orientation=="sensor_portrait") + else if (orientation == "sensor_portrait") OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR_PORTRAIT); - else if (orientation=="sensor") + else if (orientation == "sensor") OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR); else OS::get_singleton()->set_screen_orientation(OS::SCREEN_LANDSCAPE); } - - OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/fixed_fps",60)); - OS::get_singleton()->set_target_fps(GLOBAL_DEF("debug/force_fps",0)); + OS::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/fixed_fps", 60)); + OS::get_singleton()->set_target_fps(GLOBAL_DEF("debug/force_fps", 0)); if (!OS::get_singleton()->_verbose_stdout) //overrided - OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/verbose_stdout",false); + OS::get_singleton()->_verbose_stdout = GLOBAL_DEF("debug/verbose_stdout", false); - if (frame_delay==0) { - frame_delay=GLOBAL_DEF("application/frame_delay_msec",0); + if (frame_delay == 0) { + frame_delay = GLOBAL_DEF("application/frame_delay_msec", 0); } OS::get_singleton()->set_frame_delay(frame_delay); - message_queue = memnew( MessageQueue ); + message_queue = memnew(MessageQueue); Globals::get_singleton()->register_global_defaults(); if (p_second_phase) return setup2(); - return OK; - error: +error: - video_driver=""; - audio_driver=""; - game_path=""; + video_driver = ""; + audio_driver = ""; + game_path = ""; args.clear(); main_args.clear(); @@ -850,7 +803,7 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (input_map) memdelete(input_map); if (translation_server) - memdelete( translation_server ); + memdelete(translation_server); if (globals) memdelete(globals); if (script_debugger) @@ -859,15 +812,15 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas memdelete(packed_data); if (file_access_network_client) memdelete(file_access_network_client); - if(path_remap) + if (path_remap) memdelete(path_remap); -// Note 1: *zip_packed_data live into *packed_data -// Note 2: PackedData::~PackedData destroy this. -//#ifdef MINIZIP_ENABLED -// if (zip_packed_data) -// memdelete( zip_packed_data ); -//#endif + // Note 1: *zip_packed_data live into *packed_data + // Note 2: PackedData::~PackedData destroy this. + //#ifdef MINIZIP_ENABLED + // if (zip_packed_data) + // memdelete( zip_packed_data ); + //#endif unregister_core_driver_types(); unregister_core_types(); @@ -875,17 +828,16 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas OS::get_singleton()->_cmdline.clear(); if (message_queue) - memdelete( message_queue); + memdelete(message_queue); OS::get_singleton()->finalize_core(); - locale=String(); + locale = String(); return ERR_INVALID_PARAMETER; } Error Main::setup2() { - - OS::get_singleton()->initialize(video_mode,video_driver_idx,audio_driver_idx); + OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx); if (init_use_custom_pos) { OS::get_singleton()->set_window_position(init_custom_pos); } @@ -896,12 +848,12 @@ Error Main::setup2() { MAIN_PRINT("Main: Setup Logo"); - bool show_logo=true; + bool show_logo = true; #ifdef JAVASCRIPT_ENABLED - show_logo=false; + show_logo = false; #endif - if (init_screen!=-1) { + if (init_screen != -1) { OS::get_singleton()->set_current_screen(init_screen); } if (init_windowed) { @@ -916,30 +868,30 @@ Error Main::setup2() { path_remap->load_remaps(); if (show_logo) { //boot logo! - String boot_logo_path=GLOBAL_DEF("application/boot_splash",String()); - bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true); - Globals::get_singleton()->set_custom_property_info("application/boot_splash",PropertyInfo(Variant::STRING,"application/boot_splash",PROPERTY_HINT_FILE,"*.png")); + String boot_logo_path = GLOBAL_DEF("application/boot_splash", String()); + bool boot_logo_scale = GLOBAL_DEF("application/boot_splash_fullsize", true); + Globals::get_singleton()->set_custom_property_info("application/boot_splash", PropertyInfo(Variant::STRING, "application/boot_splash", PROPERTY_HINT_FILE, "*.png")); Image boot_logo; boot_logo_path = boot_logo_path.strip_edges(); - if (boot_logo_path!=String() /*&& FileAccess::exists(boot_logo_path)*/) { - print_line("Boot splash path: "+boot_logo_path); + if (boot_logo_path != String() /*&& FileAccess::exists(boot_logo_path)*/) { + print_line("Boot splash path: " + boot_logo_path); Error err = boot_logo.load(boot_logo_path); if (err) ERR_PRINTS("Non-existing or invalid boot splash at: " + boot_logo_path + ". Loading default splash."); } if (!boot_logo.empty()) { - OS::get_singleton()->_msec_splash=OS::get_singleton()->get_ticks_msec(); - Color clear = GLOBAL_DEF("render/default_clear_color",Color(0.3,0.3,0.3)); + OS::get_singleton()->_msec_splash = OS::get_singleton()->get_ticks_msec(); + Color clear = GLOBAL_DEF("render/default_clear_color", Color(0.3, 0.3, 0.3)); VisualServer::get_singleton()->set_default_clear_color(clear); Color boot_bg = GLOBAL_DEF("application/boot_bg_color", clear); - VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg,boot_logo_scale); + VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg, boot_logo_scale); #ifndef TOOLS_ENABLED - //no tools, so free the boot logo (no longer needed) - // Globals::get_singleton()->set("application/boot_logo",Image()); +//no tools, so free the boot logo (no longer needed) +// Globals::get_singleton()->set("application/boot_logo",Image()); #endif } else { @@ -951,7 +903,7 @@ Error Main::setup2() { MAIN_PRINT("Main: ClearColor"); VisualServer::get_singleton()->set_default_clear_color(boot_splash_bg_color); MAIN_PRINT("Main: Image"); - VisualServer::get_singleton()->set_boot_image(splash, boot_splash_bg_color,false); + VisualServer::get_singleton()->set_boot_image(splash, boot_splash_bg_color, false); #endif } @@ -960,13 +912,13 @@ Error Main::setup2() { } MAIN_PRINT("Main: DCC"); - VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("render/default_clear_color",Color(0.3,0.3,0.3))); + VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("render/default_clear_color", Color(0.3, 0.3, 0.3))); MAIN_PRINT("Main: END"); - GLOBAL_DEF("application/icon",String()); - Globals::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp")); + GLOBAL_DEF("application/icon", String()); + Globals::get_singleton()->set_custom_property_info("application/icon", PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.png,*.webp")); - if (bool(GLOBAL_DEF("display/emulate_touchscreen",false))) { + if (bool(GLOBAL_DEF("display/emulate_touchscreen", false))) { if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton() && !editor) { //only if no touchscreen ui hint, set emulation InputDefault *id = Input::get_singleton()->cast_to(); @@ -975,8 +927,6 @@ Error Main::setup2() { } } - - MAIN_PRINT("Main: Load Remaps"); MAIN_PRINT("Main: Load Scene Types"); @@ -984,18 +934,18 @@ Error Main::setup2() { register_scene_types(); register_server_types(); - GLOBAL_DEF("display/custom_mouse_cursor",String()); - GLOBAL_DEF("display/custom_mouse_cursor_hotspot",Vector2()); - Globals::get_singleton()->set_custom_property_info("display/custom_mouse_cursor",PropertyInfo(Variant::STRING,"display/custom_mouse_cursor",PROPERTY_HINT_FILE,"*.png,*.webp")); + GLOBAL_DEF("display/custom_mouse_cursor", String()); + GLOBAL_DEF("display/custom_mouse_cursor_hotspot", Vector2()); + Globals::get_singleton()->set_custom_property_info("display/custom_mouse_cursor", PropertyInfo(Variant::STRING, "display/custom_mouse_cursor", PROPERTY_HINT_FILE, "*.png,*.webp")); - if (String(Globals::get_singleton()->get("display/custom_mouse_cursor"))!=String()) { + if (String(Globals::get_singleton()->get("display/custom_mouse_cursor")) != String()) { //print_line("use custom cursor"); - Ref cursor=ResourceLoader::load(Globals::get_singleton()->get("display/custom_mouse_cursor")); + Ref cursor = ResourceLoader::load(Globals::get_singleton()->get("display/custom_mouse_cursor")); if (cursor.is_valid()) { - // print_line("loaded ok"); + // print_line("loaded ok"); Vector2 hotspot = Globals::get_singleton()->get("display/custom_mouse_cursor_hotspot"); - Input::get_singleton()->set_custom_mouse_cursor(cursor,hotspot); + Input::get_singleton()->set_custom_mouse_cursor(cursor, hotspot); } } #ifdef TOOLS_ENABLED @@ -1012,35 +962,30 @@ Error Main::setup2() { MAIN_PRINT("Main: Load Translations"); translation_server->setup(); //register translations, load them, etc. - if (locale!="") { + if (locale != "") { translation_server->set_locale(locale); } translation_server->load_translations(); - - if (use_debug_profiler && script_debugger) { script_debugger->profiling_start(); } - _start_success=true; - locale=String(); + _start_success = true; + locale = String(); MAIN_PRINT("Main: Done"); return OK; - } - - bool Main::start() { - ERR_FAIL_COND_V(!_start_success,false); + ERR_FAIL_COND_V(!_start_success, false); - bool editor=false; + bool editor = false; String doc_tool; - bool doc_base=true; + bool doc_base = true; String game_path; String script; String test; @@ -1051,57 +996,57 @@ bool Main::start() { String _import; String _import_script; String dumpstrings; - bool noquit=false; - bool export_debug=false; + bool noquit = false; + bool export_debug = false; bool project_manager_request = false; List args = OS::get_singleton()->get_cmdline_args(); - for (int i=0;i_custom_level=args[i+1]; - } else if (args[i]=="-test") { - test=args[i+1]; - } else if (args[i]=="-optimize") { - optimize=args[i+1]; - } else if (args[i]=="-optimize_preset") { - optimize_preset=args[i+1]; - } else if (args[i]=="-export") { - editor=true; //needs editor - _export_platform=args[i+1]; - } else if (args[i]=="-export_debug") { - editor=true; //needs editor - _export_platform=args[i+1]; - export_debug=true; - } else if (args[i]=="-import") { - editor=true; //needs editor - _import=args[i+1]; - } else if (args[i]=="-import_script") { - editor=true; //needs editor - _import_script=args[i+1]; - } else if (args[i]=="-dumpstrings") { - editor=true; //needs editor - dumpstrings=args[i+1]; + else if (i < (args.size() - 1)) { + bool parsed_pair = true; + if (args[i] == "-doctool") { + doc_tool = args[i + 1]; + } else if (args[i] == "-script" || args[i] == "-s") { + script = args[i + 1]; + } else if (args[i] == "-level" || args[i] == "-l") { + OS::get_singleton()->_custom_level = args[i + 1]; + } else if (args[i] == "-test") { + test = args[i + 1]; + } else if (args[i] == "-optimize") { + optimize = args[i + 1]; + } else if (args[i] == "-optimize_preset") { + optimize_preset = args[i + 1]; + } else if (args[i] == "-export") { + editor = true; //needs editor + _export_platform = args[i + 1]; + } else if (args[i] == "-export_debug") { + editor = true; //needs editor + _export_platform = args[i + 1]; + export_debug = true; + } else if (args[i] == "-import") { + editor = true; //needs editor + _import = args[i + 1]; + } else if (args[i] == "-import_script") { + editor = true; //needs editor + _import_script = args[i + 1]; + } else if (args[i] == "-dumpstrings") { + editor = true; //needs editor + dumpstrings = args[i + 1]; } else { // The parameter does not match anything known, don't skip the next argument - parsed_pair=false; + parsed_pair = false; } if (parsed_pair) { i++; @@ -1110,23 +1055,21 @@ bool Main::start() { } if (editor) - Globals::get_singleton()->set("editor_active",true); - + Globals::get_singleton()->set("editor_active", true); String main_loop_type; #ifdef TOOLS_ENABLED - if(doc_tool!="") { + if (doc_tool != "") { DocData doc; doc.generate(doc_base); DocData docsrc; - if (docsrc.load(doc_tool)==OK) { + if (docsrc.load(doc_tool) == OK) { print_line("Doc exists. Merging.."); doc.merge_from(docsrc); } else { print_line("No Doc exists. Generating empty."); - } doc.save(doc_tool); @@ -1134,80 +1077,75 @@ bool Main::start() { return false; } - if (optimize!="") - editor=true; //need editor - - + if (optimize != "") + editor = true; //need editor #endif - if (_export_platform!="") { - if (game_path=="") { - String err="Command line param "; - err+=export_debug?"-export_debug":"-export"; - err+=" passed but no destination path given.\n"; - err+="Please specify the binary's file path to export to. Aborting export."; + if (_export_platform != "") { + if (game_path == "") { + String err = "Command line param "; + err += export_debug ? "-export_debug" : "-export"; + err += " passed but no destination path given.\n"; + err += "Please specify the binary's file path to export to. Aborting export."; ERR_PRINT(err.utf8().get_data()); return false; } } - if(script=="" && game_path=="" && String(GLOBAL_DEF("application/main_scene",""))!="") { - game_path=GLOBAL_DEF("application/main_scene",""); + if (script == "" && game_path == "" && String(GLOBAL_DEF("application/main_scene", "")) != "") { + game_path = GLOBAL_DEF("application/main_scene", ""); } - - MainLoop *main_loop=NULL; + MainLoop *main_loop = NULL; if (editor) { main_loop = memnew(SceneTree); }; - if (test!="") { + if (test != "") { #ifdef DEBUG_ENABLED - main_loop = test_main(test,args); + main_loop = test_main(test, args); if (!main_loop) return false; #endif - } else if (script!="") { + } else if (script != "") { Ref