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 --- main/input_default.cpp | 347 ++++++------ main/input_default.h | 62 +-- main/main.cpp | 1115 ++++++++++++++++++--------------------- main/main.h | 7 +- main/performance.cpp | 95 ++-- main/performance.h | 10 +- main/splash.h | 2 +- main/tests/test_containers.cpp | 16 +- main/tests/test_containers.h | 3 +- main/tests/test_gdscript.cpp | 1022 +++++++++++++++++------------------ main/tests/test_gdscript.h | 3 +- main/tests/test_gui.cpp | 207 ++++---- main/tests/test_gui.h | 4 +- main/tests/test_image.cpp | 25 +- main/tests/test_image.h | 3 +- main/tests/test_io.cpp | 53 +- main/tests/test_io.h | 3 +- main/tests/test_main.cpp | 58 +- main/tests/test_main.h | 9 +- main/tests/test_math.cpp | 463 ++++++++-------- main/tests/test_math.h | 3 +- main/tests/test_physics.cpp | 377 ++++++------- main/tests/test_physics.h | 3 +- main/tests/test_physics_2d.cpp | 293 +++++----- main/tests/test_physics_2d.h | 4 +- main/tests/test_render.cpp | 134 ++--- main/tests/test_render.h | 3 +- main/tests/test_shader_lang.cpp | 228 ++++---- main/tests/test_shader_lang.h | 3 +- main/tests/test_sound.cpp | 6 +- main/tests/test_sound.h | 3 +- main/tests/test_string.cpp | 260 ++++----- main/tests/test_string.h | 8 +- 33 files changed, 2225 insertions(+), 2607 deletions(-) (limited to 'main') diff --git a/main/input_default.cpp b/main/input_default.cpp index a9f643c785..bc409960d6 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -27,48 +27,46 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "input_default.h" -#include "servers/visual_server.h" -#include "os/os.h" #include "input_map.h" +#include "os/os.h" #include "scene/resources/texture.h" +#include "servers/visual_server.h" -void InputDefault::SpeedTrack::update(const Vector2& p_delta_p) { +void InputDefault::SpeedTrack::update(const Vector2 &p_delta_p) { uint64_t tick = OS::get_singleton()->get_ticks_usec(); - uint32_t tdiff = tick-last_tick; + uint32_t tdiff = tick - last_tick; float delta_t = tdiff / 1000000.0; - last_tick=tick; - + last_tick = tick; - accum+=p_delta_p; - accum_t+=delta_t; + accum += p_delta_p; + accum_t += delta_t; - if (accum_t>max_ref_frame*10) - accum_t=max_ref_frame*10; + if (accum_t > max_ref_frame * 10) + accum_t = max_ref_frame * 10; - while( accum_t>=min_ref_frame ) { + while (accum_t >= min_ref_frame) { float slice_t = min_ref_frame / accum_t; - Vector2 slice = accum*slice_t; - accum=accum-slice; - accum_t-=min_ref_frame; + Vector2 slice = accum * slice_t; + accum = accum - slice; + accum_t -= min_ref_frame; - speed=(slice/min_ref_frame).linear_interpolate(speed,min_ref_frame/max_ref_frame); + speed = (slice / min_ref_frame).linear_interpolate(speed, min_ref_frame / max_ref_frame); } - } void InputDefault::SpeedTrack::reset() { last_tick = OS::get_singleton()->get_ticks_usec(); - speed=Vector2(); - accum_t=0; + speed = Vector2(); + accum_t = 0; } InputDefault::SpeedTrack::SpeedTrack() { - min_ref_frame=0.1; - max_ref_frame=0.3; - reset(); + min_ref_frame = 0.1; + max_ref_frame = 0.3; + reset(); } bool InputDefault::is_key_pressed(int p_scancode) const { @@ -80,22 +78,21 @@ bool InputDefault::is_key_pressed(int p_scancode) const { bool InputDefault::is_mouse_button_pressed(int p_button) const { _THREAD_SAFE_METHOD_ - return (mouse_button_mask&(1<::Element *E=action_state.find(p_action); + const Map::Element *E = action_state.find(p_action); if (!E) return false; if (Engine::get_singleton()->is_in_fixed_frame()) { - return E->get().pressed && E->get().fixed_frame==Engine::get_singleton()->get_fixed_frames(); + return E->get().pressed && E->get().fixed_frame == Engine::get_singleton()->get_fixed_frames(); } else { - return E->get().pressed && E->get().idle_frame==Engine::get_singleton()->get_idle_frames(); + return E->get().pressed && E->get().idle_frame == Engine::get_singleton()->get_idle_frames(); } } -bool InputDefault::is_action_just_released(const StringName& p_action) const{ +bool InputDefault::is_action_just_released(const StringName &p_action) const { - const Map::Element *E=action_state.find(p_action); + const Map::Element *E = action_state.find(p_action); if (!E) return false; if (Engine::get_singleton()->is_in_fixed_frame()) { - return !E->get().pressed && E->get().fixed_frame==Engine::get_singleton()->get_fixed_frames(); + return !E->get().pressed && E->get().fixed_frame == Engine::get_singleton()->get_fixed_frames(); } else { - return !E->get().pressed && E->get().idle_frame==Engine::get_singleton()->get_idle_frames(); + return !E->get().pressed && E->get().idle_frame == Engine::get_singleton()->get_idle_frames(); } } - -float InputDefault::get_joy_axis(int p_device,int p_axis) const{ +float InputDefault::get_joy_axis(int p_device, int p_axis) const { _THREAD_SAFE_METHOD_ - int c = _combine_device(p_axis,p_device); + int c = _combine_device(p_axis, p_device); if (_joy_axis.has(c)) { return _joy_axis[c]; } else { @@ -222,11 +218,11 @@ float InputDefault::get_joy_vibration_duration(int p_device) { static String _hex_str(uint8_t p_byte) { - static const char* dict = "0123456789abcdef"; + static const char *dict = "0123456789abcdef"; char ret[3]; ret[2] = 0; - ret[0] = dict[p_byte>>4]; + ret[0] = dict[p_byte >> 4]; ret[1] = dict[p_byte & 0xf]; return ret; @@ -246,22 +242,21 @@ void InputDefault::joy_connection_changed(int p_idx, bool p_connected, String p_ String uidname = p_guid; if (p_guid == "") { int uidlen = MIN(p_name.length(), 16); - for (int i=0; iinput_event(ev); } } break; case InputEvent::MOUSE_MOTION: { - if (main_loop && emulate_touch && p_event.mouse_motion.button_mask&1) { + if (main_loop && emulate_touch && p_event.mouse_motion.button_mask & 1) { InputEventScreenDrag drag_event; - drag_event.index=0; - drag_event.x=p_event.mouse_motion.x; - drag_event.y=p_event.mouse_motion.y; - drag_event.relative_x=p_event.mouse_motion.relative_x; - drag_event.relative_y=p_event.mouse_motion.relative_y; - drag_event.speed_x=p_event.mouse_motion.speed_x; - drag_event.speed_y=p_event.mouse_motion.speed_y; + drag_event.index = 0; + drag_event.x = p_event.mouse_motion.x; + drag_event.y = p_event.mouse_motion.y; + drag_event.relative_x = p_event.mouse_motion.relative_x; + drag_event.relative_y = p_event.mouse_motion.relative_y; + drag_event.speed_x = p_event.mouse_motion.speed_x; + drag_event.speed_y = p_event.mouse_motion.speed_y; InputEvent ev; - ev.type=InputEvent::SCREEN_DRAG; - ev.screen_drag=drag_event; + ev.type = InputEvent::SCREEN_DRAG; + ev.screen_drag = drag_event; main_loop->input_event(ev); } @@ -364,7 +359,7 @@ void InputDefault::parse_input_event(const InputEvent& p_event) { } break; case InputEvent::JOYPAD_BUTTON: { - int c = _combine_device(p_event.joy_button.button_index,p_event.device); + int c = _combine_device(p_event.joy_button.button_index, p_event.device); if (p_event.joy_button.pressed) joy_buttons_pressed.insert(c); @@ -374,33 +369,30 @@ void InputDefault::parse_input_event(const InputEvent& p_event) { case InputEvent::JOYPAD_MOTION: { set_joy_axis(p_event.device, p_event.joy_motion.axis, p_event.joy_motion.axis_value); } break; - } - if (!p_event.is_echo()) { - for (const Map::Element *E=InputMap::get_singleton()->get_action_map().front();E;E=E->next()) { + for (const Map::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) { - if (InputMap::get_singleton()->event_is_action(p_event,E->key()) && is_action_pressed(E->key()) != p_event.is_pressed()) { + if (InputMap::get_singleton()->event_is_action(p_event, E->key()) && is_action_pressed(E->key()) != p_event.is_pressed()) { Action action; - action.fixed_frame=Engine::get_singleton()->get_fixed_frames(); - action.idle_frame=Engine::get_singleton()->get_idle_frames(); - action.pressed=p_event.is_pressed(); - action_state[E->key()]=action; + action.fixed_frame = Engine::get_singleton()->get_fixed_frames(); + action.idle_frame = Engine::get_singleton()->get_idle_frames(); + action.pressed = p_event.is_pressed(); + action_state[E->key()] = action; } } } if (main_loop) main_loop->input_event(p_event); - } -void InputDefault::set_joy_axis(int p_device,int p_axis,float p_value) { +void InputDefault::set_joy_axis(int p_device, int p_axis, float p_value) { _THREAD_SAFE_METHOD_ - int c = _combine_device(p_axis,p_device); - _joy_axis[c]=p_value; + int c = _combine_device(p_axis, p_device); + _joy_axis[c] = p_value; } void InputDefault::start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration) { @@ -426,47 +418,42 @@ void InputDefault::stop_joy_vibration(int p_device) { joy_vibration[p_device] = vibration; } -void InputDefault::set_gravity(const Vector3& p_gravity) { +void InputDefault::set_gravity(const Vector3 &p_gravity) { _THREAD_SAFE_METHOD_ - gravity=p_gravity; - + gravity = p_gravity; } -void InputDefault::set_accelerometer(const Vector3& p_accel) { +void InputDefault::set_accelerometer(const Vector3 &p_accel) { _THREAD_SAFE_METHOD_ - accelerometer=p_accel; - + accelerometer = p_accel; } -void InputDefault::set_magnetometer(const Vector3& p_magnetometer) { +void InputDefault::set_magnetometer(const Vector3 &p_magnetometer) { _THREAD_SAFE_METHOD_ - magnetometer=p_magnetometer; - + magnetometer = p_magnetometer; } -void InputDefault::set_gyroscope(const Vector3& p_gyroscope) { +void InputDefault::set_gyroscope(const Vector3 &p_gyroscope) { _THREAD_SAFE_METHOD_ - gyroscope=p_gyroscope; - + gyroscope = p_gyroscope; } void InputDefault::set_main_loop(MainLoop *p_main_loop) { - main_loop=p_main_loop; - + main_loop = p_main_loop; } -void InputDefault::set_mouse_pos(const Point2& p_posf) { +void InputDefault::set_mouse_pos(const Point2 &p_posf) { - mouse_speed_track.update(p_posf-mouse_pos); - mouse_pos=p_posf; + mouse_speed_track.update(p_posf - mouse_pos); + mouse_pos = p_posf; if (custom_cursor.is_valid()) { VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos()); } @@ -483,46 +470,42 @@ Point2 InputDefault::get_last_mouse_speed() const { int InputDefault::get_mouse_button_mask() const { - return mouse_button_mask;// do not trust OS implementaiton, should remove it - OS::get_singleton()->get_mouse_button_state(); + return mouse_button_mask; // do not trust OS implementaiton, should remove it - OS::get_singleton()->get_mouse_button_state(); } -void InputDefault::warp_mouse_pos(const Vector2& p_to) { +void InputDefault::warp_mouse_pos(const Vector2 &p_to) { OS::get_singleton()->warp_mouse_pos(p_to); } - void InputDefault::iteration(float p_step) { - - } -void InputDefault::action_press(const StringName& p_action) { +void InputDefault::action_press(const StringName &p_action) { Action action; - action.fixed_frame=Engine::get_singleton()->get_fixed_frames(); - action.idle_frame=Engine::get_singleton()->get_idle_frames(); - action.pressed=true; - - action_state[p_action]=action; + action.fixed_frame = Engine::get_singleton()->get_fixed_frames(); + action.idle_frame = Engine::get_singleton()->get_idle_frames(); + action.pressed = true; + action_state[p_action] = action; } -void InputDefault::action_release(const StringName& p_action){ +void InputDefault::action_release(const StringName &p_action) { Action action; - action.fixed_frame=Engine::get_singleton()->get_fixed_frames(); - action.idle_frame=Engine::get_singleton()->get_idle_frames(); - action.pressed=false; + action.fixed_frame = Engine::get_singleton()->get_fixed_frames(); + action.idle_frame = Engine::get_singleton()->get_idle_frames(); + action.pressed = false; - action_state[p_action]=action; + action_state[p_action] = action; } void InputDefault::set_emulate_touch(bool p_emulate) { - emulate_touch=p_emulate; + emulate_touch = p_emulate; } bool InputDefault::is_emulating_touchscreen() const { @@ -530,11 +513,11 @@ bool InputDefault::is_emulating_touchscreen() const { return emulate_touch; } -void InputDefault::set_custom_mouse_cursor(const RES& p_cursor,const Vector2& p_hotspot) { - if (custom_cursor==p_cursor) +void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, const Vector2 &p_hotspot) { + if (custom_cursor == p_cursor) return; - custom_cursor=p_cursor; + custom_cursor = p_cursor; if (p_cursor.is_null()) { set_mouse_mode(MOUSE_MODE_VISIBLE); @@ -544,7 +527,7 @@ void InputDefault::set_custom_mouse_cursor(const RES& p_cursor,const Vector2& p_ Rect2 region = atex.is_valid() ? atex->get_region() : Rect2(); set_mouse_mode(MOUSE_MODE_HIDDEN); VisualServer::get_singleton()->cursor_set_visible(true); - VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(),p_hotspot, 0, region); + VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(), p_hotspot, 0, region); VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos()); } } @@ -560,13 +543,12 @@ void InputDefault::set_mouse_in_window(bool p_in_window) { set_mouse_mode(MOUSE_MODE_VISIBLE); VisualServer::get_singleton()->cursor_set_visible(false); } - } } // from github.com/gabomdq/SDL_GameControllerDB -static const char *s_ControllerMappings [] = { - #ifdef WINDOWS_ENABLED +static const char *s_ControllerMappings[] = { +#ifdef WINDOWS_ENABLED "00f00300000000000000504944564944,RetroUSB.com RetroPad,a:b1,b:b5,x:b0,y:b4,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "00f0f100000000000000504944564944,RetroUSB.com Super RetroPort,a:b1,b:b5,x:b0,y:b4,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "02200090000000000000504944564944,8Bitdo NES30 PRO USB,a:b0,b:b1,x:b3,y:b4,leftshoulder:b6,rightshoulder:b7,lefttrigger:b8,righttrigger:b9,back:b10,start:b11,leftstick:b13,rightstick:b14,leftx:a0,lefty:a1,rightx:a3,righty:a4,dpup:h0.1,dpright:h0.2,dpdown:h0.4,dpleft:h0.8,", @@ -613,9 +595,9 @@ static const char *s_ControllerMappings [] = { "ff113133000000000000504944564944,SVEN X-PAD,a:b2,b:b3,y:b1,x:b0,start:b5,back:b4,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a4,lefttrigger:b8,righttrigger:b9,", "ffff0000000000000000504944564944,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "__XINPUT_DEVICE__,XInput Gamepad,a:b12,b:b13,x:b14,y:b15,start:b4,back:b5,leftstick:b6,rightstick:b7,leftshoulder:b8,rightshoulder:b9,dpup:b0,dpdown:b1,dpleft:b2,dpright:b3,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,", - #endif +#endif - #ifdef OSX_ENABLED +#ifdef OSX_ENABLED "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "050000005769696d6f74652028303000,Wii Remote,a:b4,b:b5,y:b9,x:b10,start:b6,guide:b8,back:b7,dpup:b2,dpleft:b0,dpdown:b3,dpright:b1,leftx:a0,lefty:a1,lefttrigger:b12,righttrigger:,leftshoulder:b11,", "050000005769696d6f74652028313800,Wii U Pro Controller,a:b16,b:b15,x:b18,y:b17,back:b7,guide:b8,start:b6,leftstick:b23,rightstick:b24,leftshoulder:b19,rightshoulder:b20,dpup:b11,dpdown:b12,dpleft:b13,dpright:b14,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b21,righttrigger:b22,", @@ -642,9 +624,9 @@ static const char *s_ControllerMappings [] = { "ad1b00000000000001f9000000000000,Gamestop BB-070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,", "b4040000000000000a01000000000000,Sega Saturn USB Gamepad,a:b0,b:b1,x:b3,y:b4,back:b5,guide:b2,start:b8,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "d814000000000000cecf000000000000,MC Cthulhu,leftx:,lefty:,rightx:,righty:,lefttrigger:b6,a:b1,b:b2,y:b3,x:b0,start:b9,back:b8,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,righttrigger:b7,", - #endif +#endif - #if X11_ENABLED +#if X11_ENABLED "0000000058626f782047616d65706100,Xbox Gamepad (userspace driver),a:b0,b:b1,x:b2,y:b3,start:b7,back:b6,guide:b8,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,lefttrigger:a5,righttrigger:a4,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a2,righty:a3,", "0300000000f000000300000000010000,RetroUSB.com RetroPad,a:b1,b:b5,x:b0,y:b4,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "0300000000f00000f100000000010000,RetroUSB.com Super RetroPort,a:b1,b:b5,x:b0,y:b4,back:b2,start:b3,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", @@ -727,9 +709,9 @@ static const char *s_ControllerMappings [] = { "050000007e0500003003000001000000,Nintendo Wii U Pro Controller,a:b0,b:b1,x:b3,y:b2,back:b8,start:b9,guide:b10,leftshoulder:b4,rightshoulder:b5,leftstick:b11,rightstick:b12,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7,dpup:b13,dpleft:b15,dpdown:b14,dpright:b16,", "05000000d6200000ad0d000001000000,Moga Pro,a:b0,b:b1,y:b3,x:b2,start:b6,leftstick:b7,rightstick:b8,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,", "060000004c0500006802000000010000,PS3 Controller (Bluetooth),a:b14,b:b13,y:b12,x:b15,start:b3,guide:b16,back:b0,leftstick:b1,rightstick:b2,leftshoulder:b10,rightshoulder:b11,dpup:b4,dpleft:b7,dpdown:b6,dpright:b5,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b8,righttrigger:b9,", - #endif +#endif - #if defined(__ANDROID__) +#if defined(__ANDROID__) "Default Android Gamepad,Default Controller,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b8,rightshoulder:b10,rightx:a2,start:b6,righty:a3,dpleft:h0.8,lefttrigger:a4,x:b2,dpup:h0.1,back:b4,leftstick:b7,leftshoulder:b9,y:b3,a:b0,dpright:h0.2,righttrigger:a5,b:b1,", "47656e6572696320582d426f78207061,Logitech F-310,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b8,rightshoulder:b10,rightx:a2,start:b6,righty:a3,dpleft:h0.8,lefttrigger:a5,x:b2,dpup:h0.1,leftstick:b7,leftshoulder:b9,y:b3,a:b0,dpright:h0.2,righttrigger:a4,b:b1,", "484f524920434f2e2c4c544420205041,Hori Gem Pad 3,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b6,rightshoulder:b18,rightx:a2,start:b16,righty:a3,dpleft:h0.8,lefttrigger:b9,x:b0,dpup:h0.1,back:b15,leftstick:b4,leftshoulder:b3,y:b2,a:b1,dpright:h0.2,righttrigger:b10,b:b17,", @@ -737,9 +719,9 @@ static const char *s_ControllerMappings [] = { "4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,", "532e542e442e20496e74657261637420,3dfx InterAct HammerHead FX,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b25,rightshoulder:b27,rightx:a2,start:b31,righty:a3,dpleft:h0.8,lefttrigger:b28,x:b20,dpup:h0.1,back:b30,leftstick:b22,leftshoulder:b26,y:b21,a:b23,dpright:h0.2,righttrigger:b29,b:b24,", "506572666f726d616e63652044657369,PDP Rock Candy Wireless Controller for PS3,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b6,rightshoulder:b18,rightx:a2,start:b16,righty:a3,dpleft:h0.8,lefttrigger:b9,x:b0,dpup:h0.1,back:h0.2,leftstick:b4,leftshoulder:b3,y:b2,a:b1,dpright:h0.2,righttrigger:b10,b:b17,", - #endif +#endif - #ifdef JAVASCRIPT_ENABLED +#ifdef JAVASCRIPT_ENABLED "Default HTML5 Gamepad, Default Mapping,leftx:a0,lefty:a1,dpdown:b13,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a3,dpleft:b14,lefttrigger:a6,x:b2,dpup:b12,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b0,dpright:b15,righttrigger:a7,b:b1,", "303435652d303238652d4d6963726f73,Wired X360 Controller,leftx:a0,lefty:a1,dpdown:a7,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:a6,lefttrigger:a2,x:b2,dpup:a7,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:a6,righttrigger:a5,b:b1,", "303435652d303731392d58626f782033,Wireless X360 Controller,leftx:a0,lefty:a1,dpdown:b14,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:b11,lefttrigger:a2,x:b2,dpup:b13,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:b12,righttrigger:a5,b:b1,", @@ -747,19 +729,19 @@ static const char *s_ControllerMappings [] = { "303534632d303563342d536f6e792043,PS4 Controller USB/Linux,leftx:a0,lefty:a1,dpdown:a7,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a5,dpleft:a6,lefttrigger:a3,x:b0,dpup:a7,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b1,dpright:a6,righttrigger:a4,b:b2,", "303534632d303563342d576972656c65,PS4 Controller USB/Win,leftx:a0,lefty:a1,dpdown:b15,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a5,lefttrigger:a3,x:b0,dpup:b14,dpleft:b16,dpright:b17,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b1,righttrigger:b7,b:b2,", "c2a94d6963726f736f66742058626f78,Wireless X360 Controller,leftx:a0,lefty:a1,dpdown:b14,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:b11,lefttrigger:a2,x:b2,dpup:b13,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:b12,righttrigger:a5,b:b1,", - #endif +#endif - #ifdef UWP_ENABLED +#ifdef UWP_ENABLED "__UWP_GAMEPAD__,Xbox Controller,a:b2,b:b3,x:b4,y:b5,start:b0,back:b1,leftstick:b12,rightstick:b13,leftshoulder:b10,rightshoulder:b11,dpup:b6,dpdown:b7,dpleft:b8,dpright:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,", - #endif +#endif NULL }; InputDefault::InputDefault() { - mouse_button_mask=0; - emulate_touch=false; - main_loop=NULL; + mouse_button_mask = 0; + emulate_touch = false; + main_loop = NULL; hat_map_default[HAT_UP].type = TYPE_BUTTON; hat_map_default[HAT_UP].index = JOY_DPAD_UP; @@ -783,7 +765,7 @@ InputDefault::InputDefault() { if (env_mapping != "") { Vector entries = env_mapping.split("\n"); - for (int i=0; i < entries.size(); i++) { + for (int i = 0; i < entries.size(); i++) { if (entries[i] == "") continue; parse_mapping(entries[i]); @@ -797,11 +779,10 @@ InputDefault::InputDefault() { }; } - uint32_t InputDefault::joy_button(uint32_t p_last_id, int p_device, int p_button, bool p_pressed) { _THREAD_SAFE_METHOD_; - Joypad& joy = joy_names[p_device]; + Joypad &joy = joy_names[p_device]; //printf("got button %i, mapping is %i\n", p_button, joy.mapping); if (joy.last_buttons[p_button] == p_pressed) { return p_last_id; @@ -812,7 +793,7 @@ uint32_t InputDefault::joy_button(uint32_t p_last_id, int p_device, int p_button return _button_event(p_last_id, p_device, p_button, p_pressed); }; - Map::Element* el = map_db[joy.mapping].buttons.find(p_button); + Map::Element *el = map_db[joy.mapping].buttons.find(p_button); if (!el) { //don't process un-mapped events for now, it could mess things up badly for devices with additional buttons/axis //return _button_event(p_last_id, p_device, p_button, p_pressed); @@ -837,11 +818,11 @@ uint32_t InputDefault::joy_button(uint32_t p_last_id, int p_device, int p_button return p_last_id; // no event? }; -uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, const JoyAxis& p_value) { +uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, const JoyAxis &p_value) { _THREAD_SAFE_METHOD_; - Joypad& joy = joy_names[p_device]; + Joypad &joy = joy_names[p_device]; if (joy.last_axis[p_axis] == p_value.value) { return p_last_id; @@ -849,12 +830,11 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co if (p_value.value > joy.last_axis[p_axis]) { - if (p_value.value < joy.last_axis[p_axis] + joy.filter ) { + if (p_value.value < joy.last_axis[p_axis] + joy.filter) { return p_last_id; } - } - else if (p_value.value > joy.last_axis[p_axis] - joy.filter) { + } else if (p_value.value > joy.last_axis[p_axis] - joy.filter) { return p_last_id; } @@ -874,13 +854,12 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co return _axis_event(p_last_id, p_device, p_axis, val); }; - Map::Element* el = map_db[joy.mapping].axis.find(p_axis); + Map::Element *el = map_db[joy.mapping].axis.find(p_axis); if (!el) { //return _axis_event(p_last_id, p_device, p_axis, p_value); return p_last_id; }; - JoyEvent map = el->get(); if (map.type == TYPE_BUTTON) { @@ -903,7 +882,7 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co p_last_id = _button_event(p_last_id, p_device, JOY_DPAD_DOWN, false); } } - if ( pressed == joy_buttons_pressed.has(_combine_device(button, p_device))) { + if (pressed == joy_buttons_pressed.has(_combine_device(button, p_device))) { return p_last_id; } return _button_event(p_last_id, p_device, button, true); @@ -920,14 +899,14 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co p_last_id = _button_event(p_last_id, p_device, JOY_DPAD_RIGHT, false); } } - if ( pressed == joy_buttons_pressed.has(_combine_device(button, p_device))) { + if (pressed == joy_buttons_pressed.has(_combine_device(button, p_device))) { return p_last_id; } return _button_event(p_last_id, p_device, button, true); } float deadzone = p_value.min == 0 ? 0.5f : 0.0f; bool pressed = p_value.value > deadzone ? true : false; - if (pressed == joy_buttons_pressed.has(_combine_device(map.index,p_device))) { + if (pressed == joy_buttons_pressed.has(_combine_device(map.index, p_device))) { // button already pressed or released, this is an axis bounce value return p_last_id; }; @@ -936,7 +915,7 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co if (map.type == TYPE_AXIS) { - return _axis_event(p_last_id, p_device, map.index, val ); + return _axis_event(p_last_id, p_device, map.index, val); }; //printf("invalid mapping\n"); return p_last_id; @@ -945,9 +924,9 @@ uint32_t InputDefault::joy_axis(uint32_t p_last_id, int p_device, int p_axis, co uint32_t InputDefault::joy_hat(uint32_t p_last_id, int p_device, int p_val) { _THREAD_SAFE_METHOD_; - const Joypad& joy = joy_names[p_device]; + const Joypad &joy = joy_names[p_device]; - JoyEvent* map; + JoyEvent *map; if (joy.mapping == -1) { map = hat_map_default; @@ -957,17 +936,17 @@ uint32_t InputDefault::joy_hat(uint32_t p_last_id, int p_device, int p_val) { int cur_val = joy_names[p_device].hat_current; - if ( (p_val & HAT_MASK_UP) != (cur_val & HAT_MASK_UP) ) { + if ((p_val & HAT_MASK_UP) != (cur_val & HAT_MASK_UP)) { p_last_id = _button_event(p_last_id, p_device, map[HAT_UP].index, p_val & HAT_MASK_UP); }; - if ( (p_val & HAT_MASK_RIGHT) != (cur_val & HAT_MASK_RIGHT) ) { + if ((p_val & HAT_MASK_RIGHT) != (cur_val & HAT_MASK_RIGHT)) { p_last_id = _button_event(p_last_id, p_device, map[HAT_RIGHT].index, p_val & HAT_MASK_RIGHT); }; - if ( (p_val & HAT_MASK_DOWN) != (cur_val & HAT_MASK_DOWN) ) { + if ((p_val & HAT_MASK_DOWN) != (cur_val & HAT_MASK_DOWN)) { p_last_id = _button_event(p_last_id, p_device, map[HAT_DOWN].index, p_val & HAT_MASK_DOWN); }; - if ( (p_val & HAT_MASK_LEFT) != (cur_val & HAT_MASK_LEFT) ) { + if ((p_val & HAT_MASK_LEFT) != (cur_val & HAT_MASK_LEFT)) { p_last_id = _button_event(p_last_id, p_device, map[HAT_LEFT].index, p_val & HAT_MASK_LEFT); }; @@ -999,7 +978,7 @@ uint32_t InputDefault::_axis_event(uint32_t p_last_id, int p_device, int p_axis, ievent.joy_motion.axis = p_axis; ievent.joy_motion.axis_value = p_value; - parse_input_event( ievent ); + parse_input_event(ievent); return p_last_id; }; @@ -1007,14 +986,14 @@ uint32_t InputDefault::_axis_event(uint32_t p_last_id, int p_device, int p_axis, InputDefault::JoyEvent InputDefault::_find_to_event(String p_to) { // string names of the SDL buttons in the same order as input_event.h godot buttons - static const char* buttons[] = {"a", "b", "x", "y", "leftshoulder", "rightshoulder", "lefttrigger", "righttrigger", "leftstick", "rightstick", "back", "start", "dpup", "dpdown", "dpleft", "dpright", "guide", NULL }; + static const char *buttons[] = { "a", "b", "x", "y", "leftshoulder", "rightshoulder", "lefttrigger", "righttrigger", "leftstick", "rightstick", "back", "start", "dpup", "dpdown", "dpleft", "dpright", "guide", NULL }; - static const char* axis[] = {"leftx", "lefty", "rightx", "righty", NULL }; + static const char *axis[] = { "leftx", "lefty", "rightx", "righty", NULL }; JoyEvent ret; ret.type = -1; - int i=0; + int i = 0; while (buttons[i]) { if (p_to == buttons[i]) { @@ -1070,30 +1049,30 @@ void InputDefault::parse_mapping(String p_mapping) { String etype = from.substr(0, 1); if (etype == "a") { - int aid = from.substr(1, from.length()-1).to_int(); + int aid = from.substr(1, from.length() - 1).to_int(); mapping.axis[aid] = to_event; } else if (etype == "b") { - int bid = from.substr(1, from.length()-1).to_int(); + int bid = from.substr(1, from.length() - 1).to_int(); mapping.buttons[bid] = to_event; } else if (etype == "h") { int hat_value = from.get_slice(".", 1).to_int(); switch (hat_value) { - case 1: - mapping.hat[HAT_UP] = to_event; - break; - case 2: - mapping.hat[HAT_RIGHT] = to_event; - break; - case 4: - mapping.hat[HAT_DOWN] = to_event; - break; - case 8: - mapping.hat[HAT_LEFT] = to_event; - break; + case 1: + mapping.hat[HAT_UP] = to_event; + break; + case 2: + mapping.hat[HAT_RIGHT] = to_event; + break; + case 4: + mapping.hat[HAT_DOWN] = to_event; + break; + case 8: + mapping.hat[HAT_LEFT] = to_event; + break; }; }; }; @@ -1106,21 +1085,21 @@ void InputDefault::add_joy_mapping(String p_mapping, bool p_update_existing) { if (p_update_existing) { Vector entry = p_mapping.split(","); String uid = entry[0]; - for (int i=0; i= 0;i--) { + for (int i = map_db.size() - 1; i >= 0; i--) { if (p_guid == map_db[i].uid) { map_db.remove(i); } } - for (int i=0; i keys_pressed; Set joy_buttons_pressed; - Map _joy_axis; + Map _joy_axis; //Map custom_action_press; Vector3 gravity; Vector3 accelerometer; @@ -57,8 +55,7 @@ class InputDefault : public Input { bool pressed; }; - Map action_state; - + Map action_state; bool emulate_touch; @@ -80,7 +77,7 @@ class InputDefault : public Input { float min_ref_frame; float max_ref_frame; - void update(const Vector2& p_delta_p); + void update(const Vector2 &p_delta_p); void reset(); SpeedTrack(); }; @@ -101,7 +98,6 @@ class InputDefault : public Input { for (int i = 0; i < JOY_AXIS_MAX; i++) { last_axis[i] = 0.0f; - } for (int i = 0; i < JOY_BUTTON_MAX + 19; i++) { @@ -118,6 +114,7 @@ class InputDefault : public Input { Map joy_names; int fallback_mapping; RES custom_cursor; + public: enum HatMask { HAT_MASK_CENTER = 0, @@ -145,7 +142,6 @@ public: }; private: - enum JoyType { TYPE_BUTTON, TYPE_AXIS, @@ -163,8 +159,8 @@ private: String uid; String name; - Map buttons; - Map axis; + Map buttons; + Map axis; JoyEvent hat[HAT_MAX]; }; @@ -178,17 +174,14 @@ private: float _handle_deadzone(int p_device, int p_axis, float p_value); public: - - - virtual bool is_key_pressed(int p_scancode) const; virtual bool is_mouse_button_pressed(int p_button) const; virtual bool is_joy_button_pressed(int p_device, int p_button) const; - virtual bool is_action_pressed(const StringName& p_action) const; - virtual bool is_action_just_pressed(const StringName& p_action) const; - virtual bool is_action_just_released(const StringName& p_action) const; + virtual bool is_action_pressed(const StringName &p_action) const; + virtual bool is_action_just_pressed(const StringName &p_action) const; + virtual bool is_action_just_released(const StringName &p_action) const; - virtual float get_joy_axis(int p_device,int p_axis) const; + virtual float get_joy_axis(int p_device, int p_axis) const; String get_joy_name(int p_idx); virtual Array get_connected_joypads(); virtual Vector2 get_joy_vibration_strength(int p_device); @@ -206,47 +199,46 @@ public: virtual Point2 get_last_mouse_speed() const; virtual int get_mouse_button_mask() const; - virtual void warp_mouse_pos(const Vector2& p_to); - + virtual void warp_mouse_pos(const Vector2 &p_to); - void parse_input_event(const InputEvent& p_event); - void set_gravity(const Vector3& p_gravity); - void set_accelerometer(const Vector3& p_accel); - void set_magnetometer(const Vector3& p_magnetometer); - void set_gyroscope(const Vector3& p_gyroscope); - void set_joy_axis(int p_device,int p_axis,float p_value); + void parse_input_event(const InputEvent &p_event); + void set_gravity(const Vector3 &p_gravity); + void set_accelerometer(const Vector3 &p_accel); + void set_magnetometer(const Vector3 &p_magnetometer); + void set_gyroscope(const Vector3 &p_gyroscope); + void set_joy_axis(int p_device, int p_axis, float p_value); - virtual void start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration=0); + virtual void start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration = 0); virtual void stop_joy_vibration(int p_device); void set_main_loop(MainLoop *main_loop); - void set_mouse_pos(const Point2& p_posf); + void set_mouse_pos(const Point2 &p_posf); - void action_press(const StringName& p_action); - void action_release(const StringName& p_action); + void action_press(const StringName &p_action); + void action_release(const StringName &p_action); void iteration(float p_step); void set_emulate_touch(bool p_emulate); virtual bool is_emulating_touchscreen() const; - virtual void set_custom_mouse_cursor(const RES& p_cursor,const Vector2& p_hotspot=Vector2()); + virtual void set_custom_mouse_cursor(const RES &p_cursor, const Vector2 &p_hotspot = Vector2()); virtual void set_mouse_in_window(bool p_in_window); void parse_mapping(String p_mapping); uint32_t joy_button(uint32_t p_last_id, int p_device, int p_button, bool p_pressed); - uint32_t joy_axis(uint32_t p_last_id, int p_device, int p_axis, const JoyAxis& p_value); + uint32_t joy_axis(uint32_t p_last_id, int p_device, int p_axis, const JoyAxis &p_value); uint32_t joy_hat(uint32_t p_last_id, int p_device, int p_val); - virtual void add_joy_mapping(String p_mapping, bool p_update_existing=false); + virtual void add_joy_mapping(String p_mapping, bool p_update_existing = false); virtual void remove_joy_mapping(String p_guid); virtual bool is_joy_known(int p_device); virtual String get_joy_guid(int p_device) const; virtual String get_joy_button_string(int p_button); virtual String get_joy_axis_string(int p_axis); - virtual int get_joy_axis_index_from_string(String p_axis); - virtual int get_joy_button_index_from_string(String p_button); + virtual int get_joy_axis_index_from_string(String p_axis); + virtual int get_joy_button_index_from_string(String p_button); int get_unused_joy_id(); diff --git a/main/main.cpp b/main/main.cpp index 32aea6a4a5..f905e22070 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -27,31 +27,31 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "main.h" -#include "os/os.h" -#include "global_config.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 "global_config.h" +#include "message_queue.h" #include "modules/register_module_types.h" +#include "os/os.h" +#include "scene/register_scene_types.h" #include "script_debugger_local.h" #include "script_debugger_remote.h" -#include "message_queue.h" +#include "servers/register_server_types.h" +#include "splash.h" #include "input_map.h" #include "io/resource_loader.h" #include "scene/main/scene_main_loop.h" #include "servers/audio_server.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" @@ -62,57 +62,56 @@ #include "io/file_access_network.h" #include "servers/physics_2d_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 GlobalConfig *globals=NULL; -static Engine *engine=NULL; -static InputMap *input_map=NULL; -static bool _start_success=false; -static ScriptDebugger *script_debugger=NULL; -AudioServer *audio_server=NULL; +static GlobalConfig *globals = NULL; +static Engine *engine = NULL; +static InputMap *input_map = NULL; +static bool _start_success = false; +static ScriptDebugger *script_debugger = NULL; +AudioServer *audio_server = NULL; -static MessageQueue *message_queue=NULL; +static MessageQueue *message_queue = NULL; static Performance *performance = NULL; -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 @@ -121,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 godot.cfg\n"); #ifdef TOOLS_ENABLED @@ -132,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++; @@ -148,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"); @@ -183,14 +182,13 @@ 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(); OS::get_singleton()->initialize_core(); - engine = memnew( Engine ); + engine = memnew(Engine); ClassDB::init(); @@ -201,17 +199,16 @@ 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( GlobalConfig ); - input_map = memnew( InputMap ); + globals = memnew(GlobalConfig); + input_map = memnew(InputMap); register_core_settings(); //here globals is present - translation_server = memnew( TranslationServer ); - performance = memnew( Performance ); - globals->add_singleton(GlobalConfig::Singleton("Performance",performance)); + translation_server = memnew(TranslationServer); + performance = memnew(Performance); + globals->add_singleton(GlobalConfig::Singleton("Performance", performance)); MAIN_PRINT("Main: Parse CMDLine"); @@ -219,34 +216,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()); + I->get() = unescape_cmdline(I->get().strip_escapes()); //print_line("CMD: "+I->get()); - I=I->next(); + 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 +252,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 +273,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()) { Engine::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 +489,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()) { - GlobalConfig::get_singleton()->set("editor_scene",game_path=I->next()->get()); + GlobalConfig::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(); - GlobalConfig::get_singleton()->set("editor_pid",editor_pid); - N=I->next()->next(); + int editor_pid = I->next()->get().to_int(); + GlobalConfig::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,51 +552,50 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas } } - I=N; + I = N; } - GLOBAL_DEF("memory/multithread/thread_rid_pool_prealloc",60); + GLOBAL_DEF("memory/multithread/thread_rid_pool_prealloc", 60); - GLOBAL_DEF("network/debug/max_remote_stdout_chars_per_second",2048); - GLOBAL_DEF("network/debug/remote_port",6007); + GLOBAL_DEF("network/debug/max_remote_stdout_chars_per_second", 2048); + GLOBAL_DEF("network/debug/remote_port", 6007); if (debug_mode == "remote") { - ScriptDebuggerRemote *sdr = memnew( ScriptDebuggerRemote ); + ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote); uint16_t debug_port = GLOBAL_GET("network/debug/remote_port"); - if (debug_host.find(":")!=-1) { - debug_port=debug_host.get_slicec(':',1).to_int(); - debug_host=debug_host.get_slicec(':',0); + 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); } FileAccessNetwork::configure(); - 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; } @@ -638,36 +604,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 @@ -675,26 +639,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(GlobalConfig::get_singleton()->get("application/disable_stdout"))) { - quiet_stdout=true; + quiet_stdout = true; } if (bool(GlobalConfig::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 && (!GlobalConfig::get_singleton()->has("application/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/main_scene") || String(GlobalConfig::get_singleton()->get("application/main_scene"))=="")) - use_custom_res=false; //project manager (run without arguments) + if (main_args.size() == 0 && (!GlobalConfig::get_singleton()->has("application/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/main_scene") || String(GlobalConfig::get_singleton()->get("application/main_scene")) == "")) + use_custom_res = false; //project manager (run without arguments) #endif @@ -703,148 +667,141 @@ 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 godot.cfg - video_driver=GLOBAL_DEF("display/driver/name",Variant((const char*)OS::get_singleton()->get_video_driver_name(0))); + if (video_driver == "") // specified in godot.cfg + video_driver = GLOBAL_DEF("display/driver/name", Variant((const char *)OS::get_singleton()->get_video_driver_name(0))); if (!force_res && use_custom_res && globals->has("display/window/width")) - video_mode.width=globals->get("display/window/width"); - if (!force_res &&use_custom_res && globals->has("display/window/height")) - video_mode.height=globals->get("display/window/height"); + video_mode.width = globals->get("display/window/width"); + if (!force_res && use_custom_res && globals->has("display/window/height")) + video_mode.height = globals->get("display/window/height"); if (!editor && (!bool(globals->get("display/window/allow_hidpi")) || force_lowdpi)) { - OS::get_singleton()->_allow_hidpi=false; + OS::get_singleton()->_allow_hidpi = false; } if (use_custom_res && globals->has("display/window/fullscreen")) - video_mode.fullscreen=globals->get("display/window/fullscreen"); + video_mode.fullscreen = globals->get("display/window/fullscreen"); if (use_custom_res && globals->has("display/window/resizable")) - video_mode.resizable=globals->get("display/window/resizable"); + video_mode.resizable = globals->get("display/window/resizable"); if (use_custom_res && globals->has("display/window/borderless")) video_mode.borderless_window = globals->get("display/window/borderless"); if (!force_res && use_custom_res && globals->has("display/window/test_width") && globals->has("display/window/test_height")) { int tw = globals->get("display/window/test_width"); int th = globals->get("display/window/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/window/width",video_mode.width); - GLOBAL_DEF("display/window/height",video_mode.height); - GLOBAL_DEF("display/window/allow_hidpi",false); - GLOBAL_DEF("display/window/fullscreen",video_mode.fullscreen); - GLOBAL_DEF("display/window/resizable",video_mode.resizable); + GLOBAL_DEF("display/window/width", video_mode.width); + GLOBAL_DEF("display/window/height", video_mode.height); + GLOBAL_DEF("display/window/allow_hidpi", false); + GLOBAL_DEF("display/window/fullscreen", video_mode.fullscreen); + GLOBAL_DEF("display/window/resizable", video_mode.resizable); GLOBAL_DEF("display/window/borderless", video_mode.borderless_window); use_vsync = GLOBAL_DEF("display/window/use_vsync", use_vsync); - GLOBAL_DEF("display/window/test_width",0); - GLOBAL_DEF("display/window/test_height",0); - Engine::get_singleton()->_pixel_snap=GLOBAL_DEF("rendering/2d/use_pixel_snap",false); - OS::get_singleton()->_keep_screen_on=GLOBAL_DEF("display/energy_saving/keep_screen_on",true); - if (rtm==-1) { - rtm=GLOBAL_DEF("rendering/threads/thread_model",OS::RENDER_THREAD_SAFE); - if (rtm>=1) //hack for now - rtm=1; - + GLOBAL_DEF("display/window/test_width", 0); + GLOBAL_DEF("display/window/test_height", 0); + Engine::get_singleton()->_pixel_snap = GLOBAL_DEF("rendering/2d/use_pixel_snap", false); + OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/energy_saving/keep_screen_on", true); + if (rtm == -1) { + rtm = GLOBAL_DEF("rendering/threads/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 godot.cfg - audio_driver=GLOBAL_DEF("audio/driver",OS::get_singleton()->get_audio_driver_name(0)); + if (audio_driver == "") { // specified in godot.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/handheld/orientation","landscape"); + String orientation = GLOBAL_DEF("display/handheld/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); } - - Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/fixed_fps",60)); - Engine::get_singleton()->set_target_fps(GLOBAL_DEF("debug/fps/force_fps",0)); + Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/fixed_fps", 60)); + Engine::get_singleton()->set_target_fps(GLOBAL_DEF("debug/fps/force_fps", 0)); GLOBAL_DEF("debug/stdout/print_fps", OS::get_singleton()->is_stdout_verbose()); if (!OS::get_singleton()->_verbose_stdout) //overrided - OS::get_singleton()->_verbose_stdout=GLOBAL_DEF("debug/stdout/verbose_stdout",false); + OS::get_singleton()->_verbose_stdout = GLOBAL_DEF("debug/stdout/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); } Engine::get_singleton()->set_frame_delay(frame_delay); - message_queue = memnew( MessageQueue ); + message_queue = memnew(MessageQueue); GlobalConfig::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(); @@ -856,7 +813,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 (engine) @@ -868,9 +825,9 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas if (file_access_network_client) memdelete(file_access_network_client); -// Note 1: *zip_packed_data live into *packed_data -// Note 2: PackedData::~PackedData destroy this. -/* + // 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 ); @@ -883,24 +840,23 @@ 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); } //right moment to create and initialize the audio server - audio_server = memnew( AudioServer ); + audio_server = memnew(AudioServer); audio_server->init(); OS::get_singleton()->set_use_vsync(use_vsync); @@ -909,12 +865,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) { @@ -926,32 +882,32 @@ Error Main::setup2() { } MAIN_PRINT("Main: Load Remaps"); - Color clear = GLOBAL_DEF("rendering/viewport/default_clear_color",Color(0.3,0.3,0.3)); + Color clear = GLOBAL_DEF("rendering/viewport/default_clear_color", Color(0.3, 0.3, 0.3)); VisualServer::get_singleton()->set_default_clear_color(clear); 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); - GlobalConfig::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); + GlobalConfig::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(); + OS::get_singleton()->_msec_splash = OS::get_singleton()->get_ticks_msec(); 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) - //GlobalConfig::get_singleton()->set("application/boot_logo",Image()); +//no tools, so free the boot logo (no longer needed) +//GlobalConfig::get_singleton()->set("application/boot_logo",Image()); #endif } else { @@ -963,7 +919,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 } @@ -972,13 +928,13 @@ Error Main::setup2() { } MAIN_PRINT("Main: DCC"); - VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("rendering/viewport/default_clear_color",Color(0.3,0.3,0.3))); + VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("rendering/viewport/default_clear_color", Color(0.3, 0.3, 0.3))); MAIN_PRINT("Main: END"); - GLOBAL_DEF("application/icon",String()); - GlobalConfig::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp")); + GLOBAL_DEF("application/icon", String()); + GlobalConfig::get_singleton()->set_custom_property_info("application/icon", PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "*.png,*.webp")); - if (bool(GLOBAL_DEF("display/handheld/emulate_touchscreen",false))) { + if (bool(GLOBAL_DEF("display/handheld/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(); @@ -987,8 +943,6 @@ Error Main::setup2() { } } - - MAIN_PRINT("Main: Load Remaps"); MAIN_PRINT("Main: Load Scene Types"); @@ -996,18 +950,18 @@ Error Main::setup2() { register_scene_types(); register_server_types(); - GLOBAL_DEF("display/mouse_cursor/custom_image",String()); - GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot",Vector2()); - GlobalConfig::get_singleton()->set_custom_property_info("display/mouse_cursor/custom_image",PropertyInfo(Variant::STRING,"display/mouse_cursor/custom_image",PROPERTY_HINT_FILE,"*.png,*.webp")); + GLOBAL_DEF("display/mouse_cursor/custom_image", String()); + GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2()); + GlobalConfig::get_singleton()->set_custom_property_info("display/mouse_cursor/custom_image", PropertyInfo(Variant::STRING, "display/mouse_cursor/custom_image", PROPERTY_HINT_FILE, "*.png,*.webp")); - if (String(GlobalConfig::get_singleton()->get("display/mouse_cursor/custom_image"))!=String()) { + if (String(GlobalConfig::get_singleton()->get("display/mouse_cursor/custom_image")) != String()) { //print_line("use custom cursor"); - Ref cursor=ResourceLoader::load(GlobalConfig::get_singleton()->get("display/mouse_cursor/custom_image")); + Ref cursor = ResourceLoader::load(GlobalConfig::get_singleton()->get("display/mouse_cursor/custom_image")); if (cursor.is_valid()) { //print_line("loaded ok"); Vector2 hotspot = GlobalConfig::get_singleton()->get("display/mouse_cursor/custom_image_hotspot"); - Input::get_singleton()->set_custom_mouse_cursor(cursor,hotspot); + Input::get_singleton()->set_custom_mouse_cursor(cursor, hotspot); } } #ifdef TOOLS_ENABLED @@ -1028,43 +982,39 @@ 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(); - audio_server->load_default_bus_layout(); if (use_debug_profiler && script_debugger) { script_debugger->profiling_start(); } - _start_success=true; - locale=String(); + _start_success = true; + locale = String(); ClassDB::set_current_api(ClassDB::API_NONE); //no more api is registered at this point if (OS::get_singleton()->is_stdout_verbose()) { - print_line("CORE API HASH: "+itos(ClassDB::get_api_hash(ClassDB::API_CORE))); - print_line("EDITOR API HASH: "+itos(ClassDB::get_api_hash(ClassDB::API_EDITOR))); + print_line("CORE API HASH: " + itos(ClassDB::get_api_hash(ClassDB::API_CORE))); + print_line("EDITOR API HASH: " + itos(ClassDB::get_api_hash(ClassDB::API_EDITOR))); } 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; List removal_docs; - bool doc_base=true; + bool doc_base = true; String game_path; String script; String test; @@ -1072,52 +1022,52 @@ bool Main::start() { String _export_platform; String _import; String _import_script; - 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]=="-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] == "-script" || args[i] == "-s") { + script = args[i + 1]; + } else if (args[i] == "-level" || args[i] == "-l") { + Engine::get_singleton()->_custom_level = args[i + 1]; + } else if (args[i] == "-test") { + test = 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 { // The parameter does not match anything known, don't skip the next argument - parsed_pair=false; + parsed_pair = false; } if (parsed_pair) { i++; @@ -1125,26 +1075,24 @@ bool Main::start() { } } - GLOBAL_DEF("editor/active",editor); - + GLOBAL_DEF("editor/active", editor); 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."); - } - for(List::Element* E= removal_docs.front(); E; E=E->next()) { + for (List::Element *E = removal_docs.front(); E; E = E->next()) { DocData rmdoc; if (rmdoc.load(E->get()) == OK) { print_line(String("Removing classes in ") + E->get()); @@ -1157,76 +1105,72 @@ bool Main::start() { return false; } - #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