asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/main/main.cpp

2321 lines
81 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
Correct license headers in main.cpp and voxel_light_baker.cpp Sorry for the churn
2017-12-20 01:04:30 +01:00
/* main.cpp */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Use HTTPS URL for Godot's website in the headers
2017-08-27 14:16:55 +02:00
/* https://godotengine.org */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/*************************************************************************/
Update copyright statements to 2021 Happy new year to the wonderful Godot community! 2020 has been a tough year for most of us personally, but a good year for Godot development nonetheless with a huge amount of work done towards Godot 4.0 and great improvements backported to the long-lived 3.2 branch. We've had close to 400 contributors to engine code this year, authoring near 7,000 commit! (And that's only for the `master` branch and for the engine code, there's a lot more when counting docs, demos and other first-party repos.) Here's to a great year 2021 for all Godot users 🎆 (cherry picked from commit b5334d14f7a471f94bcbd64d5bae2ad853d0b7f1)
2021-01-01 20:13:46 +01:00
/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
Add missing copyright headers and fix formatting Using `misc/scripts/fix_headers.py` on all Godot files. Some missing header guards were added, and the header inclusion order was fixed in the Bullet module.
2018-01-05 00:50:27 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "main.h"
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
Rewrite StreamPeerSSL with SSLContext helper class connect_to_stream now accepts optional parameter to specify which certificates to trust. Implement accept_stream (SSL server) with key/cert parameters to specify the RSA key and X509 certificate resources.
2019-07-19 15:29:57 +02:00
#include "core/crypto/crypto.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "core/input_map.h"
#include "core/io/file_access_network.h"
#include "core/io/file_access_pack.h"
#include "core/io/file_access_zip.h"
Main: Use ImageLoader directly instead of Image::load Image::load is now issuing warnings (since ef50957) to prevent users from using it to load images at runtime which would be included in their exported game. So we now use ImageLoader explicitly instead for the custom-handled cases in Main. Fixes #21072, supersedes #22321.
2018-09-30 17:21:07 +02:00
#include "core/io/image_loader.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "core/io/ip.h"
#include "core/io/resource_loader.h"
#include "core/message_queue.h"
#include "core/os/dir_access.h"
#include "core/os/os.h"
#include "core/project_settings.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "core/register_core_types.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "core/script_debugger_local.h"
#include "core/script_language.h"
#include "core/translation.h"
#include "core/version.h"
#include "core/version_hash.gen.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "drivers/register_driver_types.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "main/app_icon.gen.h"
#include "main/input_default.h"
Drivers, main, servers: Ensure classes match their header filename Renamed: - `drivers/alsamidi/alsa_midi.h` -> `midi_driver_alsamidi.h` (same for `coremidi` and `winmidi`) - `main/timer_sync.h` -> `main_timer_sync.h` - `servers/visual/visual_server_global.h` -> `visual_server_globals.h`
2019-02-12 14:23:35 +01:00
#include "main/main_timer_sync.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "main/performance.h"
#include "main/splash.gen.h"
#include "main/splash_editor.gen.h"
#include "main/tests/test_main.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#include "modules/register_module_types.h"
Facilitate exposing platform-exclusive interfaces to all platforms This makes the interfaces available, without implementation, in other platforms and the editor, which facilitates documenting platform-exclusive classes. Platform-exclusive APIs must be set up in platform/<platform>/api/api.cpp. Provide noop method-implementations where necessary. Also setup and document the HTML5 platform's JavaScript singleton.
2017-11-16 01:33:48 +01:00
#include "platform/register_platform_apis.h"
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 22:55:01 +02:00
#include "scene/debugger/script_debugger_remote.h"
-Fixed SCREEN_TEXTURE and other related 2D shader parameters. -Fixded BackBuffercopy object
2017-06-27 03:58:03 +02:00
#include "scene/main/scene_tree.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "scene/main/viewport.h"
#include "scene/register_scene_types.h"
#include "scene/resources/packed_scene.h"
Redoing the ARVR GDNative interface as module and tighter implementation
2017-10-07 15:51:17 +02:00
#include "servers/arvr_server.h"
Oops! Audio engine has vanished :D
2017-01-15 20:06:14 +01:00
#include "servers/audio_server.h"
iOS modular build and export implementation.
2019-11-29 07:54:39 +01:00
#include "servers/camera_server.h"
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
#include "servers/physics_2d_server.h"
#include "servers/physics_server.h"
Make core/ includes absolute, remove subfolders from include path This allows more consistency in the manner we include core headers, where previously there would be a mix of absolute, relative and include path-dependent includes.
2018-09-11 18:13:45 +02:00
#include "servers/register_server_types.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#ifdef TOOLS_ENABLED
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 14:21:25 +01:00
#include "editor/doc/doc_data.h"
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
#include "editor/doc/doc_data_class_path.gen.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 14:21:25 +01:00
#include "editor/editor_node.h"
Allow system certs file to be used by Editor. Note, it will only used by the Editor, not when running the game. This allows package maintainer to compile Godot to use system installed certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
#include "editor/editor_settings.h"
Cleans up headers included in editor_node.h
2019-12-24 08:17:23 +01:00
#include "editor/progress_dialog.h"
Refactoring: rename tools/editor/ to editor/ The other subfolders of tools/ had already been moved to either editor/, misc/ or thirdparty/, so the hiding the editor code that deep was no longer meaningful.
2017-03-05 14:21:25 +01:00
#include "editor/project_manager.h"
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
/* Static members */
// Singletons
// Initialized in setup()
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
2017-03-05 16:44:50 +01:00
static Engine *engine = NULL;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static ProjectSettings *globals = NULL;
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
2017-03-05 16:44:50 +01:00
static InputMap *input_map = NULL;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static TranslationServer *translation_server = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
static Performance *performance = NULL;
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
2017-03-05 16:44:50 +01:00
static PackedData *packed_data = NULL;
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
#ifdef MINIZIP_ENABLED
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
2017-03-05 16:44:50 +01:00
static ZipArchive *zip_packed_data = NULL;
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
#endif
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
2017-03-05 16:44:50 +01:00
static FileAccessNetworkClient *file_access_network_client = NULL;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static ScriptDebugger *script_debugger = NULL;
static MessageQueue *message_queue = NULL;
// Initialized in setup2()
static AudioServer *audio_server = NULL;
iOS modular build and export implementation.
2019-11-29 07:54:39 +01:00
static CameraServer *camera_server = NULL;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static ARVRServer *arvr_server = NULL;
static PhysicsServer *physics_server = NULL;
static Physics2DServer *physics_2d_server = NULL;
// We error out if setup2() doesn't turn this true
static bool _start_success = false;
// Drivers
static int video_driver_idx = -1;
static int audio_driver_idx = -1;
// Engine config/tools
static bool editor = false;
static bool project_manager = false;
static String locale;
static bool show_help = false;
static bool auto_quit = false;
static OS::ProcessID allow_focus_steal_pid = 0;
Fix some more warnings reported by CI Fixes the following Clang 7 warnings: ``` core/io/marshalls.cpp:872:10: warning: unused variable 'f' [-Wunused-variable] core/ustring.cpp:1831:2: warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register] core/ustring.cpp:1832:2: warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register] drivers/gles3/rasterizer_gles3.cpp:82:24: warning: unused function '_gl_debug_print' [-Wunused-function,34] main/main.cpp:118:13: warning: unused variable 'auto_build_solutions' [-Wunused-variable] modules/csg/csg_gizmos.cpp:225:46: warning: 'current' may be used uninitialized in this function [-Wmaybe-uninitialized] ```
2018-10-03 14:05:17 +02:00
#ifdef TOOLS_ENABLED
static bool auto_build_solutions = false;
#endif
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
// Display
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
static OS::VideoMode video_mode;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static int init_screen = -1;
static bool init_fullscreen = false;
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
2017-03-05 16:44:50 +01:00
static bool init_maximized = false;
static bool init_windowed = false;
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
static bool init_always_on_top = false;
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
2017-03-05 16:44:50 +01:00
static bool init_use_custom_pos = false;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static Vector2 init_custom_pos;
static bool force_lowdpi = false;
// Debug
static bool use_debug_profiler = false;
Optimize-out some debug and/or non-tools methods Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
2017-04-07 16:17:16 +02:00
#ifdef DEBUG_ENABLED
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
2017-03-05 16:44:50 +01:00
static bool debug_collisions = false;
static bool debug_navigation = false;
Optimize-out some debug and/or non-tools methods Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
2017-04-07 16:17:16 +02:00
#endif
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
2017-03-05 16:44:50 +01:00
static int frame_delay = 0;
Renderer/Simulator flags Now hopefully with correct code style
2017-08-30 12:40:35 +02:00
static bool disable_render_loop = false;
static int fixed_fps = -1;
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
static bool print_fps = false;
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
/* Helper methods */
Makes project manager never initialize mono debug. The heuristic whether we're in the project manager inside GDMono didn't work if the project manager was launched by not having any path to run. This is fixed now by making a Main::is_project_manager().
2018-02-16 16:00:54 +01:00
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
// Used by Mono module, should likely be registered in Engine singleton instead
// FIXME: This is also not 100% accurate, `project_manager` is only true when it was requested,
// but not if e.g. we fail to load and project and fallback to the manager.
Makes project manager never initialize mono debug. The heuristic whether we're in the project manager inside GDMono didn't work if the project manager was launched by not having any path to run. This is fixed now by making a Main::is_project_manager().
2018-02-16 16:00:54 +01:00
bool Main::is_project_manager() {
return project_manager;
}
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static String unescape_cmdline(const String &p_str) {
return p_str.replace("%20", " ");
}
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
static String get_full_version_string() {
String hash = String(VERSION_HASH);
if (hash.length() != 0)
Display longer Git hashes in engine version dialogs Due to the high number of commits in the Godot repository, 7-character hashes were starting to become occasionally ambiguous. In contrast, 9-character hashes are currently unambiguous for all commits.
2019-06-01 13:51:10 +02:00
hash = "." + hash.left(9);
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
return String(VERSION_FULL_BUILD) + hash;
}
// FIXME: Could maybe be moved to PhysicsServerManager and Physics2DServerManager directly
// to have less code in main.cpp.
void initialize_physics() {
Fix BVH physics project setting Move the GLOBAL_DEF for the `godot_physics/use_bvh` to occur before GLOBAL_GET. This prevents a warning occurring and the selection not being used.
2021-01-13 10:22:17 +01:00
// This must be defined BEFORE the 3d physics server is created
GLOBAL_DEF("physics/3d/godot_physics/use_bvh", true);
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
/// 3D Physics Server
physics_server = PhysicsServerManager::new_server(ProjectSettings::get_singleton()->get(PhysicsServerManager::setting_property_name));
if (!physics_server) {
// Physics server not found, Use the default physics
physics_server = PhysicsServerManager::new_default_server();
}
ERR_FAIL_COND(!physics_server);
physics_server->init();
/// 2D Physics server
physics_2d_server = Physics2DServerManager::new_server(ProjectSettings::get_singleton()->get(Physics2DServerManager::setting_property_name));
if (!physics_2d_server) {
// Physics server not found, Use the default physics
physics_2d_server = Physics2DServerManager::new_default_server();
}
ERR_FAIL_COND(!physics_2d_server);
physics_2d_server->init();
}
void finalize_physics() {
physics_server->finish();
memdelete(physics_server);
physics_2d_server->finish();
memdelete(physics_2d_server);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//#define DEBUG_INIT
#ifdef DEBUG_INIT
#define MAIN_PRINT(m_txt) print_line(m_txt)
#else
#define MAIN_PRINT(m_txt)
#endif
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
2017-03-05 16:44:50 +01:00
void Main::print_help(const char *p_binary) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Print engine version to stdout when starting Godot Also include website URL and make it configurable via version.py together with the rest of the engine branding. Add mention to MIT license in --help output.
2019-05-28 11:19:21 +02:00
print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
OS::get_singleton()->print("Free and open source software under the terms of the MIT license.\n");
Update copyright statements to 2021 Happy new year to the wonderful Godot community! 2020 has been a tough year for most of us personally, but a good year for Godot development nonetheless with a huge amount of work done towards Godot 4.0 and great improvements backported to the long-lived 3.2 branch. We've had close to 400 contributors to engine code this year, authoring near 7,000 commit! (And that's only for the `master` branch and for the engine code, there's a lot more when counting docs, demos and other first-party repos.) Here's to a great year 2021 for all Godot users 🎆 (cherry picked from commit b5334d14f7a471f94bcbd64d5bae2ad853d0b7f1)
2021-01-01 20:13:46 +01:00
OS::get_singleton()->print("(c) 2007-2021 Juan Linietsky, Ariel Manzur.\n");
OS::get_singleton()->print("(c) 2014-2021 Godot Engine contributors.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("\n");
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print("Usage: %s [options] [path to scene or 'project.godot' file]\n", p_binary);
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("\n");
OS::get_singleton()->print("General options:\n");
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(" -h, --help Display this help message.\n");
main: Add --version switch and git hash to --help Also fix some help strings.
2017-09-24 11:32:05 +02:00
OS::get_singleton()->print(" --version Display the version string.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" -v, --verbose Use verbose stdout mode.\n");
OS::get_singleton()->print(" --quiet Quiet mode, silences stdout messages. Errors are still displayed.\n");
OS::get_singleton()->print("\n");
OS::get_singleton()->print("Run options:\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#ifdef TOOLS_ENABLED
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" -e, --editor Start the editor instead of running the scene.\n");
OS::get_singleton()->print(" -p, --project-manager Start the project manager, even if a project is auto-detected.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
Add --quit option to help output and update manpage
2018-02-24 18:22:29 +01:00
OS::get_singleton()->print(" -q, --quit Quit after the first iteration.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" -l, --language <locale> Use a specific locale (<locale> being a two-letter code).\n");
OS::get_singleton()->print(" --path <directory> Path to a project (<directory> must contain a 'project.godot' file).\n");
Made directory scan optional
2017-10-10 14:45:54 +02:00
OS::get_singleton()->print(" -u, --upwards Scan folders upwards for project.godot file.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" --main-pack <file> Path to a pack (.pck) file to load.\n");
OS::get_singleton()->print(" --render-thread <mode> Render thread mode ('unsafe', 'safe', 'separate').\n");
OS::get_singleton()->print(" --remote-fs <address> Remote filesystem (<host/IP>[:<port>] address).\n");
OS::get_singleton()->print(" --remote-fs-password <password> Password for remote filesystem.\n");
OS::get_singleton()->print(" --audio-driver <driver> Audio driver (");
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
if (i != 0)
OS::get_singleton()->print(", ");
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_audio_driver_name(i));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(").\n");
OS::get_singleton()->print(" --video-driver <driver> Video driver (");
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
if (i != 0)
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->print(", ");
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_video_driver_name(i));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(").\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
#ifndef SERVER_ENABLED
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Display options:\n");
OS::get_singleton()->print(" -f, --fullscreen Request fullscreen mode.\n");
OS::get_singleton()->print(" -m, --maximized Request a maximized window.\n");
OS::get_singleton()->print(" -w, --windowed Request windowed mode.\n");
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
OS::get_singleton()->print(" -t, --always-on-top Request an always-on-top window.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" --resolution <W>x<H> Request window resolution.\n");
OS::get_singleton()->print(" --position <X>,<Y> Request window position.\n");
Merged docs and small correction to lowdpi feature (it supports windows now)
2017-09-12 16:40:18 +02:00
OS::get_singleton()->print(" --low-dpi Force low-DPI mode (macOS and Windows only).\n");
Implement no-window mode for X11 and MacOS Bonus: Homogeinize and improve OS::alert() for no-window mode
2020-09-23 13:43:51 +02:00
OS::get_singleton()->print(" --no-window Run with invisible window. Useful together with --script.\n");
Added support for vertical syncing via the Windows OS compositor (DWM.)
2019-11-07 03:18:55 +01:00
OS::get_singleton()->print(" --enable-vsync-via-compositor When vsync is enabled, vsync via the OS' window compositor (Windows only).\n");
OS::get_singleton()->print(" --disable-vsync-via-compositor Disable vsync via the OS' window compositor (Windows only).\n");
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
OS::get_singleton()->print(" --tablet-driver Tablet input driver (");
for (int i = 0; i < OS::get_singleton()->get_tablet_driver_count(); i++) {
if (i != 0)
OS::get_singleton()->print(", ");
[3.2] Block WM_MOUSEMOVE during Windows Ink pen handling.
2020-05-22 09:44:23 +02:00
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_tablet_driver_name(i).utf8().get_data());
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
}
OS::get_singleton()->print(") (Windows only).\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("\n");
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
#endif
Revert "Second take at making command-line arguments more UNIX-like + main.cpp and help cleanup"
2017-08-19 22:47:27 +02:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Debug options:\n");
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(" -d, --debug Debug (local stdout debugger).\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" -b, --breakpoints Breakpoint list as source::line comma-separated pairs, no spaces (use %%20 instead).\n");
OS::get_singleton()->print(" --profiling Enable profiling in the script debugger.\n");
OS::get_singleton()->print(" --remote-debug <address> Remote debug (<host/IP>:<port> address).\n");
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
#if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED)
OS::get_singleton()->print(" --debug-collisions Show collision shapes when running the scene.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print(" --debug-navigation Show navigation polygons when running the scene.\n");
#endif
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(" --frame-delay <ms> Simulate high CPU load (delay each frame by <ms> milliseconds).\n");
OS::get_singleton()->print(" --time-scale <scale> Force time scale (higher values are faster, 1.0 is normal speed).\n");
Renderer/Simulator flags Now hopefully with correct code style
2017-08-30 12:40:35 +02:00
OS::get_singleton()->print(" --disable-render-loop Disable render loop so rendering only occurs when called explicitly from script.\n");
Added a crash handler to dump the backtrace on Windows, Linux and OS X
2017-09-08 03:01:49 +02:00
OS::get_singleton()->print(" --disable-crash-handler Disable crash handler when supported by the platform code.\n");
Fix typo in fixed-fps help line
2017-09-24 20:24:41 +02:00
OS::get_singleton()->print(" --fixed-fps <fps> Force a fixed number of frames per second. This setting disables real-time synchronization.\n");
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
OS::get_singleton()->print(" --print-fps Print the frames per second to the stdout.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("\n");
OS::get_singleton()->print("Standalone tools:\n");
OS::get_singleton()->print(" -s, --script <script> Run a script.\n");
Add cli paramerter --check-only for script parsing
2018-05-31 00:23:23 +02:00
OS::get_singleton()->print(" --check-only Only parse for errors and quit (use with --script).\n");
Revert "Second take at making command-line arguments more UNIX-like + main.cpp and help cleanup"
2017-08-19 22:47:27 +02:00
#ifdef TOOLS_ENABLED
Export: Improve usability of command line interface I'm barely scratching the surface of the changes needed to make the --export command line interface easy to use, but this should already improve things somewhat. - Streamline `can_export()` templates check in all platforms, checking first for the presence of official templates, then of any defined custom template, and reporting on the absence of any. Shouldn't change the actual return value much which is still true if either release or debug is usable - we might want to change that eventually and better validate against the requested target. - Fix discrepancy between platforms using `custom_package/debug` and `custom_template/debug` (resp. `release`). All now use `custom_template`, which will break compatibility for `export_presets.cfg` with earlier projects (but is easy to fix). - Use `can_export()` when attempting a command line export and report the same errors that would be shown in the editor. - Improve error reporting after a failed export attempt, handling missing template and invalid path more gracefully. - Cleanup of unused stuff in EditorNode around the export workflow. - Improve --export documentation in --help a bit. Fixes #16949 (at least many of the misunderstandings listed there). Fixes #18470.
2020-01-07 13:29:02 +01:00
OS::get_singleton()->print(" --export <preset> <path> Export the project using the given preset and matching release template. The preset name should match one defined in export_presets.cfg.\n");
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
OS::get_singleton()->print(" <path> should be absolute or relative to the project directory, and include the filename for the binary (e.g. 'builds/game.exe'). The target directory should exist.\n");
Export: Improve usability of command line interface I'm barely scratching the surface of the changes needed to make the --export command line interface easy to use, but this should already improve things somewhat. - Streamline `can_export()` templates check in all platforms, checking first for the presence of official templates, then of any defined custom template, and reporting on the absence of any. Shouldn't change the actual return value much which is still true if either release or debug is usable - we might want to change that eventually and better validate against the requested target. - Fix discrepancy between platforms using `custom_package/debug` and `custom_template/debug` (resp. `release`). All now use `custom_template`, which will break compatibility for `export_presets.cfg` with earlier projects (but is easy to fix). - Use `can_export()` when attempting a command line export and report the same errors that would be shown in the editor. - Improve error reporting after a failed export attempt, handling missing template and invalid path more gracefully. - Cleanup of unused stuff in EditorNode around the export workflow. - Improve --export documentation in --help a bit. Fixes #16949 (at least many of the misunderstandings listed there). Fixes #18470.
2020-01-07 13:29:02 +01:00
OS::get_singleton()->print(" --export-debug <preset> <path> Same as --export, but using the debug template.\n");
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
OS::get_singleton()->print(" --export-pack <preset> <path> Same as --export, but only export the game pack for the given preset. The <path> extension determines whether it will be in PCK or ZIP format.\n");
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
OS::get_singleton()->print(" --doctool [<path>] Dump the engine API reference to the given <path> (defaults to current dir) in XML format, merging if existing files are found.\n");
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
OS::get_singleton()->print(" --no-docbase Disallow dumping the base types (used with --doctool).\n");
Ignore command line --build-solutions when not editing project This option is meant to use together with `--path` or from a project folder. Otherwise the project manager is opened and the option triggers a crash. Fixes #25589.
2020-01-13 13:55:54 +01:00
OS::get_singleton()->print(" --build-solutions Build the scripting solutions (e.g. for C# projects). Implies --editor and requires a valid project to edit.\n");
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
#ifdef DEBUG_METHODS_ENABLED
OS::get_singleton()->print(" --gdnative-generate-json-api Generate JSON dump of the Godot API for GDNative bindings.\n");
#endif
OS::get_singleton()->print(" --test <test> Run a unit test (");
const char **test_names = tests_get_names();
const char *comma = "";
while (*test_names) {
OS::get_singleton()->print("%s'%s'", comma, *test_names);
test_names++;
comma = ", ";
}
OS::get_singleton()->print(").\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
}
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
/* Engine initialization
*
* Consists of several methods that are called by each platform's specific main(argc, argv).
* To fully understand engine init, one should therefore start from the platform's main and
* see how it calls into the Main class' methods.
*
* The initialization is typically done in 3 steps (with the setup2 step triggered either
* automatically by setup, or manually in the platform's main).
*
* - setup(execpath, argc, argv, p_second_phase) is the main entry point for all platforms,
* responsible for the initialization of all low level singletons and core types, and parsing
* command line arguments to configure things accordingly.
* If p_second_phase is true, it will chain into setup2() (default behaviour). This is
* disabled on some platforms (Android, iOS, UWP) which trigger the second step in their
* own time.
*
* - setup2(p_main_tid_override) registers high level servers and singletons, displays the
* boot splash, then registers higher level types (scene, editor, etc.).
*
* - start() is the last step and that's where command line tools can run, or the main loop
* can be created eventually and the project settings put into action. That's also where
* the editor node is created, if relevant.
* start() does it own argument parsing for a subset of the command line arguments described
* in help, it's a bit messy and should be globalized with the setup() parsing somehow.
*/
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
2017-03-05 16:44:50 +01:00
Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_phase) {
Improve robustness of atomics And fix increment in `CowData` not being conditional anymore after the recent changes. Co-authored-by: Hein-Pieter van Braam-Stewart <hp@tmm.cx>
2021-02-18 23:31:34 +01:00
#if defined(DEBUG_ENABLED) && !defined(NO_THREADS)
check_lockless_atomics();
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
RID_OwnerBase::init_rid();
OS::get_singleton()->initialize_core();
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
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
2017-03-05 16:44:50 +01:00
engine = memnew(Engine);
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: Initialize CORE");
register_core_types();
register_core_driver_types();
MAIN_PRINT("Main: Initialize Globals");
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
globals = memnew(ProjectSettings);
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
2017-03-05 16:44:50 +01:00
input_map = memnew(InputMap);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Changed most project settings in the engine, so they have major and minor categories. -Changed SectionedPropertyEditor to support this -Renamed Globals singleton to GlobalConfig, makes more sense. -Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
2017-01-05 13:16:00 +01:00
register_core_settings(); //here globals is present
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
translation_server = memnew(TranslationServer);
performance = memnew(Performance);
Adds 'exposed' field to ClassInfo This field represents if the class is exposed to the scripting API. The value is 'true' if the class was registered manually ('ClassDB::register_*class()'), otherwise it's false (registered on '_post_initialize'). - Added missing registration of classes that are meant to be exposed.
2017-10-09 23:49:17 +02:00
ClassDB::register_class<Performance>();
Move singleton management from ProjectSettings to Engine
2017-11-13 21:46:57 +01:00
engine->add_singleton(Engine::Singleton("Performance", performance));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Revert "Add godot version in backtrace message"
2019-07-01 13:58:57 +02:00
GLOBAL_DEF("debug/settings/crash_handler/message", String("Please include this when reporting the bug on https://github.com/godotengine/godot/issues"));
Added a crash handler to dump the backtrace on Windows, Linux and OS X
2017-09-08 03:01:49 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: Parse CMDLine");
/* argument parsing and main creation */
List<String> args;
List<String> main_args;
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < argc; i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix #19 Can't open project (with non-ASCII path) In `class OS_Unix` the arguments in the `execute` method are converted to UTF-8, but in the `main` program's method they're inserted into a wide-char `Vector` before translating them from UTF-8 and thus the non-ASCII characters are lost. This fix converts the `argv` elements to UTF-8 using `String::utf8` before inserting them in the `Vector`.
2014-02-18 14:37:22 +01:00
args.push_back(String::utf8(argv[i]));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
List<String>::Element *I = args.front();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
I = args.front();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
while (I) {
Fix and expose String::strip_escapes(), use it in LineEdit paste Supersedes #27736.
2019-05-31 15:27:53 +02:00
I->get() = unescape_cmdline(I->get().strip_edges());
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
2017-03-05 16:44:50 +01:00
I = I->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
I = args.front();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
String video_driver = "";
String audio_driver = "";
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
String tablet_driver = "";
Change reused variable name in command line parsing
2018-05-12 13:21:26 +02:00
String project_path = ".";
Made directory scan optional
2017-10-10 14:45:54 +02:00
bool upwards = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String debug_mode;
String debug_host;
Adds skip-breakpoints feature
2019-07-29 20:09:22 +02:00
bool skip_breakpoints = false;
Misc Fixes ========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
2014-06-28 04:21:45 +02:00
String main_pack;
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
2017-03-05 16:44:50 +01:00
bool quiet_stdout = false;
int rtm = -1;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String remotefs;
String remotefs_pass;
Vector<String> breakpoints;
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
2017-03-05 16:44:50 +01:00
bool use_custom_res = true;
bool force_res = false;
Added support for vertical syncing via the Windows OS compositor (DWM.)
2019-11-07 03:18:55 +01:00
bool saw_vsync_via_compositor_override = false;
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
#ifdef TOOLS_ENABLED
Allow running with a custom resource without a main scene After 3f8a4cc7193e964f716fde2cd28a946669e2d8d6 trying to run an individual scene on a project without a main scene fails. We move the check until after we've determined whether or not we're trying to run an individual scene. We also stop trying to show the project manager if any game pack is found at all, unless the user explicitly asks for the project manager to be shown.
2018-02-26 17:16:29 +01:00
bool found_project = false;
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Misc Fixes ========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
2014-06-28 04:21:45 +02:00
packed_data = PackedData::get_singleton();
if (!packed_data)
packed_data = memnew(PackedData);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#ifdef MINIZIP_ENABLED
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fix segment violation MINIZIP_ENABLED
2015-05-07 01:37:25 +02:00
//XXX: always get_singleton() == 0x0
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
zip_packed_data = ZipArchive::get_singleton();
Fix segment violation MINIZIP_ENABLED
2015-05-07 01:37:25 +02:00
//TODO: remove this temporary fix
if (!zip_packed_data) {
zip_packed_data = memnew(ZipArchive);
}
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
packed_data->add_pack_source(zip_packed_data);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
I = args.front();
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
2017-03-05 16:44:50 +01:00
while (I) {
Ignore process serial number (`-psn_...`) command line argument passed by macOS Gatekeeper. (cherry picked from commit e92a14ac5fa8e4fea3254e87b3449302bed3e6dd)
2020-04-09 19:06:43 +02:00
#ifdef OSX_ENABLED
// Ignore the process serial number argument passed by macOS Gatekeeper.
// Otherwise, Godot would try to open a non-existent project on the first start and abort.
if (I->get().begins_with("-psn_")) {
I = I->next();
continue;
}
#endif
update EditorDirDialog on external change, closes #4629
2016-06-18 21:03:00 +02:00
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
2017-03-05 16:44:50 +01:00
List<String>::Element *N = I->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
if (I->get() == "-h" || I->get() == "--help" || I->get() == "/?") { // display help
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
show_help = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
remove trailing whitespace
2016-03-09 00:00:52 +01:00
main: Add --version switch and git hash to --help Also fix some help strings.
2017-09-24 11:32:05 +02:00
} else if (I->get() == "--version") {
print_line(get_full_version_string());
goto error;
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
} else if (I->get() == "-v" || I->get() == "--verbose") { // verbose output
OS::get_singleton()->_verbose_stdout = true;
} else if (I->get() == "--quiet") { // quieter output
quiet_stdout = true;
} else if (I->get() == "--audio-driver") { // audio driver
if (I->next()) {
audio_driver = I->next()->get();
Validate audio/video driver command-line arguments This will exit early if the audio/video driver specified doesn't exist.
2019-09-27 15:06:15 +02:00
bool found = false;
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
if (audio_driver == OS::get_singleton()->get_audio_driver_name(i)) {
found = true;
}
}
if (!found) {
OS::get_singleton()->print("Unknown audio driver '%s', aborting.\nValid options are ", audio_driver.utf8().get_data());
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
if (i == OS::get_singleton()->get_audio_driver_count() - 1) {
OS::get_singleton()->print(" and ");
} else if (i != 0) {
OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_audio_driver_name(i));
}
OS::get_singleton()->print(".\n");
goto error;
}
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
N = I->next()->next();
} else {
OS::get_singleton()->print("Missing audio driver argument, aborting.\n");
goto error;
}
} else if (I->get() == "--video-driver") { // force video driver
if (I->next()) {
video_driver = I->next()->get();
Validate audio/video driver command-line arguments This will exit early if the audio/video driver specified doesn't exist.
2019-09-27 15:06:15 +02:00
bool found = false;
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
if (video_driver == OS::get_singleton()->get_video_driver_name(i)) {
found = true;
}
}
if (!found) {
OS::get_singleton()->print("Unknown video driver '%s', aborting.\nValid options are ", video_driver.utf8().get_data());
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
if (i == OS::get_singleton()->get_video_driver_count() - 1) {
OS::get_singleton()->print(" and ");
} else if (i != 0) {
OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s'", OS::get_singleton()->get_video_driver_name(i));
}
OS::get_singleton()->print(".\n");
goto error;
}
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
N = I->next()->next();
} else {
OS::get_singleton()->print("Missing video driver argument, aborting.\n");
goto error;
}
#ifndef SERVER_ENABLED
} else if (I->get() == "-f" || I->get() == "--fullscreen") { // force fullscreen
init_fullscreen = true;
} else if (I->get() == "-m" || I->get() == "--maximized") { // force maximized window
init_maximized = true;
video_mode.maximized = true;
} else if (I->get() == "-w" || I->get() == "--windowed") { // force windowed window
init_windowed = true;
} else if (I->get() == "-t" || I->get() == "--always-on-top") { // force always-on-top window
init_always_on_top = true;
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--resolution") { // force resolution
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
String vm = I->next()->get();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
if (vm.find("x") == -1) { // invalid parameter format
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Invalid resolution '%s', it should be e.g. '1280x720'.\n", vm.utf8().get_data());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
int w = vm.get_slice("x", 0).to_int();
int h = vm.get_slice("x", 1).to_int();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
if (w <= 0 || h <= 0) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Invalid resolution '%s', width and height must be above 0.\n", vm.utf8().get_data());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
video_mode.width = w;
video_mode.height = h;
force_res = true;
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing resolution argument, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--position") { // set window position
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
String vm = I->next()->get();
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
if (vm.find(",") == -1) { // invalid parameter format
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Invalid position '%s', it should be e.g. '80,128'.\n", vm.utf8().get_data());
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
goto error;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
int x = vm.get_slice(",", 0).to_int();
int y = vm.get_slice(",", 1).to_int();
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
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
2017-03-05 16:44:50 +01:00
init_custom_pos = Point2(x, y);
init_use_custom_pos = true;
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing position argument, aborting.\n");
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
goto error;
}
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
} else if (I->get() == "--low-dpi") { // force low DPI (macOS only)
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
force_lowdpi = true;
Implement no-window mode for X11 and MacOS Bonus: Homogeinize and improve OS::alert() for no-window mode
2020-09-23 13:43:51 +02:00
} else if (I->get() == "--no-window") { // run with an invisible window
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
OS::get_singleton()->set_no_window_mode(true);
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
} else if (I->get() == "--tablet-driver") {
if (I->next()) {
tablet_driver = I->next()->get();
bool found = false;
for (int i = 0; i < OS::get_singleton()->get_tablet_driver_count(); i++) {
if (tablet_driver == OS::get_singleton()->get_tablet_driver_name(i)) {
found = true;
}
}
Add support for the WinTab API for pen input. (3.2)
2020-05-05 13:53:30 +02:00
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
if (!found) {
OS::get_singleton()->print("Unknown tablet driver '%s', aborting.\n", tablet_driver.utf8().get_data());
goto error;
}
N = I->next()->next();
} else {
OS::get_singleton()->print("Missing tablet driver argument, aborting.\n");
goto error;
}
Added support for vertical syncing via the Windows OS compositor (DWM.)
2019-11-07 03:18:55 +01:00
} else if (I->get() == "--enable-vsync-via-compositor") {
video_mode.vsync_via_compositor = true;
saw_vsync_via_compositor_override = true;
} else if (I->get() == "--disable-vsync-via-compositor") {
video_mode.vsync_via_compositor = false;
saw_vsync_via_compositor_override = true;
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
#endif
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--profiling") { // enable profiling
-added windowed mode with -w, fixes #3020 -changed default windowed resolution to 1280x720
2015-12-12 16:06:53 +01:00
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
2017-03-05 16:44:50 +01:00
use_debug_profiler = true;
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "-l" || I->get() == "--language") { // language
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
locale = I->next()->get();
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing language argument, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
-Some fixes to OSX retina scaling for window functions -Implemented HiDPI detection and support for Godot Editor!
2016-05-30 05:28:29 +02:00
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--remote-fs") { // remote filesystem
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
remotefs = I->next()->get();
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing remote filesystem address, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--remote-fs-password") { // remote filesystem password
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
remotefs_pass = I->next()->get();
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing remote filesystem password, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--render-thread") { // render thread mode
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
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;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing render thread mode argument, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#ifdef TOOLS_ENABLED
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "-e" || I->get() == "--editor") { // starts editor
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
editor = true;
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
} else if (I->get() == "-p" || I->get() == "--project-manager") { // starts project manager
project_manager = true;
Added an auto quit and auto build flag to the command line options.
2018-02-14 16:23:04 +01:00
} else if (I->get() == "--build-solutions") { // Build the scripting solution such C#
auto_build_solutions = true;
The build-solutions flag now forces editor mode.
2018-06-16 00:08:59 +02:00
editor = true;
Register as an editor instance when generating the GDNative API JSON This enables the automatic GLES2 fallback if the hardware doesn't support the GLES3 backend. This closes #27768.
2019-08-19 16:14:58 +02:00
#ifdef DEBUG_METHODS_ENABLED
} else if (I->get() == "--gdnative-generate-json-api") {
// Register as an editor instance to use the GLES2 fallback automatically on hardware that doesn't support the GLES3 backend
editor = true;
// We still pass it to the main arguments since the argument handling itself is not done in this function
main_args.push_back(I->get());
#endif
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
} else if (I->get() == "--export" || I->get() == "--export-debug" || I->get() == "--export-pack") { // Export project
Ensure --export implies --editor Fixes #30149
2019-06-28 14:34:09 +02:00
editor = true;
main_args.push_back(I->get());
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#endif
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--path") { // set path of project to start or edit
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String p = I->next()->get();
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
2017-03-05 16:44:50 +01:00
if (OS::get_singleton()->set_cwd(p) == OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//nothing
} else {
Change reused variable name in command line parsing
2018-05-12 13:21:26 +02:00
project_path = I->next()->get(); //use project_path instead
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing relative or absolute path, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Made directory scan optional
2017-10-10 14:45:54 +02:00
} else if (I->get() == "-u" || I->get() == "--upwards") { // scan folders upwards
upwards = true;
Add --quit option to help output and update manpage
2018-02-24 18:22:29 +01:00
} else if (I->get() == "-q" || I->get() == "--quit") { // Auto quit at the end of the first main loop iteration
Added an auto quit and auto build flag to the command line options.
2018-02-14 16:23:04 +01:00
auto_quit = true;
Rename project file to "project.godot" Slimmed down variant from the reverted #8375. The rationale behind the name change is to give Godot's project file a unique extension (".godot") that can be registered on the OS to be associated with the Godot binary (OS registration not implemented here). This PR also adds the possibility to start the game or editor if launched with the project.godot passed as argument, which paves the way for allowing a similar behaviour on a double-click in the OS file manager (code originally by @Hinsbart). Closes #6915.
2017-05-01 17:44:52 +02:00
} else if (I->get().ends_with("project.godot")) {
String path;
String file = I->get();
int sep = MAX(file.find_last("/"), file.find_last("\\"));
if (sep == -1)
path = ".";
else {
path = file.substr(0, sep);
}
if (OS::get_singleton()->set_cwd(path) == OK) {
// path already specified, don't override
} else {
Change reused variable name in command line parsing
2018-05-12 13:21:26 +02:00
project_path = path;
Rename project file to "project.godot" Slimmed down variant from the reverted #8375. The rationale behind the name change is to give Godot's project file a unique extension (".godot") that can be registered on the OS to be associated with the Godot binary (OS registration not implemented here). This PR also adds the possibility to start the game or editor if launched with the project.godot passed as argument, which paves the way for allowing a similar behaviour on a double-click in the OS file manager (code originally by @Hinsbart). Closes #6915.
2017-05-01 17:44:52 +02:00
}
#ifdef TOOLS_ENABLED
editor = true;
#endif
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "-b" || I->get() == "--breakpoints") { // add breakpoints
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
String bplist = I->next()->get();
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
2017-03-05 16:44:50 +01:00
breakpoints = bplist.split(",");
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing list of breakpoints, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--frame-delay") { // force frame delay
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
frame_delay = I->next()->get().to_int();
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing frame delay argument, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--time-scale") { // force time scale
Fixed too many little issues, check the issues closed today.
2014-09-21 06:43:42 +02:00
if (I->next()) {
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
Engine::get_singleton()->set_time_scale(I->next()->get().to_double());
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
Fixed too many little issues, check the issues closed today.
2014-09-21 06:43:42 +02:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing time scale argument, aborting.\n");
Fixed too many little issues, check the issues closed today.
2014-09-21 06:43:42 +02:00
goto error;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--main-pack") {
Misc Fixes ========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
2014-06-28 04:21:45 +02:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
main_pack = I->next()->get();
Misc Fixes ========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
2014-06-28 04:21:45 +02:00
N = I->next()->next();
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing path to main pack file, aborting.\n");
Misc Fixes ========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
2014-06-28 04:21:45 +02:00
goto error;
};
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "-d" || I->get() == "--debug") {
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
2017-03-05 16:44:50 +01:00
debug_mode = "local";
Keep debug & verbose options after loading project from project manager (cherry picked from commit b2d27214aa0bee3cf0dc091846bf087e007c9607)
2020-07-09 09:32:42 +02:00
OS::get_singleton()->_debug_stdout = true;
Hide non-applicable CLI arguments in the server platform This refactors some of the CLI parsing code to follow the CLI help's order, making it easier to toggle using compile-time defines.
2019-05-19 01:33:13 +02:00
#if defined(DEBUG_ENABLED) && !defined(SERVER_ENABLED)
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--debug-collisions") {
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
2017-03-05 16:44:50 +01:00
debug_collisions = true;
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--debug-navigation") {
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
2017-03-05 16:44:50 +01:00
debug_navigation = true;
Optimize-out some debug and/or non-tools methods Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
2017-04-07 16:17:16 +02:00
#endif
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (I->get() == "--remote-debug") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (I->next()) {
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
2017-03-05 16:44:50 +01:00
debug_mode = "remote";
debug_host = I->next()->get();
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
if (debug_host.find(":") == -1) { // wrong address
OS::get_singleton()->print("Invalid debug host address, it should be of the form <host/IP>:<port>.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
HTML5 exporter Improvements -Better template handling -Voice support -Stream support
2015-09-10 05:10:54 +02:00
}
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing remote debug host address, aborting.\n");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
goto error;
Improve debug focus behavior Fix focusing debugged game on Windows Add re-focusing editor on continue
2016-09-14 04:02:18 +02:00
}
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (I->get() == "--allow_focus_steal_pid") { // not exposed to user
Improve debug focus behavior Fix focusing debugged game on Windows Add re-focusing editor on continue
2016-09-14 04:02:18 +02:00
if (I->next()) {
simplify the way window is allowed to steal focus, no longer relying on project.godot. Closes #9459
2017-08-21 04:42:54 +02:00
allow_focus_steal_pid = I->next()->get().to_int64();
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
2017-03-05 16:44:50 +01:00
N = I->next()->next();
Improve debug focus behavior Fix focusing debugged game on Windows Add re-focusing editor on continue
2016-09-14 04:02:18 +02:00
} else {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->print("Missing editor PID argument, aborting.\n");
Improve debug focus behavior Fix focusing debugged game on Windows Add re-focusing editor on continue
2016-09-14 04:02:18 +02:00
goto error;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Renderer/Simulator flags Now hopefully with correct code style
2017-08-30 12:40:35 +02:00
} else if (I->get() == "--disable-render-loop") {
disable_render_loop = true;
} else if (I->get() == "--fixed-fps") {
if (I->next()) {
fixed_fps = I->next()->get().to_int();
N = I->next()->next();
} else {
OS::get_singleton()->print("Missing fixed-fps argument, aborting.\n");
goto error;
}
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
} else if (I->get() == "--print-fps") {
print_fps = true;
Added a crash handler to dump the backtrace on Windows, Linux and OS X
2017-09-08 03:01:49 +02:00
} else if (I->get() == "--disable-crash-handler") {
OS::get_singleton()->disable_crash_handler();
Adds skip-breakpoints feature
2019-07-29 20:09:22 +02:00
} else if (I->get() == "--skip-breakpoints") {
skip_breakpoints = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Remove dead branch in command line logic
2018-05-12 12:51:41 +02:00
main_args.push_back(I->get());
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
I = N;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Main: Prevent Project Manager-ception in editor Fixes #34904.
2020-01-10 09:48:03 +01:00
#ifdef TOOLS_ENABLED
if (editor && project_manager) {
OS::get_singleton()->print("Error: Command line arguments implied opening both editor and project manager, which is not possible. Aborting.\n");
goto error;
}
#endif
Fix deploy with network filesystem Also make some prints only happen in verbose mode.
2018-11-08 18:42:41 +01:00
// Network file system needs to be configured before globals, since globals are based on the
// 'project.godot' file which will only be available through the network if this is enabled
FileAccessNetwork::configure();
if (remotefs != "") {
file_access_network_client = memnew(FileAccessNetworkClient);
int port;
if (remotefs.find(":") != -1) {
port = remotefs.get_slicec(':', 1).to_int();
remotefs = remotefs.get_slicec(':', 0);
} else {
port = 6010;
}
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);
goto error;
}
FileAccess::make_default<FileAccessNetwork>(FileAccess::ACCESS_RESOURCES);
}
Change reused variable name in command line parsing
2018-05-12 13:21:26 +02:00
if (globals->setup(project_path, main_pack, upwards) == OK) {
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
#ifdef TOOLS_ENABLED
Fix debugger_stdout_settings being ignored
2018-03-15 12:22:10 +01:00
found_project = true;
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
#endif
Fix debugger_stdout_settings being ignored
2018-03-15 12:22:10 +01:00
} else {
#ifdef TOOLS_ENABLED
editor = false;
#else
Improve the error message displayed when the PCK file can't be found This explains what to do if the executable was renamed, which is helpful for people exporting projects.
2020-01-28 00:10:31 +01:00
const String error_msg = "Error: Couldn't load project data at path \"" + project_path + "\". Is the .pck file missing?\nIf you've renamed the executable, the associated .pck file should also be renamed to match the executable's name (without the extension).\n";
Fix -Wsuggest-attribute=format warnings.
2019-02-22 15:38:49 +01:00
OS::get_singleton()->print("%s", error_msg.ascii().get_data());
Show an alert when a project is not found in release mode Previously, an error message would get printed to the console, but this is problematic in e.g. Windows where a console is not displayed. In the case of a missing .pck file, the binary would just silently fail. Now, it shows an alert. Fixes #21994.
2018-10-15 17:50:29 +02:00
OS::get_singleton()->alert(error_msg);
Fix debugger_stdout_settings being ignored
2018-03-15 12:22:10 +01:00
goto error;
#endif
}
Main: Create user data dir in `setup()` Custom backport of #39563 with preliminary change to make `OS::ensure_user_data_dir()` public as done in f8a79a9. Fixes #32488.
2021-01-08 10:24:41 +01:00
// Initialize user data dir.
OS::get_singleton()->ensure_user_data_dir();
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
GLOBAL_DEF("memory/limits/multithreaded_server/rid_pool_prealloc", 60);
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("memory/limits/multithreaded_server/rid_pool_prealloc", PropertyInfo(Variant::INT, "memory/limits/multithreaded_server/rid_pool_prealloc", PROPERTY_HINT_RANGE, "0,500,1")); // No negative and limit to 500 due to crashes
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
GLOBAL_DEF("network/limits/debugger_stdout/max_chars_per_second", 2048);
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/debugger_stdout/max_chars_per_second", PropertyInfo(Variant::INT, "network/limits/debugger_stdout/max_chars_per_second", PROPERTY_HINT_RANGE, "0, 4096, 1, or_greater"));
Limit number of errors and messages sent by runner
2018-01-03 17:04:10 +01:00
GLOBAL_DEF("network/limits/debugger_stdout/max_messages_per_frame", 10);
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/debugger_stdout/max_messages_per_frame", PropertyInfo(Variant::INT, "network/limits/debugger_stdout/max_messages_per_frame", PROPERTY_HINT_RANGE, "0, 20, 1, or_greater"));
Cap the number of warnings/errors per second rather than per frame This reproduces the behavior used for printing when using the remote debugger. The default limit is 100 errors and 100 warnings per second, which makes it possible to display much more GDScript warnings before overflowing. This also adds a "Too many warnings" message, so that warnings don't look like errors when overflowing anymore. This closes #21896.
2019-07-31 17:24:53 +02:00
GLOBAL_DEF("network/limits/debugger_stdout/max_errors_per_second", 100);
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/debugger_stdout/max_errors_per_second", PropertyInfo(Variant::INT, "network/limits/debugger_stdout/max_errors_per_second", PROPERTY_HINT_RANGE, "0, 200, 1, or_greater"));
GLOBAL_DEF("network/limits/debugger_stdout/max_warnings_per_second", 100);
ProjectSettings::get_singleton()->set_custom_property_info("network/limits/debugger_stdout/max_warnings_per_second", PropertyInfo(Variant::INT, "network/limits/debugger_stdout/max_warnings_per_second", PROPERTY_HINT_RANGE, "0, 200, 1, or_greater"));
-Changed most project settings in the engine, so they have major and minor categories. -Changed SectionedPropertyEditor to support this -Renamed Globals singleton to GlobalConfig, makes more sense. -Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
2017-01-05 13:16:00 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (debug_mode == "remote") {
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
2017-03-05 16:44:50 +01:00
ScriptDebuggerRemote *sdr = memnew(ScriptDebuggerRemote);
Fix `network/debug/remote_port` editor setting not working properly
2017-06-10 16:28:18 +02:00
uint16_t debug_port = 6007;
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
2017-03-05 16:44:50 +01:00
if (debug_host.find(":") != -1) {
Allow selecting editor debug host and port. Possibly fixes various editor<->debugger connection related problems.
2017-05-08 22:22:28 +02:00
int sep_pos = debug_host.find_last(":");
debug_port = debug_host.substr(sep_pos + 1, debug_host.length()).to_int();
debug_host = debug_host.substr(0, sep_pos);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
Error derr = sdr->connect_to_host(debug_host, debug_port);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Adds skip-breakpoints feature
2019-07-29 20:09:22 +02:00
sdr->set_skip_breakpoints(skip_breakpoints);
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
2017-03-05 16:44:50 +01:00
if (derr != OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(sdr);
} else {
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
2017-03-05 16:44:50 +01:00
script_debugger = sdr;
Fix debugger not getting focused on break on Windows This is a revert of 9d78274e068d4928044220c4d5c1a7baed423670, which was an attempt to fix #21431, but in the end it seems a different problem was the root of the issue. Renewing focus steal allowance every time is needed on Windows.
2020-07-21 01:09:17 +02:00
sdr->set_allow_focus_steal_pid(allow_focus_steal_pid);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
} else if (debug_mode == "local") {
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
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
2017-03-05 16:44:50 +01:00
script_debugger = memnew(ScriptDebuggerLocal);
Local debugger fixes and extensions - Adds q/quit option to console debugging - Adds options (variable_prefix) - Breaks into debugger with Ctrl-C in local debug mode (Unix/Windows) - Added option to list all breakpoints - Fixes add/remove breakpoint bug (invalid path parsing) - Minor cleanup
2018-02-11 12:08:37 +01:00
OS::get_singleton()->initialize_debugging();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
if (script_debugger) {
//there is a debugger, parse breakpoints
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < breakpoints.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String bp = breakpoints[i];
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
2017-03-05 16:44:50 +01:00
int sp = bp.find_last(":");
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_CONTINUE_MSG(sp == -1, "Invalid breakpoint: '" + bp + "', expected file:line format.");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
#ifdef TOOLS_ENABLED
if (editor) {
packed_data->set_disabled(true);
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
globals->set_disable_feature_overrides(true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
#endif
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
#ifdef TOOLS_ENABLED
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (editor) {
Adds editor_hint to Engine class
2017-08-13 16:21:45 +02:00
Engine::get_singleton()->set_editor_hint(true);
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
main_args.push_back("--editor");
Editor: Respect -w command line flag.
2017-12-29 20:10:15 +01:00
if (!init_windowed) {
init_maximized = true;
video_mode.maximized = true;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Main: Prevent Project Manager-ception in editor Fixes #34904.
2020-01-10 09:48:03 +01:00
if (!project_manager && !editor) {
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
// Determine if the project manager should be requested
Allow running with a custom resource without a main scene After 3f8a4cc7193e964f716fde2cd28a946669e2d8d6 trying to run an individual scene on a project without a main scene fails. We move the check until after we've determined whether or not we're trying to run an individual scene. We also stop trying to show the project manager if any game pack is found at all, unless the user explicitly asks for the project manager to be shown.
2018-02-26 17:16:29 +01:00
project_manager = main_args.size() == 0 && !found_project;
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
Add a project setting to enable stdout flushing in release builds This can be used in server builds for journalctl compatibility. (cherry picked from commit 341b9cf15a6df3dae1ba6218b8545feec41fa728) Fixes crash when exiting with --verbose with leaked resources (cherry picked from commit 25c4dacb880724a8e5dec88ca922f57215e153ef)
2020-12-15 14:40:09 +01:00
// Only flush stdout in debug builds by default, as spamming `print()` will
// decrease performance if this is enabled.
Logger: Cache 'flush_stdout_on_print' to improve performance, and works before ProjectSettings starts. ProjectSetting: Now 'application/run/flush_stdout_on_print' requires a restart of the Editor to take effect (cherry picked from commit 89283b7b53d2e2b118cf5afe6d90f0813d37a204)
2021-02-28 23:26:14 +01:00
GLOBAL_DEF_RST("application/run/flush_stdout_on_print", false);
GLOBAL_DEF_RST("application/run/flush_stdout_on_print.debug", true);
Add a project setting to enable stdout flushing in release builds This can be used in server builds for journalctl compatibility. (cherry picked from commit 341b9cf15a6df3dae1ba6218b8545feec41fa728) Fixes crash when exiting with --verbose with leaked resources (cherry picked from commit 25c4dacb880724a8e5dec88ca922f57215e153ef)
2020-12-15 14:40:09 +01:00
Disable file logging for the project manager Due to `user://` returning the current working directory when no project is open, this caused logs to be written to `$HOME` most of the time. This closes #40305. (cherry picked from commit b89dc6ae0051e04f710b66e94454720f321fb14e)
2020-07-12 14:22:06 +02:00
GLOBAL_DEF("logging/file_logging/enable_file_logging", false);
// Only file logging by default on desktop platforms as logs can't be
// accessed easily on mobile/Web platforms (if at all).
// This also prevents logs from being created for the editor instance, as feature tags
// are disabled while in the editor (even if they should logically apply).
GLOBAL_DEF("logging/file_logging/enable_file_logging.pc", true);
GLOBAL_DEF("logging/file_logging/log_path", "user://logs/godot.log");
GLOBAL_DEF("logging/file_logging/max_log_files", 5);
ProjectSettings::get_singleton()->set_custom_property_info("logging/file_logging/max_log_files", PropertyInfo(Variant::INT, "logging/file_logging/max_log_files", PROPERTY_HINT_RANGE, "0,20,1,or_greater")); //no negative numbers
if (!project_manager && !editor && FileAccess::get_create_func(FileAccess::ACCESS_USERDATA) && GLOBAL_GET("logging/file_logging/enable_file_logging")) {
// Don't create logs for the project manager as they would be written to
// the current working directory, which is inconvenient.
String base_path = GLOBAL_GET("logging/file_logging/log_path");
int max_files = GLOBAL_GET("logging/file_logging/max_log_files");
OS::get_singleton()->add_logger(memnew(RotatedFileLogger(base_path, max_files)));
}
Allow running with a custom resource without a main scene After 3f8a4cc7193e964f716fde2cd28a946669e2d8d6 trying to run an individual scene on a project without a main scene fails. We move the check until after we've determined whether or not we're trying to run an individual scene. We also stop trying to show the project manager if any game pack is found at all, unless the user explicitly asks for the project manager to be shown.
2018-02-26 17:16:29 +01:00
if (main_args.size() == 0 && String(GLOBAL_DEF("application/run/main_scene", "")) == "") {
#ifdef TOOLS_ENABLED
if (!editor && !project_manager) {
#endif
OS::get_singleton()->print("Error: Can't run project: no main scene defined.\n");
goto error;
#ifdef TOOLS_ENABLED
}
#endif
}
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
if (editor || project_manager) {
Set editor hint early for Project Manager and Editor We need it in setup() already before initializing the renderer, as it's used to force fallback to GLES2 if GLES3 fails. Fixes #26806.
2019-03-09 01:04:53 +01:00
Engine::get_singleton()->set_editor_hint(true);
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
use_custom_res = false;
Make Input Actions config not affect the editor
2016-06-05 06:19:42 +02:00
input_map->load_default(); //keys for editor
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
} else {
Make Input Actions config not affect the editor
2016-06-05 06:19:42 +02:00
input_map->load_from_globals(); //keys for game
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
}
if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stdout"))) {
quiet_stdout = true;
}
if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stderr"))) {
_print_error_enabled = false;
};
if (quiet_stdout)
_print_line_enabled = false;
Logger: Cache 'flush_stdout_on_print' to improve performance, and works before ProjectSettings starts. ProjectSetting: Now 'application/run/flush_stdout_on_print' requires a restart of the Editor to take effect (cherry picked from commit 89283b7b53d2e2b118cf5afe6d90f0813d37a204)
2021-02-28 23:26:14 +01:00
Logger::set_flush_stdout_on_print(ProjectSettings::get_singleton()->get("application/run/flush_stdout_on_print"));
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
OS::get_singleton()->set_cmdline(execpath, main_args);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix `--help` output, allow renderer override from command line (`--video-driver`).
2018-03-01 22:17:34 +01:00
GLOBAL_DEF("rendering/quality/driver/driver_name", "GLES3");
-Project/Editor settings now use new inspector -Project/Editor settings now show tooltips properly -Settings thar require restart now will show a restart warning -Video driver is now visible all the time, can be changed easily -Added function to request current video driver
2018-07-19 23:58:15 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/driver/driver_name", PropertyInfo(Variant::STRING, "rendering/quality/driver/driver_name", PROPERTY_HINT_ENUM, "GLES2,GLES3"));
Fix `--help` output, allow renderer override from command line (`--video-driver`).
2018-03-01 22:17:34 +01:00
if (video_driver == "") {
Don't force GLES2 in Project Manager, causes issues on macOS. This partially reverts #44041. Also fix the bogus label about lack of GLES3 support being always shown... It was meant to be behind a check but I had left it out while testing, and forgot to put it back.
2020-12-11 17:35:29 +01:00
video_driver = GLOBAL_GET("rendering/quality/driver/driver_name");
Fix `--help` output, allow renderer override from command line (`--video-driver`).
2018-03-01 22:17:34 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Disable driver fallback to GLES2 by default GLES2 is not designed to be a drop-in replacement for the GLES3 backend, so the fallback mode has to be used knowingly. It *can* make sense for simple projects which make sure to handle the differences between both rendering backends, but most users should stick to one supported backend. By making it opt-in, we can now use this parameter to define whether to export ETC textures to Android and iOS when using GLES3 + Fallback. When using GLES3 without Fallback on Android, set the proper min GLES version in the AndroidManifest. Also made the option boolean and renamed it for clarity and to avoid conflict with the previous String option (which would always evaluate as "true" otherwise). Fixes #26569.
2019-03-05 13:46:51 +01:00
GLOBAL_DEF("rendering/quality/driver/fallback_to_gles2", false);
Fall back to GLES2 if GLES3 is not working This adds a static is_viable() method to all rasterizers which has to be called before initializing the rasterizer. This allows us to check what rasterizer to use in OS::initialize together with the GL context initialization. This commit also adds a new project setting "rendering/quality/driver/driver_fallback" which allows the creator of a project to specify whether or not fallback to GLES2 is allowed. This setting is ignored for the editor so the editor will always open even if the project itself cannot run. This will hopefully reduce confusion for users downloading projects from the internet. We also no longer crash when GLES3 is not functioning on a platform. This fixes #15324
2018-08-25 00:04:25 +02:00
Add Nvidia Workaround for GLES3 Ported GLES2 workaround code to GLES3.
2020-05-05 17:25:45 +02:00
// Assigning here, to be sure that it appears in docs
Renaming rendering/2d project settings. The rendering/quality/2d section of project settings is becoming considerably expanded in 3.2.4, and arguably was not the correct place for settings that were not really to do with quality. 3.2.4 is the last sensible opportunity we will have to move these settings, as the only existing one likely to break compatibility in a small way is `pixel_snap`, and given that the whole snapping area is being overhauled we can draw attention to the fact it has changed in the release notes. Class reference is also updated and slightly improved. `pixel_snap` is renamed to `gpu_pixel_snap` in the project settings and code to help differentiate from CPU side transform snapping.
2021-03-01 12:26:11 +01:00
GLOBAL_DEF("rendering/2d/options/use_nvidia_rect_flicker_workaround", false);
GLES2: Make Nvidia flicker workaround opt-in It has a big impact on 2D and text rendering performance (cf. #24466) so the solution seems worse than the bug it aims to work around. It's now opt-in via "rendering/quality/2d/gles2_use_nvidia_rect_flicker_workaround" for those who need it and have a simple enough game for the performance drop not to be an issue. Fixes #24466.
2019-01-14 18:26:41 +01:00
fixes to initialization order
2017-11-09 17:55:51 +01:00
GLOBAL_DEF("display/window/size/width", 1024);
Avoid the window size to go below 0
2018-10-02 14:51:24 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/width", PropertyInfo(Variant::INT, "display/window/size/width", PROPERTY_HINT_RANGE, "0,7680,or_greater")); // 8K resolution
fixes to initialization order
2017-11-09 17:55:51 +01:00
GLOBAL_DEF("display/window/size/height", 600);
Avoid the window size to go below 0
2018-10-02 14:51:24 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/height", PropertyInfo(Variant::INT, "display/window/size/height", PROPERTY_HINT_RANGE, "0,4320,or_greater")); // 8K resolution
fixes to initialization order
2017-11-09 17:55:51 +01:00
GLOBAL_DEF("display/window/size/resizable", true);
GLOBAL_DEF("display/window/size/borderless", false);
GLOBAL_DEF("display/window/size/fullscreen", false);
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
GLOBAL_DEF("display/window/size/always_on_top", false);
fixes to initialization order
2017-11-09 17:55:51 +01:00
GLOBAL_DEF("display/window/size/test_width", 0);
Avoid the window size to go below 0
2018-10-02 14:51:24 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/test_width", PropertyInfo(Variant::INT, "display/window/size/test_width", PROPERTY_HINT_RANGE, "0,7680,or_greater")); // 8K resolution
fixes to initialization order
2017-11-09 17:55:51 +01:00
GLOBAL_DEF("display/window/size/test_height", 0);
Avoid the window size to go below 0
2018-10-02 14:51:24 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/size/test_height", PropertyInfo(Variant::INT, "display/window/size/test_height", PROPERTY_HINT_RANGE, "0,4320,or_greater")); // 8K resolution
fixes to initialization order
2017-11-09 17:55:51 +01:00
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
if (use_custom_res) {
if (!force_res) {
fixes to initialization order
2017-11-09 17:55:51 +01:00
video_mode.width = GLOBAL_GET("display/window/size/width");
video_mode.height = GLOBAL_GET("display/window/size/height");
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
if (globals->has_setting("display/window/size/test_width") && globals->has_setting("display/window/size/test_height")) {
Make possible to use just one "size/test_*" value in the settings
2019-10-04 15:26:02 +02:00
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
int tw = globals->get("display/window/size/test_width");
Make possible to use just one "size/test_*" value in the settings
2019-10-04 15:26:02 +02:00
if (tw > 0) {
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
video_mode.width = tw;
Make possible to use just one "size/test_*" value in the settings
2019-10-04 15:26:02 +02:00
}
int th = globals->get("display/window/size/test_height");
if (th > 0) {
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
video_mode.height = th;
}
}
3D Physics Rework, Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-=- 3D Physics: -Fixed "Bounce" parameter in 3D -Fixed bug affecting Area (sometims it would not detect properly) -Vehicle Body has seen heavy work -Added Query API for doing space queries in 3D. Needs some docs though. -Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up: -PinJoint -HingeJoint (with motor) -SliderJoint -ConeTwistJoint -Generic6DOFJoint -Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions: -input_event (mouse or multitouch input over the body) -mouse_enter (mouse entered the body area) -mouse_exit (mouse exited body area) For Area it needs to be activated manually, as it isn't by default (ray goes thru). Other: -Begun working on Windows 8 (RT) port. Compiles but does not work yet. -Added TheoraPlayer library for improved to-texture and portable video support. -Fixed a few bugs in the renderer, collada importer, collada exporter, etc.
2014-09-15 16:33:30 +02:00
}
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
fixes to initialization order
2017-11-09 17:55:51 +01:00
video_mode.resizable = GLOBAL_GET("display/window/size/resizable");
video_mode.borderless_window = GLOBAL_GET("display/window/size/borderless");
video_mode.fullscreen = GLOBAL_GET("display/window/size/fullscreen");
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
video_mode.always_on_top = GLOBAL_GET("display/window/size/always_on_top");
3D Physics Rework, Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-=- 3D Physics: -Fixed "Bounce" parameter in 3D -Fixed bug affecting Area (sometims it would not detect properly) -Vehicle Body has seen heavy work -Added Query API for doing space queries in 3D. Needs some docs though. -Added JOINTS! Adapted Bullet Joints: and created easy gizmos for setting them up: -PinJoint -HingeJoint (with motor) -SliderJoint -ConeTwistJoint -Generic6DOFJoint -Added OBJECT PICKING! based on the new query API. Any physics object now (Area or Body) has the following signals and virtual functions: -input_event (mouse or multitouch input over the body) -mouse_enter (mouse entered the body area) -mouse_exit (mouse exited body area) For Area it needs to be activated manually, as it isn't by default (ray goes thru). Other: -Begun working on Windows 8 (RT) port. Compiles but does not work yet. -Added TheoraPlayer library for improved to-texture and portable video support. -Fixed a few bugs in the renderer, collada importer, collada exporter, etc.
2014-09-15 16:33:30 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
if (!force_lowdpi) {
OS::get_singleton()->_allow_hidpi = GLOBAL_DEF("display/window/dpi/allow_hidpi", false);
}
Mark the V-Sync project setting to require an editor restart The V-Sync project setting also applies to the editor, but it will only take effect when the editor is restarted.
2019-08-27 23:16:55 +02:00
video_mode.use_vsync = GLOBAL_DEF_RST("display/window/vsync/use_vsync", true);
Fix vsync initialization
2018-06-25 17:17:19 +02:00
OS::get_singleton()->_use_vsync = video_mode.use_vsync;
Added support for vertical syncing via the Windows OS compositor (DWM.)
2019-11-07 03:18:55 +01:00
if (!saw_vsync_via_compositor_override) {
// If one of the command line options to enable/disable vsync via the
// window compositor ("--enable-vsync-via-compositor" or
// "--disable-vsync-via-compositor") was present then it overrides the
// project setting.
Revert "Enable Vsync via Compositor by default" This reverts commit 9600fd5dde1f85b7dd2dd8558d52ff86b18651e7. Add comment warning about possible implications of using this option. Fixes #35038.
2020-01-13 09:27:06 +01:00
video_mode.vsync_via_compositor = GLOBAL_DEF("display/window/vsync/vsync_via_compositor", false);
Added support for vertical syncing via the Windows OS compositor (DWM.)
2019-11-07 03:18:55 +01:00
}
OS::get_singleton()->_vsync_via_compositor = video_mode.vsync_via_compositor;
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
if (tablet_driver == "") { // specified in project.godot
tablet_driver = GLOBAL_DEF_RST("display/window/tablet_driver", OS::get_singleton()->get_tablet_driver_name(0));
Add support for the WinTab API for pen input. (3.2)
2020-05-05 13:53:30 +02:00
}
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
for (int i = 0; i < OS::get_singleton()->get_tablet_driver_count(); i++) {
if (tablet_driver == OS::get_singleton()->get_tablet_driver_name(i)) {
OS::get_singleton()->set_current_tablet_driver(OS::get_singleton()->get_tablet_driver_name(i));
break;
}
}
if (tablet_driver == "") {
OS::get_singleton()->set_current_tablet_driver(OS::get_singleton()->get_tablet_driver_name(0));
}
Add support for the WinTab API for pen input. (3.2)
2020-05-05 13:53:30 +02:00
ProjectSettings: fix category for per pixel transparency settings
2019-02-20 14:37:25 +01:00
OS::get_singleton()->_allow_layered = GLOBAL_DEF("display/window/per_pixel_transparency/allowed", false);
video_mode.layered = GLOBAL_DEF("display/window/per_pixel_transparency/enabled", false);
Make video mode initialization more intuitive, fixes #12022
2017-11-09 17:01:29 +01:00
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation", 2);
GLOBAL_DEF("rendering/quality/intended_usage/framebuffer_allocation.mobile", 3);
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
if (editor || project_manager) {
// The editor and project manager always detect and use hiDPI if needed
OS::get_singleton()->_allow_hidpi = true;
Experimental support for windows with per-pixel transparency (macOS, X11 and Windows).
2017-12-10 19:38:26 +01:00
OS::get_singleton()->_allow_layered = false;
Make sure to obey hidpi to off by default, as present in project settings. Set it to on by default for editor. Many integrated GPUs can't really get enough performance to play games at hidpi, so this should be enabled manually.
2017-10-05 21:41:42 +02:00
}
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
Add GLOBAL_DEF_ALIAS and alias for rename of pixel_snap Having to rename project settings is rare, but when it does occur it can cause user confusion. In order to make compatibility more seamless this PR introduces two new GLOBAL_DEF functions, GLOBAL_DEF_ALIAS(new_name, old_name, default) GLOBAL_DEF_ALIAS_RST(new_name, old_name, default) These are the same as the existing GLOBAL_DEF functions except that if the new setting is not found, it attempts to load from the old setting name. If the old setting is found, it stores it into the new setting, and then calls the regular GLOBAL_DEF functions.
2021-03-09 16:16:24 +01:00
Engine::get_singleton()->_gpu_pixel_snap = GLOBAL_DEF_ALIAS("rendering/2d/snapping/use_gpu_pixel_snap", "rendering/quality/2d/use_pixel_snap", false);
Revert backport of 2D transform and camera snapping options More work is needed to make sure that those options actually solve users' issues, so we prefer to remove the options for 3.2.4 and revisit for a future release.
2021-03-04 14:33:41 +01:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true);
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
2017-03-05 16:44:50 +01:00
if (rtm == -1) {
rtm = GLOBAL_DEF("rendering/threads/thread_model", OS::RENDER_THREAD_SAFE);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
if (rtm >= 0 && rtm < 3) {
Ignore thread models when compiling with NO_THREAD The thread model option for physics (2D) and rendering (single-unsafe, single-safe, multithread), was causing crashes/locks when set as multithreaded and exported for a platform that does not support threads (namely HTML5). This commit ensures that when threads support is not available, that option is ignored, and the equivalent of "single-unsafe" is always used instead. (cherry picked from commit f3c6ac1d7183a9aea2809ee283a5cd899caf9f3d)
2020-09-23 11:24:01 +02:00
#ifdef NO_THREADS
rtm = OS::RENDER_THREAD_UNSAFE; // No threads available on this platform.
#else
force thread model to single-safe when running editor, fixes #2387
2015-12-31 20:24:27 +01:00
if (editor) {
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
2017-03-05 16:44:50 +01:00
rtm = OS::RENDER_THREAD_SAFE;
force thread model to single-safe when running editor, fixes #2387
2015-12-31 20:24:27 +01:00
}
Ignore thread models when compiling with NO_THREAD The thread model option for physics (2D) and rendering (single-unsafe, single-safe, multithread), was causing crashes/locks when set as multithreaded and exported for a platform that does not support threads (namely HTML5). This commit ensures that when threads support is not available, that option is ignored, and the equivalent of "single-unsafe" is always used instead. (cherry picked from commit f3c6ac1d7183a9aea2809ee283a5cd899caf9f3d)
2020-09-23 11:24:01 +02:00
#endif
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
2017-03-05 16:44:50 +01:00
OS::get_singleton()->_render_thread_mode = OS::RenderThreadMode(rtm);
force thread model to single-safe when running editor, fixes #2387
2015-12-31 20:24:27 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
/* Determine audio and video drivers */
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
if (video_driver == OS::get_singleton()->get_video_driver_name(i)) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
video_driver_idx = i;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
}
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
2017-03-05 16:44:50 +01:00
if (video_driver_idx < 0) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
video_driver_idx = 0;
}
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
if (audio_driver == "") { // specified in project.godot
-Project/Editor settings now use new inspector -Project/Editor settings now show tooltips properly -Settings thar require restart now will show a restart warning -Video driver is now visible all the time, can be changed easily -Added function to request current video driver
2018-07-19 23:58:15 +02:00
audio_driver = GLOBAL_DEF_RST("audio/driver", OS::get_singleton()->get_audio_driver_name(0));
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
}
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
if (audio_driver == OS::get_singleton()->get_audio_driver_name(i)) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
audio_driver_idx = i;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
}
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
2017-03-05 16:44:50 +01:00
if (audio_driver_idx < 0) {
do not fail on invalid audio driver, fixes #3466
2016-01-31 22:47:13 +01:00
audio_driver_idx = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
{
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
String orientation = GLOBAL_DEF("display/window/handheld/orientation", "landscape");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
if (orientation == "portrait")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_PORTRAIT);
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
2017-03-05 16:44:50 +01:00
else if (orientation == "reverse_landscape")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_REVERSE_LANDSCAPE);
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
2017-03-05 16:44:50 +01:00
else if (orientation == "reverse_portrait")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_REVERSE_PORTRAIT);
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
2017-03-05 16:44:50 +01:00
else if (orientation == "sensor_landscape")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR_LANDSCAPE);
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
2017-03-05 16:44:50 +01:00
else if (orientation == "sensor_portrait")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR_PORTRAIT);
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
2017-03-05 16:44:50 +01:00
else if (orientation == "sensor")
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_screen_orientation(OS::SCREEN_SENSOR);
else
OS::get_singleton()->set_screen_orientation(OS::SCREEN_LANDSCAPE);
}
Rename Fixed Fps to Physics Fps on Project Settings Fixes #15981
2018-01-22 22:01:31 +01:00
Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/physics_fps", 60));
Limit Physics Process FPS above 0 Resolves: #19734
2019-06-13 05:37:51 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("physics/common/physics_fps", PropertyInfo(Variant::INT, "physics/common/physics_fps", PROPERTY_HINT_RANGE, "1,120,1,or_greater"));
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
Engine::get_singleton()->set_physics_jitter_fix(GLOBAL_DEF("physics/common/physics_jitter_fix", 0.5));
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
Engine::get_singleton()->set_target_fps(GLOBAL_DEF("debug/settings/fps/force_fps", 0));
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/fps/force_fps", PropertyInfo(Variant::INT, "debug/settings/fps/force_fps", PROPERTY_HINT_RANGE, "0,120,1,or_greater"));
Implement pause-aware picking This adds a new project setting (`physics/common/enable_pause_aware_picking`). It's disabled by default. When enabled, it changes the way 2D & 3D physics picking behaves in relation to pause: - When pause is set, every collision object that is hovered or captured (3D only) is released from that condition, getting the relevant mouse-exit callback., unless its pause mode makes it immune from pause. - During the pause. picking only considers collision objects immune from pause, sending input events and enter/exit callbacks to them as expected. - When pause is left, nothing happens. This is a big difference with the classic behavior, which at this point would process all the input events that have been queued against the current state of the 2D/3D world (in other words, checking them against the current position of the objects instead of those at the time of the events).
2021-02-06 20:57:00 +01:00
GLOBAL_DEF("physics/common/enable_pause_aware_picking", false);
-Changed most project settings in the engine, so they have major and minor categories. -Changed SectionedPropertyEditor to support this -Renamed Globals singleton to GlobalConfig, makes more sense. -Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
2017-01-05 13:16:00 +01:00
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
GLOBAL_DEF("debug/settings/stdout/print_fps", false);
DocData: Skip unexposed classes Properly expose classes that we actually want accessible. (cherry picked from commit 0ef8bcac4d05a998e94d1a8b3db4f47401e5d730)
2020-04-20 12:29:34 +02:00
GLOBAL_DEF("debug/settings/stdout/verbose_stdout", false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
DocData: Skip unexposed classes Properly expose classes that we actually want accessible. (cherry picked from commit 0ef8bcac4d05a998e94d1a8b3db4f47401e5d730)
2020-04-20 12:29:34 +02:00
if (!OS::get_singleton()->_verbose_stdout) { // Not manually overridden.
OS::get_singleton()->_verbose_stdout = GLOBAL_GET("debug/settings/stdout/verbose_stdout");
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
if (frame_delay == 0) {
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
frame_delay = GLOBAL_DEF("application/run/frame_delay_msec", 0);
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("application/run/frame_delay_msec", PropertyInfo(Variant::INT, "application/run/frame_delay_msec", PROPERTY_HINT_RANGE, "0,100,1,or_greater")); // No negative numbers
removed target_fps option, moved it to debug (it makes no sense for games). Added a frame_delay option for games that don't want to use the CPU fully.
2016-07-09 17:34:30 +02:00
}
Modified low processor sleep to 8000 and made it customizable (should be customizable for editor too)
2017-11-22 18:40:43 +01:00
OS::get_singleton()->set_low_processor_usage_mode(GLOBAL_DEF("application/run/low_processor_mode", false));
Tweak the default low-processor usage mode to be 144 Hz-friendly On high-refresh rate displays, the old default value (8000) effectively limited redrawing to 125 FPS, no matter whether V-Sync was enabled or not. The new value limits redrawing to a value slightly above 144 FPS, decreasing input lag and making the editor feel smoother when using freelook. 60 Hz displays aren't affected by this change when V-Sync is enabled, since V-Sync will take care of limiting redrawing to 60 FPS.
2019-05-09 22:40:20 +02:00
OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(GLOBAL_DEF("application/run/low_processor_mode_sleep_usec", 6900)); // Roughly 144 FPS
Add some limits on the Editor Settings
2018-10-05 18:43:53 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("application/run/low_processor_mode_sleep_usec", PropertyInfo(Variant::INT, "application/run/low_processor_mode_sleep_usec", PROPERTY_HINT_RANGE, "0,33200,1,or_greater")); // No negative numbers
Modified low processor sleep to 8000 and made it customizable (should be customizable for editor too)
2017-11-22 18:40:43 +01:00
Add project setting to hide home indicator on iOS On iOS devices without a physical home button iOS shows a home indicator instead. This is often in the way of the UI or the game. Added a project setting to disable hidden home indicator. The default value is to hide the home indicator
2019-12-09 20:38:22 +01:00
GLOBAL_DEF("display/window/ios/hide_home_indicator", true);
iOS: move touch delay to settings
2020-09-27 19:31:02 +02:00
GLOBAL_DEF("input_devices/pointing/ios/touch_delay", 0.150);
Add project setting to hide home indicator on iOS On iOS devices without a physical home button iOS shows a home indicator instead. This is often in the way of the UI or the game. Added a project setting to disable hidden home indicator. The default value is to hide the home indicator
2019-12-09 20:38:22 +01:00
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
Engine::get_singleton()->set_frame_delay(frame_delay);
removed target_fps option, moved it to debug (it makes no sense for games). Added a frame_delay option for games that don't want to use the CPU fully.
2016-07-09 17:34:30 +02:00
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
2017-03-05 16:44:50 +01:00
message_queue = memnew(MessageQueue);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (p_second_phase)
return setup2();
return OK;
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
2017-03-05 16:44:50 +01:00
error:
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
video_driver = "";
audio_driver = "";
[Windows, 3.2] Add tablet driver selection.
2020-05-19 22:28:57 +02:00
tablet_driver = "";
Change reused variable name in command line parsing
2018-05-12 13:21:26 +02:00
project_path = "";
remove trailing whitespace
2016-03-09 00:00:52 +01:00
args.clear();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
main_args.clear();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
if (show_help)
print_help(execpath);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (performance)
memdelete(performance);
if (input_map)
memdelete(input_map);
if (translation_server)
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
2017-03-05 16:44:50 +01:00
memdelete(translation_server);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (globals)
memdelete(globals);
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
if (engine)
memdelete(engine);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (script_debugger)
memdelete(script_debugger);
if (packed_data)
memdelete(packed_data);
if (file_access_network_client)
memdelete(file_access_network_client);
-Changed Godot exit to be clean. -Added more debug information on memory cleanliness on exit (if run with -v) -Fixed several memory leaks, fixes #1731, fixes #755
2015-04-21 00:38:02 +02:00
Fixing memleaks in main/main.cpp
2015-10-30 12:56:07 +01:00
unregister_core_driver_types();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
unregister_core_types();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->_cmdline.clear();
if (message_queue)
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
2017-03-05 16:44:50 +01:00
memdelete(message_queue);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->finalize_core();
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
2017-03-05 16:44:50 +01:00
locale = String();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return ERR_INVALID_PARAMETER;
}
Fix Android remote debug not hitting breakpoints A change in `Main`'s API is needed. Please read the comment in the diff for an explanation.
2017-08-22 17:21:41 +02:00
Error Main::setup2(Thread::ID p_main_tid_override) {
Print engine version to stdout when starting Godot Also include website URL and make it configurable via version.py together with the rest of the engine branding. Add mention to MIT license in --help output.
2019-05-28 11:19:21 +02:00
// Print engine name and version
print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - " + String(VERSION_WEBSITE));
Modernize Thread - Based on C++11's `thread` and `thread_local` - No more need to allocate-deallocate or check for null - No pointer anymore, just a member variable - Platform-specific implementations no longer needed (except for the few cases of non-portable functions) - Simpler for `NO_THREADS` - Thread ids are now the same across platforms (main is 1; others follow)
2021-01-27 20:10:10 +01:00
#if !defined(NO_THREADS)
Fix Android remote debug not hitting breakpoints A change in `Main`'s API is needed. Please read the comment in the diff for an explanation.
2017-08-22 17:21:41 +02:00
if (p_main_tid_override) {
Modernize Thread - Based on C++11's `thread` and `thread_local` - No more need to allocate-deallocate or check for null - No pointer anymore, just a member variable - Platform-specific implementations no longer needed (except for the few cases of non-portable functions) - Simpler for `NO_THREADS` - Thread ids are now the same across platforms (main is 1; others follow)
2021-01-27 20:10:10 +01:00
Thread::main_thread_id = p_main_tid_override;
Fix Android remote debug not hitting breakpoints A change in `Main`'s API is needed. Please read the comment in the diff for an explanation.
2017-08-22 17:21:41 +02:00
}
Modernize Thread - Based on C++11's `thread` and `thread_local` - No more need to allocate-deallocate or check for null - No pointer anymore, just a member variable - Platform-specific implementations no longer needed (except for the few cases of non-portable functions) - Simpler for `NO_THREADS` - Thread ids are now the same across platforms (main is 1; others follow)
2021-01-27 20:10:10 +01:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Change OS::initialize signature to return Error (fix segfault on x11)
2018-01-03 18:26:44 +01:00
Error err = OS::get_singleton()->initialize(video_mode, video_driver_idx, audio_driver_idx);
if (err != OK) {
return err;
}
Fall back to GLES2 if GLES3 is not working This adds a static is_viable() method to all rasterizers which has to be called before initializing the rasterizer. This allows us to check what rasterizer to use in OS::initialize together with the GL context initialization. This commit also adds a new project setting "rendering/quality/driver/driver_fallback" which allows the creator of a project to specify whether or not fallback to GLES2 is allowed. This setting is ignored for the editor so the editor will always open even if the project itself cannot run. This will hopefully reduce confusion for users downloading projects from the internet. We also no longer crash when GLES3 is not functioning on a platform. This fixes #15324
2018-08-25 00:04:25 +02:00
Add a separator in debug output for readability
2019-06-04 15:20:37 +02:00
print_line(" "); //add a blank line for readability
new editor settings customization of where to run the game from the editor
2015-08-31 04:36:46 +02:00
if (init_use_custom_pos) {
OS::get_singleton()->set_window_position(init_custom_pos);
}
-added windowed mode with -w, fixes #3020 -changed default windowed resolution to 1280x720
2015-12-12 16:06:53 +01:00
Redoing the ARVR GDNative interface as module and tighter implementation
2017-10-07 15:51:17 +02:00
// right moment to create and initialize the audio server
Oops! Audio engine has vanished :D
2017-01-15 20:06:14 +01:00
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
2017-03-05 16:44:50 +01:00
audio_server = memnew(AudioServer);
Oops! Audio engine has vanished :D
2017-01-15 20:06:14 +01:00
audio_server->init();
Redoing the ARVR GDNative interface as module and tighter implementation
2017-10-07 15:51:17 +02:00
// also init our arvr_server from here
arvr_server = memnew(ARVRServer);
Expose disable_render_loop property to GDScript
2020-06-18 12:49:24 +02:00
// and finally setup this property under visual_server
VisualServer::get_singleton()->set_render_loop_enabled(!disable_render_loop);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
register_core_singletons();
MAIN_PRINT("Main: Setup Logo");
Disable engine splash logic on Android; this is now handled by the Android theme api. In addition, add support for scaling and applying filter to the splash screen on Android. One limitation of the api being used is that the splash screen aspect ratio is not maintained when it's scaled up.
2021-02-18 10:54:35 +01:00
#if defined(JAVASCRIPT_ENABLED) || defined(ANDROID_ENABLED)
Removed unnecessary assignments
2017-08-21 21:15:36 +02:00
bool show_logo = false;
#else
bool show_logo = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
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
2017-03-05 16:44:50 +01:00
if (init_screen != -1) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
OS::get_singleton()->set_current_screen(init_screen);
}
-added windowed mode with -w, fixes #3020 -changed default windowed resolution to 1280x720
2015-12-12 16:06:53 +01:00
if (init_windowed) {
//do none..
} else if (init_maximized) {
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
OS::get_singleton()->set_window_maximized(true);
-added windowed mode with -w, fixes #3020 -changed default windowed resolution to 1280x720
2015-12-12 16:06:53 +01:00
} else if (init_fullscreen) {
OS::get_singleton()->set_window_fullscreen(true);
some editor window changes -ability to make dock position configurable, and it gets saved -editor starts maximized default
2015-06-14 03:12:53 +02:00
}
Add new window setting: always on top Implemented for Windows and Linux.
2017-12-27 20:51:19 +01:00
if (init_always_on_top) {
OS::get_singleton()->set_window_always_on_top(true);
}
Restored (And auto-generated) splash image
2017-04-10 01:02:04 +02:00
register_server_types();
Main: Load translations and remaps before scene types This ensures that settings like `gui/theme/custom_font` handle resource remappings properly, as they load resources in `register_scene_types()`. Path remaps used to be done before loading scene types in early Godot versions (as hinted by the "Load Remaps" comment just before "Load Scene Types") but this was broken when developing new localization features. Fixes #17640. (cherry picked from commit bb5dcb68922a97ecb90d57dc59c35f90b43a8802)
2021-02-02 15:15:13 +01:00
MAIN_PRINT("Main: Load Boot Image");
merged some stuff for okam
2015-09-04 04:24:55 +02:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
Color clear = GLOBAL_DEF("rendering/environment/default_clear_color", Color(0.3, 0.3, 0.3));
-Changed most project settings in the engine, so they have major and minor categories. -Changed SectionedPropertyEditor to support this -Renamed Globals singleton to GlobalConfig, makes more sense. -Changed the logic behind persisten global settings, instead of the persist checkbox, a revert button is now available
2017-01-05 13:16:00 +01:00
VisualServer::get_singleton()->set_default_clear_color(clear);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (show_logo) { //boot logo!
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
String boot_logo_path = GLOBAL_DEF("application/boot_splash/image", String());
bool boot_logo_scale = GLOBAL_DEF("application/boot_splash/fullsize", true);
Add an option to disable boot splash filtering Disabling filtering is usually desired in projects using a pixel art style. This closes #19415.
2019-06-13 22:37:19 +02:00
bool boot_logo_filter = GLOBAL_DEF("application/boot_splash/use_filter", true);
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("application/boot_splash/image", PropertyInfo(Variant::STRING, "application/boot_splash/image", PROPERTY_HINT_FILE, "*.png"));
-Changed bootsplash option to use a file, fixes #1539 -Added OS.get_splash_tick_msec() to query when splash appeared
2015-04-12 22:55:01 +02:00
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
Ref<Image> boot_logo;
-Changed bootsplash option to use a file, fixes #1539 -Added OS.get_splash_tick_msec() to query when splash appeared
2015-04-12 22:55:01 +02:00
merged some stuff for okam
2015-09-04 04:24:55 +02:00
boot_logo_path = boot_logo_path.strip_edges();
Make some debug prints verbose-only, remove others
2018-08-24 09:35:07 +02:00
if (boot_logo_path != String()) {
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
boot_logo.instance();
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 21:10:08 +01:00
Error load_err = ImageLoader::load_image(boot_logo_path, boot_logo);
if (load_err)
Added some obvious errors explanations
2019-09-25 10:28:50 +02:00
ERR_PRINTS("Non-existing or invalid boot splash at '" + boot_logo_path + "'. Loading default splash.");
-Changed bootsplash option to use a file, fixes #1539 -Added OS.get_splash_tick_msec() to query when splash appeared
2015-04-12 22:55:01 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Tweak the editor splash screen color to better match the default theme This helps achieve a visually "smoother" transition between the splash screen and the editor. (cherry picked from commit ff2871f9ac73e9f11af25bdce71400bb4a1d24ae)
2021-03-17 22:56:58 +01:00
#if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH)
const Color boot_bg_color =
GLOBAL_DEF("application/boot_splash/bg_color",
(editor || project_manager) ? boot_splash_editor_bg_color : boot_splash_bg_color);
#else
const Color boot_bg_color = GLOBAL_DEF("application/boot_splash/bg_color", boot_splash_bg_color);
#endif
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
if (boot_logo.is_valid()) {
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
2017-03-05 16:44:50 +01:00
OS::get_singleton()->_msec_splash = OS::get_singleton()->get_ticks_msec();
Add an option to disable boot splash filtering Disabling filtering is usually desired in projects using a pixel art style. This closes #19415.
2019-06-13 22:37:19 +02:00
VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale, boot_logo_filter);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
#ifndef NO_DEFAULT_BOOT_LOGO
Silence too verbose boot splash debug info
2015-11-23 00:38:12 +01:00
MAIN_PRINT("Main: Create bootsplash");
Added custom editor splash (including sponsor logo).
2017-12-16 20:11:13 +01:00
#if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH)
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
Ref<Image> splash = (editor || project_manager) ? memnew(Image(boot_splash_editor_png)) : memnew(Image(boot_splash_png));
Added custom editor splash (including sponsor logo).
2017-12-16 20:11:13 +01:00
#else
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
Ref<Image> splash = memnew(Image(boot_splash_png));
Added custom editor splash (including sponsor logo).
2017-12-16 20:11:13 +01:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: ClearColor");
Make boot splash background color always configurable This also means that you can keep the default Godot splash and set your own custom background color. Fixes #22076.
2018-09-14 21:00:24 +02:00
VisualServer::get_singleton()->set_default_clear_color(boot_bg_color);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: Image");
Make boot splash background color always configurable This also means that you can keep the default Godot splash and set your own custom background color. Fixes #22076.
2018-09-14 21:00:24 +02:00
VisualServer::get_singleton()->set_boot_image(splash, boot_bg_color, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
}
Fix setting the default icon briefly with tools=no
2017-09-15 18:41:11 +02:00
#ifdef TOOLS_ENABLED
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
Ref<Image> icon = memnew(Image(app_icon_png));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_icon(icon);
Fix setting the default icon briefly with tools=no
2017-09-15 18:41:11 +02:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Always set default clear color
2016-04-08 01:30:00 +02:00
MAIN_PRINT("Main: DCC");
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("rendering/environment/default_clear_color", Color(0.3, 0.3, 0.3)));
Always set default clear color
2016-04-08 01:30:00 +02:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
GLOBAL_DEF("application/config/icon", String());
Allow using SVG images as project icon Since exporters will save their own icon, the target platforms don't have to support SVG to display the icon correctly. This closes #23068. (cherry picked from commit 0f9432f0609d1e6b64a4038047777c3c108bc047)
2020-11-06 23:05:29 +01:00
ProjectSettings::get_singleton()->set_custom_property_info("application/config/icon",
PropertyInfo(Variant::STRING, "application/config/icon",
PROPERTY_HINT_FILE, "*.png,*.webp,*.svg,*.svgz"));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add native window/taskbar icon support for Windows and macOS. Co-authored-by: Markus Törnqvist <mjt@nysv.org>
2019-05-17 15:43:56 +02:00
GLOBAL_DEF("application/config/macos_native_icon", String());
ProjectSettings::get_singleton()->set_custom_property_info("application/config/macos_native_icon", PropertyInfo(Variant::STRING, "application/config/macos_native_icon", PROPERTY_HINT_FILE, "*.icns"));
GLOBAL_DEF("application/config/windows_native_icon", String());
ProjectSettings::get_singleton()->set_custom_property_info("application/config/windows_native_icon", PropertyInfo(Variant::STRING, "application/config/windows_native_icon", PROPERTY_HINT_FILE, "*.ico"));
Implement universal translation of touch to mouse Now generating mouse events from touch is optional (on by default) and it's performed by `InputDefault` instead of having each OS abstraction doing it. (*) The translation algorithm waits for a touch index to be pressed and tracks it translating its events to mouse events until it is raised, while ignoring other pointers. Furthermore, to avoid an stuck "touch mouse", since not all platforms may report touches raised when the window is unfocused, it checks if touches are still down by the time it's focused again and if so it resets the state of the emulated mouse. *: In the case of Windows, since it already provides touch-to-mouse translation by itself, "echo" mouse events are filtered out to have it working like the rest. On X11 a little hack has been needed to avoid a case of a spurious mouse motion event that is generated during touch interaction. Plus: Improve/fix tracking of current mouse position. ** Summary of changes to settings: ** - `display/window/handheld/emulate_touchscreen` becomes `input/pointing_devices/emulate_touch_from_mouse` - New setting: `input/pointing_devices/emulate_mouse_from_touch`
2018-02-24 03:04:30 +01:00
InputDefault *id = Object::cast_to<InputDefault>(Input::get_singleton());
if (id) {
Fix setting for pointing emulation Fix #18582 GLOBAL_DEF("input/something") is treated as Input Map setting, not as General.
2018-05-10 07:26:28 +02:00
if (bool(GLOBAL_DEF("input_devices/pointing/emulate_touch_from_mouse", false)) && !(editor || project_manager)) {
Implement universal translation of touch to mouse Now generating mouse events from touch is optional (on by default) and it's performed by `InputDefault` instead of having each OS abstraction doing it. (*) The translation algorithm waits for a touch index to be pressed and tracks it translating its events to mouse events until it is raised, while ignoring other pointers. Furthermore, to avoid an stuck "touch mouse", since not all platforms may report touches raised when the window is unfocused, it checks if touches are still down by the time it's focused again and if so it resets the state of the emulated mouse. *: In the case of Windows, since it already provides touch-to-mouse translation by itself, "echo" mouse events are filtered out to have it working like the rest. On X11 a little hack has been needed to avoid a case of a spurious mouse motion event that is generated during touch interaction. Plus: Improve/fix tracking of current mouse position. ** Summary of changes to settings: ** - `display/window/handheld/emulate_touchscreen` becomes `input/pointing_devices/emulate_touch_from_mouse` - New setting: `input/pointing_devices/emulate_mouse_from_touch`
2018-02-24 03:04:30 +01:00
if (!OS::get_singleton()->has_touchscreen_ui_hint()) {
//only if no touchscreen ui hint, set emulation
id->set_emulate_touch_from_mouse(true);
}
-display/emulate_touchscreen now really emulates a touchscreen -icons to show node menus
2015-08-29 22:16:11 +02:00
}
Implement universal translation of touch to mouse Now generating mouse events from touch is optional (on by default) and it's performed by `InputDefault` instead of having each OS abstraction doing it. (*) The translation algorithm waits for a touch index to be pressed and tracks it translating its events to mouse events until it is raised, while ignoring other pointers. Furthermore, to avoid an stuck "touch mouse", since not all platforms may report touches raised when the window is unfocused, it checks if touches are still down by the time it's focused again and if so it resets the state of the emulated mouse. *: In the case of Windows, since it already provides touch-to-mouse translation by itself, "echo" mouse events are filtered out to have it working like the rest. On X11 a little hack has been needed to avoid a case of a spurious mouse motion event that is generated during touch interaction. Plus: Improve/fix tracking of current mouse position. ** Summary of changes to settings: ** - `display/window/handheld/emulate_touchscreen` becomes `input/pointing_devices/emulate_touch_from_mouse` - New setting: `input/pointing_devices/emulate_mouse_from_touch`
2018-02-24 03:04:30 +01:00
Fix setting for pointing emulation Fix #18582 GLOBAL_DEF("input/something") is treated as Input Map setting, not as General.
2018-05-10 07:26:28 +02:00
id->set_emulate_mouse_from_touch(bool(GLOBAL_DEF("input_devices/pointing/emulate_mouse_from_touch", true)));
-display/emulate_touchscreen now really emulates a touchscreen -icons to show node menus
2015-08-29 22:16:11 +02:00
}
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
Main: Load translations and remaps before scene types This ensures that settings like `gui/theme/custom_font` handle resource remappings properly, as they load resources in `register_scene_types()`. Path remaps used to be done before loading scene types in early Godot versions (as hinted by the "Load Remaps" comment just before "Load Scene Types") but this was broken when developing new localization features. Fixes #17640. (cherry picked from commit bb5dcb68922a97ecb90d57dc59c35f90b43a8802)
2021-02-02 15:15:13 +01:00
MAIN_PRINT("Main: Load Translations and Remaps");
translation_server->setup(); //register translations, load them, etc.
if (locale != "") {
translation_server->set_locale(locale);
}
translation_server->load_translations();
ResourceLoader::load_translation_remaps(); //load remaps for resources
ResourceLoader::load_path_remaps();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: Load Scene Types");
register_scene_types();
Move cursor shape loading after module loading fixes #46685 (cherry picked from commit 2ac9f37b171f7b90826194ecd1aa93e0db95c563)
2021-03-05 17:22:06 +01:00
#ifdef TOOLS_ENABLED
ClassDB::set_current_api(ClassDB::API_EDITOR);
EditorNode::register_editor_types();
ClassDB::set_current_api(ClassDB::API_CORE);
#endif
MAIN_PRINT("Main: Load Modules, Physics, Drivers, Scripts");
register_platform_apis();
register_module_types();
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
2017-03-05 16:44:50 +01:00
GLOBAL_DEF("display/mouse_cursor/custom_image", String());
GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2());
Made the tooltip position offset configurable
2019-03-02 12:11:42 +01:00
GLOBAL_DEF("display/mouse_cursor/tooltip_position_offset", Point2(10, 10));
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/mouse_cursor/custom_image", PropertyInfo(Variant::STRING, "display/mouse_cursor/custom_image", PROPERTY_HINT_FILE, "*.png,*.webp"));
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
if (String(ProjectSettings::get_singleton()->get("display/mouse_cursor/custom_image")) != String()) {
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
Ref<Texture> cursor = ResourceLoader::load(ProjectSettings::get_singleton()->get("display/mouse_cursor/custom_image"));
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
if (cursor.is_valid()) {
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
Vector2 hotspot = ProjectSettings::get_singleton()->get("display/mouse_cursor/custom_image_hotspot");
Add implementation for custom hardware cursor
2017-11-10 11:50:11 +01:00
Input::get_singleton()->set_custom_mouse_cursor(cursor, Input::CURSOR_ARROW, hotspot);
Added ability to set custom mouse cursors. Not hardware accelerated yet.
2015-09-24 23:06:15 +02:00
}
}
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
iOS modular build and export implementation.
2019-11-29 07:54:39 +01:00
camera_server = CameraServer::create();
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
initialize_physics();
register_server_singletons();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
register_driver_types();
Added basic support for custom resource savers and loaders
2018-06-11 02:59:53 +02:00
// This loads global classes, so it must happen before custom loaders and savers are registered
UDP Fixes -=-=-=-=- Curse the day I decided to port UDP code, as it ended up being two nights of work. At least It's done now (I hope). -Fixed UDP Support, API seems stable -Added UDP Chat demo (chat that can lose your packets, heh) -Added helpers to areas and bodies to get list of collided bodies and contained bodies. -Sped up screen/viewport capture code. -Added code to save an image as PNG -Small fix so scripts register their singletons after modules did.
2014-11-13 04:53:12 +01:00
ScriptServer::init_languages();
Audio bus editing is COMPLETE!
2017-01-25 18:30:40 +01:00
audio_server->load_default_bus_layout();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
if (use_debug_profiler && script_debugger) {
script_debugger->profiling_start();
}
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
2017-03-05 16:44:50 +01:00
_start_success = true;
locale = String();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 03:03:46 +01:00
ClassDB::set_current_api(ClassDB::API_NONE); //no more api is registered at this point
Added API version and hashing to ObjectTypeDB
2016-09-15 00:37:37 +02:00
Fix some crashes, overflows and using variables without values
2019-11-01 16:16:31 +01:00
print_verbose("CORE API HASH: " + uitos(ClassDB::get_api_hash(ClassDB::API_CORE)));
print_verbose("EDITOR API HASH: " + uitos(ClassDB::get_api_hash(ClassDB::API_EDITOR)));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
MAIN_PRINT("Main: Done");
return OK;
}
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
// everything the main loop needs to know about frame timings
-New inspector. -Changed UI resizing code, gained huge amount of speed. -Reorganized timer sync to clean up behavior (sorry forgot commit this before) -
2018-05-15 22:12:35 +02:00
static MainTimerSync main_timer_sync;
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
bool Main::start() {
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
2017-03-05 16:44:50 +01:00
ERR_FAIL_COND_V(!_start_success, false);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Fix setting the default icon briefly with tools=no
2017-09-15 18:41:11 +02:00
bool hasicon = false;
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
String doc_tool_path;
Be stricter on what's considered a scene path in CLI argument parsing This closes #8721.
2019-10-29 01:42:57 +01:00
String positional_arg;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
String game_path;
String script;
String test;
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
bool check_only = false;
#ifdef TOOLS_ENABLED
bool doc_base = true;
Enable command-line export The syntax is identical to what it was in 2.1, but now you specify preset name instead of platform name.
2017-08-14 15:15:06 +02:00
String _export_preset;
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
2017-03-05 16:44:50 +01:00
bool export_debug = false;
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
bool export_pack_only = false;
#endif
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
-New inspector. -Changed UI resizing code, gained huge amount of speed. -Reorganized timer sync to clean up behavior (sorry forgot commit this before) -
2018-05-15 22:12:35 +02:00
main_timer_sync.init(OS::get_singleton()->get_ticks_usec());
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
List<String> args = OS::get_singleton()->get_cmdline_args();
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < args.size(); i++) {
Fix arguments parsing in the main function Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6. The bogus behaviour considered that if there were more than one arguments left to parse, they would be a pair of arguments (switch and its parameter), and thus skipped the next argument in all cases (thus potentially skipping a "-editor", which triggered #2611). This is fixed by checking first for arguments that don't expect a parameter, and only afterwards for arguments that expect a parameter. And if a "pair" of arguments is not valid, we no longer increment the counter.
2015-11-01 17:50:44 +01:00
//parameters that do not have an argument to the right
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
if (args[i] == "--check-only") {
check_only = true;
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#ifdef TOOLS_ENABLED
Fix warnings seen with warnings=all and recent GCC 8.2.
2019-02-18 20:28:40 +01:00
} else if (args[i] == "--no-docbase") {
doc_base = false;
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (args[i] == "-e" || args[i] == "--editor") {
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
2017-03-05 16:44:50 +01:00
editor = true;
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
} else if (args[i] == "-p" || args[i] == "--project-manager") {
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
project_manager = true;
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#endif
Be stricter on what's considered a scene path in CLI argument parsing This closes #8721.
2019-10-29 01:42:57 +01:00
} else if (args[i].length() && args[i][0] != '-' && positional_arg == "") {
positional_arg = args[i];
Allow `.res` and `.tres` extensions in the scene CLI positional argument This closes #35709. (cherry picked from commit 653334cc8d4f232034c6086bd7672bb9e04932b7)
2020-05-06 19:59:29 +02:00
if (args[i].ends_with(".scn") ||
args[i].ends_with(".tscn") ||
args[i].ends_with(".escn") ||
args[i].ends_with(".res") ||
args[i].ends_with(".tres")) {
Be stricter on what's considered a scene path in CLI argument parsing This closes #8721.
2019-10-29 01:42:57 +01:00
// Only consider the positional argument to be a scene path if it ends with
// a file extension associated with Godot scenes. This makes it possible
// for projects to parse command-line arguments for custom CLI arguments
// or other file extensions without trouble. This can be used to implement
// "drag-and-drop onto executable" logic, which can prove helpful
// for non-game applications.
game_path = args[i];
}
Fix arguments parsing in the main function Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6. The bogus behaviour considered that if there were more than one arguments left to parse, they would be a pair of arguments (switch and its parameter), and thus skipped the next argument in all cases (thus potentially skipping a "-editor", which triggered #2611). This is fixed by checking first for arguments that don't expect a parameter, and only afterwards for arguments that expect a parameter. And if a "pair" of arguments is not valid, we no longer increment the counter.
2015-11-01 17:50:44 +01:00
}
ran cppcheck, fixed cases where array index is used before limits check
2015-09-16 22:51:19 +02:00
//parameters that have an argument to the right
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
2017-03-05 16:44:50 +01:00
else if (i < (args.size() - 1)) {
bool parsed_pair = true;
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
if (args[i] == "-s" || args[i] == "--script") {
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
2017-03-05 16:44:50 +01:00
script = args[i + 1];
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (args[i] == "--test") {
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
2017-03-05 16:44:50 +01:00
test = args[i + 1];
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#ifdef TOOLS_ENABLED
} else if (args[i] == "--doctool") {
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
doc_tool_path = args[i + 1];
if (doc_tool_path.begins_with("-")) {
// Assuming other command line arg, so default to cwd.
doc_tool_path = ".";
parsed_pair = false;
}
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (args[i] == "--export") {
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
2017-03-05 16:44:50 +01:00
editor = true; //needs editor
Ensure --export implies --editor Fixes #30149
2019-06-28 14:34:09 +02:00
_export_preset = args[i + 1];
Tweak command-line arguments to make them more UNIX-like Also improves the command-line help text readability.
2017-06-21 11:09:30 +02:00
} else if (args[i] == "--export-debug") {
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
2017-03-05 16:44:50 +01:00
editor = true; //needs editor
Ensure --export implies --editor Fixes #30149
2019-06-28 14:34:09 +02:00
_export_preset = args[i + 1];
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
2017-03-05 16:44:50 +01:00
export_debug = true;
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
} else if (args[i] == "--export-pack") {
editor = true;
_export_preset = args[i + 1];
export_pack_only = true;
Ignore tools CLI flags in non-tools builds. Some flags were still parsed but either did nothing or broke everything. No reason to parse them.
2018-02-16 19:40:22 +01:00
#endif
Fix arguments parsing in the main function Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6. The bogus behaviour considered that if there were more than one arguments left to parse, they would be a pair of arguments (switch and its parameter), and thus skipped the next argument in all cases (thus potentially skipping a "-editor", which triggered #2611). This is fixed by checking first for arguments that don't expect a parameter, and only afterwards for arguments that expect a parameter. And if a "pair" of arguments is not valid, we no longer increment the counter.
2015-11-01 17:50:44 +01:00
} else {
// The parameter does not match anything known, don't skip the next argument
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
2017-03-05 16:44:50 +01:00
parsed_pair = false;
Fix arguments parsing in the main function Fixes #2611 which was a regression from 692216b86ab97db91e7ff3903ffc9ac8e37433f6. The bogus behaviour considered that if there were more than one arguments left to parse, they would be a pair of arguments (switch and its parameter), and thus skipped the next argument in all cases (thus potentially skipping a "-editor", which triggered #2611). This is fixed by checking first for arguments that don't expect a parameter, and only afterwards for arguments that expect a parameter. And if a "pair" of arguments is not valid, we no longer increment the counter.
2015-11-01 17:50:44 +01:00
}
if (parsed_pair) {
i++;
ran cppcheck, fixed cases where array index is used before limits check
2015-09-16 22:51:19 +02:00
}
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
} else if (args[i] == "--doctool") {
// Handle case where no path is given to --doctool.
doc_tool_path = ".";
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
String main_loop_type;
#ifdef TOOLS_ENABLED
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
if (doc_tool_path != "") {
Add default values to the editor help, docs, and generated RST Also, make spacing of "=" in the editor help a bit more consistent. Closes #16086
2019-06-01 15:42:22 +02:00
Engine::get_singleton()->set_editor_hint(true); // Needed to instance editor-only classes for their default values
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
{
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
DirAccessRef da = DirAccess::open(doc_tool_path);
Fix doctool misleading error message (cherry picked from commit b0e817730644afdbf111f57017c51797c8da2644)
2020-03-07 15:40:59 +01:00
ERR_FAIL_COND_V_MSG(!da, false, "Argument supplied to --doctool must be a valid directory path.");
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
DocData doc;
doc.generate(doc_base);
DocData docsrc;
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
Map<String, String> doc_data_classes;
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
Set<String> checked_paths;
Change ".." punctuation for "..." in editor strings (#16507)
2018-04-22 19:36:01 +02:00
print_line("Loading docs...");
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
for (int i = 0; i < _doc_data_class_path_count; i++) {
Add `custom_modules` build option to compile external user modules This patch adds ability to include external, user-defined C++ modules to be compiled as part of Godot via `custom_modules` build option which can be passed to `scons`. ``` scons platform=x11 tools=yes custom_modules="../project/modules" ``` Features: - detects all available modules under `custom_modules` directory the same way as it does for built-in modules (not recursive); - works with both relative and absolute paths on the filesystem; - multiple search paths can be specified as a comma-separated list. Module custom documentation and editor icons collection and generation process is adapted to work with absolute paths needed by such modules. Also fixed doctool bug mixing absolute and relative paths respectively. Implementation details: - `env.module_list` is a dictionary now, which holds both module name as key and either a relative or absolute path to a module as a value. - `methods.detect_modules` is run twice: once for built-in modules, and second for external modules, all combined later. - `methods.detect_modules` was not doing what it says on the tin. It is split into `detect_modules` which collects a list of available modules and `write_modules` which generates `register_types` sources for each. - whether a module is built-in or external is distinguished by relative or absolute paths respectively. `custom_modules` scons converter ensures that the path is absolute even if relative path is supplied, including expanding user paths and symbolic links. - treats the parent directory as if it was Godot's base directory, so that there's no need to change include paths in cases where custom modules are included as dependencies in other modules. (cherry picked from commit a96f0e98d74839fecfe6ac553aa5a5521e69ddfd)
2020-04-04 13:46:15 +02:00
// Custom modules are always located by absolute path.
String path = _doc_data_class_paths[i].path;
if (path.is_rel_path()) {
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
path = doc_tool_path.plus_file(path);
Add `custom_modules` build option to compile external user modules This patch adds ability to include external, user-defined C++ modules to be compiled as part of Godot via `custom_modules` build option which can be passed to `scons`. ``` scons platform=x11 tools=yes custom_modules="../project/modules" ``` Features: - detects all available modules under `custom_modules` directory the same way as it does for built-in modules (not recursive); - works with both relative and absolute paths on the filesystem; - multiple search paths can be specified as a comma-separated list. Module custom documentation and editor icons collection and generation process is adapted to work with absolute paths needed by such modules. Also fixed doctool bug mixing absolute and relative paths respectively. Implementation details: - `env.module_list` is a dictionary now, which holds both module name as key and either a relative or absolute path to a module as a value. - `methods.detect_modules` is run twice: once for built-in modules, and second for external modules, all combined later. - `methods.detect_modules` was not doing what it says on the tin. It is split into `detect_modules` which collects a list of available modules and `write_modules` which generates `register_types` sources for each. - whether a module is built-in or external is distinguished by relative or absolute paths respectively. `custom_modules` scons converter ensures that the path is absolute even if relative path is supplied, including expanding user paths and symbolic links. - treats the parent directory as if it was Godot's base directory, so that there's no need to change include paths in cases where custom modules are included as dependencies in other modules. (cherry picked from commit a96f0e98d74839fecfe6ac553aa5a5521e69ddfd)
2020-04-04 13:46:15 +02:00
}
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
String name = _doc_data_class_paths[i].name;
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
doc_data_classes[name] = path;
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
if (!checked_paths.has(path)) {
checked_paths.insert(path);
Make `--doctool` create directories if they don't exist This prevents errors due to missing directories when generating engine documentation. This closes #17297.
2019-06-08 21:13:16 +02:00
// Create the module documentation directory if it doesn't exist
DirAccess *da = DirAccess::create_for_path(path);
da->make_dir_recursive(path);
memdelete(da);
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
docsrc.load_classes(path);
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
print_line("Loading docs from: " + path);
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Main: Default `--doctool` path to '.' if none given (cherry picked from commit 096ef0dc911ecc60e8dd32d8787b1e3705815f14)
2021-04-05 15:35:19 +02:00
String index_path = doc_tool_path.plus_file("doc/classes");
Make `--doctool` create directories if they don't exist This prevents errors due to missing directories when generating engine documentation. This closes #17297.
2019-06-08 21:13:16 +02:00
// Create the main documentation directory if it doesn't exist
DirAccess *da = DirAccess::create_for_path(index_path);
da->make_dir_recursive(index_path);
memdelete(da);
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
docsrc.load_classes(index_path);
checked_paths.insert(index_path);
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
print_line("Loading docs from: " + index_path);
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
Change ".." punctuation for "..." in editor strings (#16507)
2018-04-22 19:36:01 +02:00
print_line("Merging docs...");
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
doc.merge_from(docsrc);
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
for (Set<String>::Element *E = checked_paths.front(); E; E = E->next()) {
print_line("Erasing old docs at: " + E->get());
Changed the doc class generation to individual files per class. It is also possible to save module files in module directories and the build system will recognize them.
2017-09-12 22:42:36 +02:00
DocData::erase_classes(E->get());
Implements modules documents Editor can generate documents for modules in thier own xml files
2016-12-16 12:12:22 +01:00
}
Change ".." punctuation for "..." in editor strings (#16507)
2018-04-22 19:36:01 +02:00
print_line("Generating new docs...");
Style: Apply clang-format to @reduz's changes [ci skip]
2017-09-13 09:13:23 +02:00
doc.save_classes(index_path, doc_data_classes);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return false;
}
Export: Add dedicated --export-pack option to export data pack The previous behavior relying on the provided extension was problematic on macOS since .zip is the main extension used for the full project export (binary + data pack). We add a dedicated `--export-pack` command line option to define when only the data pack should be exported. Its extension will still be inferred from the path. Fixes #23073.
2020-01-08 14:22:50 +01:00
#endif
Print error if no export destination has been passed
2015-11-26 21:59:25 +01:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
if (script == "" && game_path == "" && String(GLOBAL_DEF("application/run/main_scene", "")) != "") {
game_path = GLOBAL_DEF("application/run/main_scene", "");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
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
2017-03-05 16:44:50 +01:00
MainLoop *main_loop = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (editor) {
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 01:20:42 +01:00
main_loop = memnew(SceneTree);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
};
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
2017-03-05 16:44:50 +01:00
if (test != "") {
SCons: do not build tests with tools=no This doesn't affect the resulting binary size, but allows to save a phew seconds during compilation if building export templates.
2019-09-26 13:56:27 +02:00
#ifdef TOOLS_ENABLED
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
2017-03-05 16:44:50 +01:00
main_loop = test_main(test, args);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!main_loop)
return false;
#endif
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
2017-03-05 16:44:50 +01:00
} else if (script != "") {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Ref<Script> script_res = ResourceLoader::load(script);
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_FAIL_COND_V_MSG(script_res.is_null(), false, "Can't load script: " + script);
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Add cli paramerter --check-only for script parsing
2018-05-31 00:23:23 +02:00
if (check_only) {
godot exit code improvement for --script --check-only, fixes #33895 this commit causes godot executable to return non-zero exit code once invalid script is passed via --script during --check-only
2019-11-25 22:39:51 +01:00
if (!script_res->is_valid()) {
OS::get_singleton()->set_exit_code(1);
}
Add cli paramerter --check-only for script parsing
2018-05-31 00:23:23 +02:00
return false;
}
Tweak the error message when trying to run an invalid script from CLI (cherry picked from commit 2ab9515b0750b18717196e56ca63dae410e0f61f)
2020-03-06 22:57:02 +01:00
if (script_res->can_instance()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
StringName instance_type = script_res->get_instance_base_type();
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 03:03:46 +01:00
Object *obj = ClassDB::instance(instance_type);
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 22:58:51 +02:00
MainLoop *script_loop = Object::cast_to<MainLoop>(obj);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!script_loop) {
if (obj)
memdelete(obj);
Tweak the error message when trying to run an invalid script from CLI (cherry picked from commit 2ab9515b0750b18717196e56ca63dae410e0f61f)
2020-03-06 22:57:02 +01:00
ERR_FAIL_V_MSG(false, vformat("Can't load the script \"%s\" as it doesn't inherit from SceneTree or MainLoop.", script));
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
script_loop->set_init_script(script_res);
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
2017-03-05 16:44:50 +01:00
main_loop = script_loop;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
return false;
}
} else {
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
main_loop_type = GLOBAL_DEF("application/run/main_loop_type", "");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
remove trailing whitespace
2016-03-09 00:00:52 +01:00
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
2017-03-05 16:44:50 +01:00
if (!main_loop && main_loop_type == "")
main_loop_type = "SceneTree";
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!main_loop) {
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 03:03:46 +01:00
if (!ClassDB::class_exists(main_loop_type)) {
Fixes for new two-dash long command line arguments - Fixes some single-dash leftovers that were missed in the previous commit - Reorder the help output for clarity, and document missing options - Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit - Improve error message on malformed arguments and do not display help on error - Always use long form of arguments when starting a new Godot process from C++, for clarity and easy grepping - Cleanup obsolete code here and there
2017-08-19 16:45:03 +02:00
OS::get_singleton()->alert("Error: MainLoop type doesn't exist: " + main_loop_type);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return false;
} else {
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 03:03:46 +01:00
Object *ml = ClassDB::instance(main_loop_type);
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_FAIL_COND_V_MSG(!ml, false, "Can't instance MainLoop type.");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 22:58:51 +02:00
main_loop = Object::cast_to<MainLoop>(ml);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!main_loop) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(ml);
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_FAIL_V_MSG(false, "Invalid MainLoop type.");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
ObjectTypeDB was renamed to ClassDB. Types are meant to be more generic to Variant. All usages of "type" to refer to classes were renamed to "class" ClassDB has been exposed to GDScript. OBJ_TYPE() macro is now GDCLASS()
2017-01-03 03:03:46 +01:00
if (main_loop->is_class("SceneTree")) {
remove trailing whitespace
2016-03-09 00:00:52 +01:00
Convert Object::cast_to() to the static version Currently we rely on some undefined behavior when Object->cast_to() gets called with a Null pointer. This used to work fine with GCC < 6 but newer versions of GCC remove all codepaths in which the this pointer is Null. However, the non-static cast_to() was supposed to be null safe. This patch makes cast_to() Null safe and removes the now redundant Null checks where they existed. It is explained in this article: https://www.viva64.com/en/b/0226/
2017-08-24 22:58:51 +02:00
SceneTree *sml = Object::cast_to<SceneTree>(main_loop);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Optimize-out some debug and/or non-tools methods Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
2017-04-07 16:17:16 +02:00
#ifdef DEBUG_ENABLED
begin work on debugging collisions....
2015-09-19 04:10:58 +02:00
if (debug_collisions) {
sml->set_debug_collisions_hint(true);
}
Ability to visually debug geometry visually: -Visible 2D and 3D Shapes, Polygons, Tile collisions, etc. -Visible Navmesh and Navpoly -Visible collision contacts for 2D and 3D as a red point -Customizable colors in project settings
2015-09-20 18:03:46 +02:00
if (debug_navigation) {
sml->set_debug_navigation_hint(true);
}
Optimize-out some debug and/or non-tools methods Collisions and nav debug are conditionally compiled depending on DEBUG_ENABLED is_editor_hint() and is_node_being_edited() are compiled only with TOOLS_ENABLED Every affected method is implemented in the header in case its macro is not present (the getters just returning false and the setters having an empty body) so the compiler can inline and finally no-op-out them as likely as possible. is_node_being_edited() already showed a similar optimization effort and has been adapted to this change. Furthermore, and as a consequence, -debugcol and -debugnav will not work on non-debug (strict release) builds. This can bring a little bit of runtime performance on release and non-tooled builds (less code, so less cycles to spend and maybe more cache friendly).
2017-04-07 16:17:16 +02:00
#endif
Added basic support for custom resource savers and loaders
2018-06-11 02:59:53 +02:00
ResourceLoader::add_custom_loaders();
ResourceSaver::add_custom_savers();
Only add autoloads in editor if they have tool scripts
2018-05-22 18:26:13 +02:00
if (!project_manager && !editor) { // game
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
if (game_path != "" || script != "") {
Implement game camera override Implemented uniform API in Viewport class to override 2D and/or 3D camera. Added buttons in 2D and 3D editor viewport toolbars that override the running game camera transform with the editor viewport camera transform. Implemented via remote debugger protocol and camera override API. Removed LiveEditFuncs function pointers from ScriptDebugger class. Since the debugger got access to the SceneTree instance (if one exists), there is no need to store the function pointers. The live edit functions in SceneTree are used directly instead. Also removed the static version of live edit functions in SceneTree for the same reason. This reduced the SceneTree -> Debugger coupling too since the function pointers don't need to be set from SceneTree anymore. Moved script_debugger_remote.h/cpp from 'core/' to 'scene/debugger/'. This is because the remote debugger is now using SceneTree directly and 'core/' classes should not depend on 'scene/' classes.
2019-04-06 22:55:01 +02:00
if (script_debugger && script_debugger->is_remote()) {
ScriptDebuggerRemote *remote_debugger = static_cast<ScriptDebuggerRemote *>(script_debugger);
remote_debugger->set_scene_tree(sml);
}
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
//autoload
List<PropertyInfo> props;
ProjectSettings::get_singleton()->get_property_list(&props);
//first pass, add the constants so they exist before any script is loaded
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
String s = E->get().name;
if (!s.begins_with("autoload/"))
continue;
String name = s.get_slicec('/', 1);
String path = ProjectSettings::get_singleton()->get(s);
bool global_var = false;
if (path.begins_with("*")) {
global_var = true;
}
if (global_var) {
for (int i = 0; i < ScriptServer::get_language_count(); i++) {
ScriptServer::get_language(i)->add_global_constant(name, Variant());
}
}
}
//second pass, load into global constants
List<Node *> to_add;
for (List<PropertyInfo>::Element *E = props.front(); E; E = E->next()) {
String s = E->get().name;
if (!s.begins_with("autoload/"))
continue;
String name = s.get_slicec('/', 1);
String path = ProjectSettings::get_singleton()->get(s);
bool global_var = false;
if (path.begins_with("*")) {
global_var = true;
path = path.substr(1, path.length() - 1);
}
RES res = ResourceLoader::load(path);
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + path);
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
Node *n = NULL;
if (res->is_class("PackedScene")) {
Ref<PackedScene> ps = res;
n = ps->instance();
} else if (res->is_class("Script")) {
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 21:10:08 +01:00
Ref<Script> script_res = res;
StringName ibt = script_res->get_instance_base_type();
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
bool valid_type = ClassDB::is_parent_class(ibt, "Node");
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_CONTINUE_MSG(!valid_type, "Script does not inherit a Node: " + path);
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
Object *obj = ClassDB::instance(ibt);
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_CONTINUE_MSG(obj == NULL, "Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt));
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
n = Object::cast_to<Node>(obj);
Add -Wshadow=local to warnings and fix reported issues. Fixes #25316.
2019-02-12 21:10:08 +01:00
n->set_script(script_res.get_ref_ptr());
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
}
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_CONTINUE_MSG(!n, "Path in autoload not a node or script: " + path);
Enable autoload in editor - Tool scripts will be executed and can be accessed by plugins. - Other script languages can implement add/remove_named_global_constant to make use of this functionality.
2018-05-01 16:06:23 +02:00
n->set_name(name);
//defer so references are all valid on _ready()
to_add.push_back(n);
if (global_var) {
for (int i = 0; i < ScriptServer::get_language_count(); i++) {
ScriptServer::get_language(i)->add_global_constant(name, n);
}
}
}
for (List<Node *>::Element *E = to_add.front(); E; E = E->next()) {
sml->get_root()->add_child(E->get());
}
}
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#ifdef TOOLS_ENABLED
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
2017-03-05 16:44:50 +01:00
EditorNode *editor_node = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (editor) {
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
2017-03-05 16:44:50 +01:00
editor_node = memnew(EditorNode);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
sml->get_root()->add_child(editor_node);
Enable command-line export The syntax is identical to what it was in 2.1, but now you specify preset name instead of platform name.
2017-08-14 15:15:06 +02:00
if (_export_preset != "") {
Be stricter on what's considered a scene path in CLI argument parsing This closes #8721.
2019-10-29 01:42:57 +01:00
editor_node->export_preset(_export_preset, positional_arg, export_debug, export_pack_only);
Export: Improve usability of command line interface I'm barely scratching the surface of the changes needed to make the --export command line interface easy to use, but this should already improve things somewhat. - Streamline `can_export()` templates check in all platforms, checking first for the presence of official templates, then of any defined custom template, and reporting on the absence of any. Shouldn't change the actual return value much which is still true if either release or debug is usable - we might want to change that eventually and better validate against the requested target. - Fix discrepancy between platforms using `custom_package/debug` and `custom_template/debug` (resp. `release`). All now use `custom_template`, which will break compatibility for `export_presets.cfg` with earlier projects (but is easy to fix). - Use `can_export()` when attempting a command line export and report the same errors that would be shown in the editor. - Improve error reporting after a failed export attempt, handling missing template and invalid path more gracefully. - Cleanup of unused stuff in EditorNode around the export workflow. - Improve --export documentation in --help a bit. Fixes #16949 (at least many of the misunderstandings listed there). Fixes #18470.
2020-01-07 13:29:02 +01:00
game_path = ""; // Do not load anything.
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
#endif
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
if (!editor && !project_manager) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
//standard helpers that can be changed from main config
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
String stretch_mode = GLOBAL_DEF("display/window/stretch/mode", "disabled");
String stretch_aspect = GLOBAL_DEF("display/window/stretch/aspect", "ignore");
Size2i stretch_size = Size2(GLOBAL_DEF("display/window/size/width", 0), GLOBAL_DEF("display/window/size/height", 0));
Fix property hint for stretch strink setting Fixes #25184.
2019-02-25 16:53:33 +01:00
real_t stretch_shrink = GLOBAL_DEF("display/window/stretch/shrink", 1.0);
-Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D
2014-04-15 03:43:44 +02:00
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
2017-03-05 16:44:50 +01:00
SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED;
if (stretch_mode == "2d")
sml_sm = SceneTree::STRETCH_MODE_2D;
else if (stretch_mode == "viewport")
sml_sm = SceneTree::STRETCH_MODE_VIEWPORT;
-Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D
2014-04-15 03:43:44 +02:00
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
2017-03-05 16:44:50 +01:00
SceneTree::StretchAspect sml_aspect = SceneTree::STRETCH_ASPECT_IGNORE;
if (stretch_aspect == "keep")
sml_aspect = SceneTree::STRETCH_ASPECT_KEEP;
else if (stretch_aspect == "keep_width")
sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_WIDTH;
else if (stretch_aspect == "keep_height")
sml_aspect = SceneTree::STRETCH_ASPECT_KEEP_HEIGHT;
Add expand stretch/ascpect - no more black bars
2017-08-09 09:53:38 +02:00
else if (stretch_aspect == "expand")
sml_aspect = SceneTree::STRETCH_ASPECT_EXPAND;
-Added google play services (needed for some stuff) -Added new screen resizing options, stretch_2d is removed, new much more flexible ones. -Fixed bug in viewport (can create more instances in 3d-in-2d demo now) -Can set android permissions and screen sizes manually in the export settings -Changed export templates extension to .tpz (too many people unzipped the manually..) -File dialog now ensures that the proper extension is used (will not allow to save without it) -Fixed bug that made collision exceptions not work in 2D
2014-04-15 03:43:44 +02:00
Several changes to better run in mobile.
2017-07-22 19:07:38 +02:00
sml->set_screen_stretch(sml_sm, sml_aspect, stretch_size, stretch_shrink);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true));
sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true));
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
String appname = ProjectSettings::get_singleton()->get("application/config/name");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
appname = TranslationServer::get_singleton()->translate(appname);
Add a suffix to the window title when running from a debug build Since projects started from the editor or exported in debug mode run slower than those exported in release mode, this should be clearly presented to the user. This partially addresses #20219. (cherry picked from commit a9c60007a9f7cacd690c09b7f74a5e6f190c5cfb)
2020-06-16 11:27:46 +02:00
#ifdef DEBUG_ENABLED
// Append a suffix to the window title to denote that the project is running
// from a debug build (including the editor). Since this results in lower performance,
// this should be clearly presented to the user.
OS::get_singleton()->set_window_title(vformat("%s (DEBUG)", appname));
#else
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_window_title(appname);
Add a suffix to the window title when running from a debug build Since projects started from the editor or exported in debug mode run slower than those exported in release mode, this should be clearly presented to the user. This partially addresses #20219. (cherry picked from commit a9c60007a9f7cacd690c09b7f74a5e6f190c5cfb)
2020-06-16 11:27:46 +02:00
#endif
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
int shadow_atlas_size = GLOBAL_GET("rendering/quality/shadow_atlas/size");
int shadow_atlas_q0_subdiv = GLOBAL_GET("rendering/quality/shadow_atlas/quadrant_0_subdiv");
int shadow_atlas_q1_subdiv = GLOBAL_GET("rendering/quality/shadow_atlas/quadrant_1_subdiv");
int shadow_atlas_q2_subdiv = GLOBAL_GET("rendering/quality/shadow_atlas/quadrant_2_subdiv");
int shadow_atlas_q3_subdiv = GLOBAL_GET("rendering/quality/shadow_atlas/quadrant_3_subdiv");
all light types and shadows are working, pending a lot of clean-up
2016-11-10 03:55:06 +01:00
sml->get_root()->set_shadow_atlas_size(shadow_atlas_size);
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
2017-03-05 16:44:50 +01:00
sml->get_root()->set_shadow_atlas_quadrant_subdiv(0, Viewport::ShadowAtlasQuadrantSubdiv(shadow_atlas_q0_subdiv));
sml->get_root()->set_shadow_atlas_quadrant_subdiv(1, Viewport::ShadowAtlasQuadrantSubdiv(shadow_atlas_q1_subdiv));
sml->get_root()->set_shadow_atlas_quadrant_subdiv(2, Viewport::ShadowAtlasQuadrantSubdiv(shadow_atlas_q2_subdiv));
sml->get_root()->set_shadow_atlas_quadrant_subdiv(3, Viewport::ShadowAtlasQuadrantSubdiv(shadow_atlas_q3_subdiv));
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
Viewport::Usage usage = Viewport::Usage(int(GLOBAL_GET("rendering/quality/intended_usage/framebuffer_allocation")));
sml->get_root()->set_usage(usage);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Restored auto snapping of controls to pixels, fixes #10847 and probably several more issues. Made it optional in the project settings but defaults to true.
2017-09-07 16:22:07 +02:00
bool snap_controls = GLOBAL_DEF("gui/common/snap_controls_to_pixels", true);
sml->get_root()->set_snap_controls_to_pixels(snap_controls);
Enable DynamicFont oversampling by default This results in a better DynamicFont appearance when scaled, which is especially noticeable when using the `2d` scaling mode.
2018-04-19 01:25:25 +02:00
bool font_oversampling = GLOBAL_DEF("rendering/quality/dynamic_fonts/use_oversampling", true);
Added font oversampling support
2017-12-19 22:48:30 +01:00
sml->set_use_font_oversampling(font_oversampling);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
} else {
Allow system certs file to be used by Editor. Note, it will only used by the Editor, not when running the game. This allows package maintainer to compile Godot to use system installed certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
GLOBAL_DEF("display/window/stretch/mode", "disabled");
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/mode", PropertyInfo(Variant::STRING, "display/window/stretch/mode", PROPERTY_HINT_ENUM, "disabled,2d,viewport"));
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
GLOBAL_DEF("display/window/stretch/aspect", "ignore");
Add expand stretch/ascpect - no more black bars
2017-08-09 09:53:38 +02:00
ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/aspect", PropertyInfo(Variant::STRING, "display/window/stretch/aspect", PROPERTY_HINT_ENUM, "ignore,keep,keep_width,keep_height,expand"));
Fix property hint for stretch strink setting Fixes #25184.
2019-02-25 16:53:33 +01:00
GLOBAL_DEF("display/window/stretch/shrink", 1.0);
ProjectSettings::get_singleton()->set_custom_property_info("display/window/stretch/shrink", PropertyInfo(Variant::REAL, "display/window/stretch/shrink", PROPERTY_HINT_RANGE, "1.0,8.0,0.1"));
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
sml->set_auto_accept_quit(GLOBAL_DEF("application/config/auto_accept_quit", true));
sml->set_quit_on_go_back(GLOBAL_DEF("application/config/quit_on_go_back", true));
Restored auto snapping of controls to pixels, fixes #10847 and probably several more issues. Made it optional in the project settings but defaults to true.
2017-09-07 16:22:07 +02:00
GLOBAL_DEF("gui/common/snap_controls_to_pixels", true);
Enable DynamicFont oversampling by default This results in a better DynamicFont appearance when scaled, which is especially noticeable when using the `2d` scaling mode.
2018-04-19 01:25:25 +02:00
GLOBAL_DEF("rendering/quality/dynamic_fonts/use_oversampling", true);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
enable autoload for command-line scripts fixes #6360
2016-09-06 18:45:35 +02:00
String local_game_path;
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
if (game_path != "" && !project_manager) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
local_game_path = game_path.replace("\\", "/");
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!local_game_path.begins_with("res://")) {
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
2017-03-05 16:44:50 +01:00
bool absolute = (local_game_path.size() > 1) && (local_game_path[0] == '/' || local_game_path[1] == ':');
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (!absolute) {
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
if (ProjectSettings::get_singleton()->is_using_datapack()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
local_game_path = "res://" + local_game_path;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
} else {
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
2017-03-05 16:44:50 +01:00
int sep = local_game_path.find_last("/");
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
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
2017-03-05 16:44:50 +01:00
if (sep == -1) {
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
Replace ` + "/" + ` with `String::file_add()`
2019-06-16 14:31:57 +02:00
local_game_path = da->get_current_dir().plus_file(local_game_path);
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
2017-03-05 16:44:50 +01:00
memdelete(da);
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
} else {
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
2017-03-05 16:44:50 +01:00
DirAccess *da = DirAccess::open(local_game_path.substr(0, sep));
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
if (da) {
Replace ` + "/" + ` with `String::file_add()`
2019-06-16 14:31:57 +02:00
local_game_path = da->get_current_dir().plus_file(local_game_path.substr(sep + 1, local_game_path.length()));
-improved physics ccd -html5 exporter works again -disable repeat on image loader by default -can change shape offset en tileset, texture offset was broken
2014-02-19 15:57:14 +01:00
memdelete(da);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
}
-Renamed GlobalConfig to ProjectSettings, makes more sense. -Added system for feature overrides, it's pretty cool :)
2017-07-19 22:00:46 +02:00
local_game_path = ProjectSettings::get_singleton()->localize_path(local_game_path);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#ifdef TOOLS_ENABLED
if (editor) {
Editor: Skip loading main scene if restore_scenes_on_load is used
2018-09-21 05:14:04 +02:00
if (game_path != GLOBAL_GET("application/run/main_scene") || !editor_node->has_scenes_in_session()) {
Error serr = editor_node->load_scene(local_game_path);
if (serr != OK)
ERR_PRINT("Failed to load scene");
}
x11: use different strings for WM_CLASS depending on context
2016-01-27 21:53:37 +01:00
OS::get_singleton()->set_context(OS::CONTEXT_EDITOR);
enable autoload for command-line scripts fixes #6360
2016-09-06 18:45:35 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
[x11] Use "application/config/name" for WM_CLASS
2018-10-05 22:18:10 +02:00
if (!editor) {
OS::get_singleton()->set_context(OS::CONTEXT_ENGINE);
}
enable autoload for command-line scripts fixes #6360
2016-09-06 18:45:35 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Prevent loading project-specific config in Project Manager The Project Manager should share the same settings as the editor most of the time. The whole init stuff with Main::setup and Main::start needs a good cleanup though. Fixes #15199.
2018-02-19 13:31:06 +01:00
if (!project_manager && !editor) { // game
Allow system certs file to be used by Editor. Note, it will only used by the Editor, not when running the game. This allows package maintainer to compile Godot to use system installed certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
// Load SSL Certificates from Project Settings (or builtin).
Rewrite StreamPeerSSL with SSLContext helper class connect_to_stream now accepts optional parameter to specify which certificates to trust. Implement accept_stream (SSL server) with key/cert parameters to specify the RSA key and X509 certificate resources.
2019-07-19 15:29:57 +02:00
Crypto::load_default_certificates(GLOBAL_DEF("network/ssl/certificates", ""));
Allow system certs file to be used by Editor. Note, it will only used by the Editor, not when running the game. This allows package maintainer to compile Godot to use system installed certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
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
2017-03-05 16:44:50 +01:00
if (game_path != "") {
Node *scene = NULL;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Ref<PackedScene> scenedata = ResourceLoader::load(local_game_path);
if (scenedata.is_valid())
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
2017-03-05 16:44:50 +01:00
scene = scenedata->instance();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
ERR_FAIL_COND_V_MSG(!scene, false, "Failed loading scene: " + local_game_path);
added a built-in scene changer API, closes #1928
2015-05-17 21:33:35 +02:00
sml->add_current_scene(scene);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add native window/taskbar icon support for Windows and macOS. Co-authored-by: Markus Törnqvist <mjt@nysv.org>
2019-05-17 15:43:56 +02:00
#ifdef OSX_ENABLED
String mac_iconpath = GLOBAL_DEF("application/config/macos_native_icon", "Variant()");
if (mac_iconpath != "") {
OS::get_singleton()->set_native_icon(mac_iconpath);
hasicon = true;
}
#endif
#ifdef WINDOWS_ENABLED
String win_iconpath = GLOBAL_DEF("application/config/windows_native_icon", "Variant()");
if (win_iconpath != "") {
OS::get_singleton()->set_native_icon(win_iconpath);
hasicon = true;
}
#endif
-Reorganized all properties of project settings (Sorry, Again). (Lot's of bloat accumulated, so it was time for clean up.) -Made EditorSettings and ProjectSettings search more useful (search in sections too)
2017-07-18 02:05:38 +02:00
String iconpath = GLOBAL_DEF("application/config/icon", "Variant()");
Add native window/taskbar icon support for Windows and macOS. Co-authored-by: Markus Törnqvist <mjt@nysv.org>
2019-05-17 15:43:56 +02:00
if ((iconpath != "") && (!hasicon)) {
Removal of Image from Variant, converted to a Resource.
2017-05-17 12:36:47 +02:00
Ref<Image> icon;
Fix icon loading error a boot
2017-08-11 19:13:17 +02:00
icon.instance();
Main: Use ImageLoader directly instead of Image::load Image::load is now issuing warnings (since ef50957) to prevent users from using it to load images at runtime which would be included in their exported game. So we now use ImageLoader explicitly instead for the custom-handled cases in Main. Fixes #21072, supersedes #22321.
2018-09-30 17:21:07 +02:00
if (ImageLoader::load_image(iconpath, icon) == OK) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->set_icon(icon);
Fix setting the default icon briefly with tools=no
2017-09-15 18:41:11 +02:00
hasicon = true;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
}
}
#ifdef TOOLS_ENABLED
Always detect and use hiDPI in the project manager if needed This makes its hiDPI behavior consistent with the editor.
2018-02-13 18:56:38 +01:00
if (project_manager || (script == "" && test == "" && game_path == "" && !editor)) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Make sure project manager gets editor hint set Previous fix in e8e06b2 worked in most cases but not if you run e.g. 'godot -', where the '-' argument would mean that 'project_manager' is false and yet that's what will be opened eventually.
2018-09-10 14:53:31 +02:00
Engine::get_singleton()->set_editor_hint(true);
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
2017-03-05 16:44:50 +01:00
ProjectManager *pmanager = memnew(ProjectManager);
ProgressDialog *progress_dialog = memnew(ProgressDialog);
Fix crash on asset lib install This is not the perfect solution, but fixes the crash and avoid a dependency on EditorNode.
2016-07-10 22:19:19 +02:00
pmanager->add_child(progress_dialog);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
sml->get_root()->add_child(pmanager);
x11: use different strings for WM_CLASS depending on context
2016-01-27 21:53:37 +01:00
OS::get_singleton()->set_context(OS::CONTEXT_PROJECTMAN);
Add option to toggle console window on Windows This is an editor setting and its value can also be toggled using an entry in the Editor toolbar. The console will still appear briefly when starting the project manager or editor, as it's still compiled as console application. Does not impact exported games, which will still run without console in release and with console in debug mode. A project setting or export option could be added to disable it in debug mode if there's demand for it, but that would greatly reduce the usefulness of debug builds if Windows users can no longer report error and crash messages. Fixes #17889. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2018-12-18 14:17:43 +01:00
project_manager = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Allow system certs file to be used by Editor. Note, it will only used by the Editor, not when running the game. This allows package maintainer to compile Godot to use system installed certificates when accessing the AssetLib.
2018-09-15 14:45:54 +02:00
if (project_manager || editor) {
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
// Hide console window if requested (Windows-only).
Add option to toggle console window on Windows This is an editor setting and its value can also be toggled using an entry in the Editor toolbar. The console will still appear briefly when starting the project manager or editor, as it's still compiled as console application. Does not impact exported games, which will still run without console in release and with console in debug mode. A project setting or export option could be added to disable it in debug mode if there's demand for it, but that would greatly reduce the usefulness of debug builds if Windows users can no longer report error and crash messages. Fixes #17889. Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2018-12-18 14:17:43 +01:00
bool hide_console = EditorSettings::get_singleton()->get_setting("interface/editor/hide_console_window");
OS::get_singleton()->set_console_visible(!hide_console);
Rewrite StreamPeerSSL with SSLContext helper class connect_to_stream now accepts optional parameter to specify which certificates to trust. Implement accept_stream (SSL server) with key/cert parameters to specify the RSA key and X509 certificate resources.
2019-07-19 15:29:57 +02:00
// Load SSL Certificates from Editor Settings (or builtin)
Crypto::load_default_certificates(EditorSettings::get_singleton()->get_setting("network/ssl/editor_ssl_certificates").operator String());
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
#endif
}
Fix setting the default icon briefly with tools=no
2017-09-15 18:41:11 +02:00
if (!hasicon) {
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
}
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
2017-03-05 16:44:50 +01:00
OS::get_singleton()->set_main_loop(main_loop);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
return true;
}
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
/* Main iteration
*
* This is the iteration of the engine's game loop, advancing the state of physics,
* rendering and audio.
* It's called directly by the platform's OS::run method, where the loop is created
* and monitored.
*
* The OS implementation can impact its draw step with the Main::force_redraw() method.
*/
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
2017-03-05 16:44:50 +01:00
uint64_t Main::last_ticks = 0;
Revert "Make the performance reporting update frequency customizable"
2018-05-28 13:47:09 +02:00
uint32_t Main::frames = 0;
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
2017-03-05 16:44:50 +01:00
uint32_t Main::frame = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
bool Main::force_redraw_requested = false;
Make recursive nature of iteration not fail.
2019-01-24 17:09:05 +01:00
int Main::iterating = 0;
Avoid cyclic iteration check, fixes #24969
2019-01-22 17:17:39 +01:00
bool Main::is_iterating() {
Make recursive nature of iteration not fail.
2019-01-24 17:09:05 +01:00
return iterating > 0;
Avoid cyclic iteration check, fixes #24969
2019-01-22 17:17:39 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Replace 'ERR_EXPLAIN' with 'ERR_FAIL_*_MSG' in "main" and "servers" directories
2019-08-08 22:08:27 +02:00
// For performance metrics.
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
static uint64_t physics_process_max = 0;
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
2017-03-05 16:44:50 +01:00
static uint64_t idle_process_max = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
bool Main::iteration() {
Do not fail on recursive iteration. Not ideal but should work for now and not crash. Fixes #25272 Eventually some sort of main even queue should be implemented to do this properly.
2019-01-24 16:42:05 +01:00
//for now do not error on this
//ERR_FAIL_COND_V(iterating, false);
Avoid cyclic iteration check, fixes #24969
2019-01-22 17:17:39 +01:00
Make recursive nature of iteration not fail.
2019-01-24 17:09:05 +01:00
iterating++;
Avoid cyclic iteration check, fixes #24969
2019-01-22 17:17:39 +01:00
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
2017-03-05 16:44:50 +01:00
uint64_t ticks = OS::get_singleton()->get_ticks_usec();
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 06:23:10 +02:00
Engine::get_singleton()->_frame_ticks = ticks;
-New inspector. -Changed UI resizing code, gained huge amount of speed. -Reorganized timer sync to clean up behavior (sorry forgot commit this before) -
2018-05-15 22:12:35 +02:00
main_timer_sync.set_cpu_ticks_usec(ticks);
main_timer_sync.set_fixed_fps(fixed_fps);
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 06:23:10 +02:00
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
2017-03-05 16:44:50 +01:00
uint64_t ticks_elapsed = ticks - last_ticks;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
int physics_fps = Engine::get_singleton()->get_iterations_per_second();
float frame_slice = 1.0 / physics_fps;
Renderer/Simulator flags Now hopefully with correct code style
2017-08-30 12:40:35 +02:00
Rasterizers are now in sync with engine The rasterisers (both GLES3 and GLES2) were calculating their own frame delta time This fix lets the rasterizers get the frame delta through the draw call That way any regulations to the frame step from the main script will not cause particle systems to process at a different step than the rest of the Engine. Remove unused rasterizer storage variable frame.prev_tick variable were not used anywhere and has been removed
2018-05-09 08:11:43 +02:00
float time_scale = Engine::get_singleton()->get_time_scale();
-New inspector. -Changed UI resizing code, gained huge amount of speed. -Reorganized timer sync to clean up behavior (sorry forgot commit this before) -
2018-05-15 22:12:35 +02:00
MainFrameTime advance = main_timer_sync.advance(frame_slice, physics_fps);
double step = advance.idle_step;
Rasterizers are now in sync with engine The rasterisers (both GLES3 and GLES2) were calculating their own frame delta time This fix lets the rasterizers get the frame delta through the draw call That way any regulations to the frame step from the main script will not cause particle systems to process at a different step than the rest of the Engine. Remove unused rasterizer storage variable frame.prev_tick variable were not used anywhere and has been removed
2018-05-09 08:11:43 +02:00
double scaled_step = step * time_scale;
Fix clipping when used in viewport or inside another viewport, fixes #1661
2015-04-15 03:05:14 +02:00
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 06:23:10 +02:00
Engine::get_singleton()->_frame_step = step;
Add access to interpolation fraction for fixed timestep interpolation Addresses #30068 This is a prerequisite for allowing proper support for fixed timestep interpolation, exposing the interpolation fraction to the engine, modules and gdscript. The interpolation fraction is the fraction through the current physics tick at the time of the current frame.
2019-07-01 18:42:02 +02:00
Engine::get_singleton()->_physics_interpolation_fraction = advance.interpolation_fraction;
Lots of work on Audio & Physics engine: -Added new 3D stream player node -Added ability for Area to capture sound from streams -Added small features in physics to be able to properly guess distance to areas for sound -Fixed 3D CollisionObject so shapes are added the same as in 2D, directly from children -Fixed KinematicBody API to make it the same as 2D.
2017-07-15 06:23:10 +02:00
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
uint64_t physics_process_ticks = 0;
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
2017-03-05 16:44:50 +01:00
uint64_t idle_process_ticks = 0;
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
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
2017-03-05 16:44:50 +01:00
frame += ticks_elapsed;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
last_ticks = ticks;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
static const int max_physics_steps = 8;
if (fixed_fps == -1 && advance.physics_steps > max_physics_steps) {
step -= (advance.physics_steps - max_physics_steps) * frame_slice;
advance.physics_steps = max_physics_steps;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
bool exit = false;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
Engine::get_singleton()->_in_physics = true;
-Modified Input and added is_action_just_pressed() as well as is_action_just_released()
2016-09-01 23:58:52 +02:00
Add hysteresis to physics timestep count per frame Add new class _TimerSync to manage timestep calculations. The new class handles the decisions about simulation progression previously handled by main::iteration(). It is fed the current timer ticks and determines how many physics updates are to be run and what the delta argument to the _process() functions should be. The new class tries to keep the number of physics updates per frame as constant as possible from frame to frame. Ideally, it would be N steps every render frame, but even with perfectly regular rendering, the general case is that N or N+1 steps are required per frame, for some fixed N. The best guess for N is stored in typical_physics_steps. When determining the number of steps to take, no restrictions are imposed between the choice of typical_physics_steps and typical_physics_steps+1 steps. Should more or less steps than that be required, the accumulated remaining time (as before, stored in time_accum) needs to surpass its boundaries by some minimal threshold. Once surpassed, typical_physics_steps is updated to allow the new step count for future updates. Care is taken that the modified calculation of the number of physics steps is not observable from game code that only checks the delta parameters to the _process and _physics_process functions; in addition to modifying the number of steps, the _process argument is modified as well to stay in expected bounds. Extra care is taken that the accumulated steps still sum up to roughly the real elapsed time, up to a maximum tolerated difference. To allow the hysteresis code to work correctly on higher refresh monitors, the number of typical physics steps is not only recorded and kept consistent for single render frames, but for groups of them. Currently, up to 12 frames are grouped that way. The engine parameter physics_jitter_fix controls both the maximum tolerated difference between wall clock time and summed up _process arguments and the threshold for changing typical_physics_steps. It is given in units of the real physics frame slice 1/physics_fps. Set physics_jitter_fix to 0 to disable the effects of the new code here. It starts to be effective against the random physics jitter at around 0.02 to 0.05. at values greater than 1 it starts having ill effects on the engine's ability to react sensibly to dropped frames and framerate changes.
2018-02-11 00:03:31 +01:00
for (int iters = 0; iters < advance.physics_steps; ++iters) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Refactor Fixed to Physics
2017-10-21 16:28:08 +02:00
uint64_t physics_begin = OS::get_singleton()->get_ticks_usec();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
PhysicsServer::get_singleton()->flush_queries();
Physics2DServer::get_singleton()->sync();
Physics2DServer::get_singleton()->flush_queries();
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
2017-03-05 16:44:50 +01:00
if (OS::get_singleton()->get_main_loop()->iteration(frame_slice * time_scale)) {
exit = true;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
break;
}
message_queue->flush();
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
2017-03-05 16:44:50 +01:00
PhysicsServer::get_singleton()->step(frame_slice * time_scale);
ability to run 2D physics in a thread also, 2D physics is now thread safe too. see physics_2d/thread_model
2015-05-26 06:05:08 +02:00
Physics2DServer::get_singleton()->end_sync();
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
2017-03-05 16:44:50 +01:00
Physics2DServer::get_singleton()->step(frame_slice * time_scale);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
message_queue->flush();
Refactor Fixed to Physics
2017-10-21 16:28:08 +02:00
physics_process_ticks = MAX(physics_process_ticks, OS::get_singleton()->get_ticks_usec() - physics_begin); // keep the largest one for reference
physics_process_max = MAX(OS::get_singleton()->get_ticks_usec() - physics_begin, physics_process_max);
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
Engine::get_singleton()->_physics_frames++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
Engine::get_singleton()->_in_physics = false;
-Modified Input and added is_action_just_pressed() as well as is_action_just_released()
2016-09-01 23:58:52 +02:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
uint64_t idle_begin = OS::get_singleton()->get_ticks_usec();
Fixes physic_fps=0 bug. Added a condition to check if the loop exited without iteration being run by checking the return value from idle(). Fixes: #26321
2019-03-09 12:36:37 +01:00
if (OS::get_singleton()->get_main_loop()->idle(step * time_scale)) {
exit = true;
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
message_queue->flush();
-New inspector. -Changed UI resizing code, gained huge amount of speed. -Reorganized timer sync to clean up behavior (sorry forgot commit this before) -
2018-05-15 22:12:35 +02:00
VisualServer::get_singleton()->sync(); //sync if still drawing from previous frames.
-fixed many memory initialization issues -fixed deadlock on previews thread -fixed compilation errors on unix
2015-06-07 03:06:58 +02:00
Expose disable_render_loop property to GDScript
2020-06-18 12:49:24 +02:00
if (OS::get_singleton()->can_draw() && VisualServer::get_singleton()->is_render_loop_enabled()) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if ((!force_redraw_requested) && OS::get_singleton()->is_in_low_processor_usage_mode()) {
if (VisualServer::get_singleton()->has_changed()) {
Rasterizers are now in sync with engine The rasterisers (both GLES3 and GLES2) were calculating their own frame delta time This fix lets the rasterizers get the frame delta through the draw call That way any regulations to the frame step from the main script will not cause particle systems to process at a different step than the rest of the Engine. Remove unused rasterizer storage variable frame.prev_tick variable were not used anywhere and has been removed
2018-05-09 08:11:43 +02:00
VisualServer::get_singleton()->draw(true, scaled_step); // flush visual commands
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
Engine::get_singleton()->frames_drawn++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
} else {
Rasterizers are now in sync with engine The rasterisers (both GLES3 and GLES2) were calculating their own frame delta time This fix lets the rasterizers get the frame delta through the draw call That way any regulations to the frame step from the main script will not cause particle systems to process at a different step than the rest of the Engine. Remove unused rasterizer storage variable frame.prev_tick variable were not used anywhere and has been removed
2018-05-09 08:11:43 +02:00
VisualServer::get_singleton()->draw(true, scaled_step); // flush visual commands
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
Engine::get_singleton()->frames_drawn++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
force_redraw_requested = false;
}
}
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
2017-03-05 16:44:50 +01:00
idle_process_ticks = OS::get_singleton()->get_ticks_usec() - idle_begin;
idle_process_max = MAX(idle_process_ticks, idle_process_max);
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
uint64_t frame_time = OS::get_singleton()->get_ticks_usec() - ticks;
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
2017-03-05 16:44:50 +01:00
for (int i = 0; i < ScriptServer::get_language_count(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
ScriptServer::get_language(i)->frame();
}
Add Audio Server profiling time to the profiler
2018-06-21 02:02:02 +02:00
AudioServer::get_singleton()->update();
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
if (script_debugger) {
if (script_debugger->is_profiling()) {
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
script_debugger->profiling_set_frame_times(USEC_TO_SEC(frame_time), USEC_TO_SEC(idle_process_ticks), USEC_TO_SEC(physics_process_ticks), frame_slice);
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
script_debugger->idle_poll();
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Revert "Make the performance reporting update frequency customizable"
2018-05-28 13:47:09 +02:00
frames++;
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
Engine::get_singleton()->_idle_frames++;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Revert "Make the performance reporting update frequency customizable"
2018-05-28 13:47:09 +02:00
if (frame > 1000000) {
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
if (editor || project_manager) {
if (print_fps) {
Improve command line `--print-fps` display - Display the frame time in addition to FPS. - Frame time is a more objective measurement in comparison to FPS, but FPS is more familiar to people less acquainted with profiling. - Rename "Game" to "Project" for the project FPS printing line. (cherry picked from commit 157d8e4d36b5286146554aedda0e286056bbe32c)
2021-04-08 23:03:30 +02:00
print_line(vformat("Editor FPS: %d (%s mspf)", frames, rtos(1000.0 / frames).pad_decimals(1)));
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
}
} else if (GLOBAL_GET("debug/settings/stdout/print_fps") || print_fps) {
Improve command line `--print-fps` display - Display the frame time in addition to FPS. - Frame time is a more objective measurement in comparison to FPS, but FPS is more familiar to people less acquainted with profiling. - Rename "Game" to "Project" for the project FPS printing line. (cherry picked from commit 157d8e4d36b5286146554aedda0e286056bbe32c)
2021-04-08 23:03:30 +02:00
print_line(vformat("Project FPS: %d (%s mspf)", frames, rtos(1000.0 / frames).pad_decimals(1)));
Add --print-fps option to output FPS to stdout Works both for the editor and games. Projects can still use "debug/settings/stdout/print_fps" to enable it permanently. The --print-fps option takes precedence (so works even if the project setting is disabled). That setting is also no longer redefined on the fly based on the verbose flag, that was a mess.
2018-03-21 08:46:05 +01:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
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
2017-03-05 16:44:50 +01:00
Engine::get_singleton()->_fps = frames;
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
performance->set_process_time(USEC_TO_SEC(idle_process_max));
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
performance->set_physics_process_time(USEC_TO_SEC(physics_process_max));
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
2017-03-05 16:44:50 +01:00
idle_process_max = 0;
Renamed fixed_process to physics_process
2017-09-30 16:19:07 +02:00
physics_process_max = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Revert "Make the performance reporting update frequency customizable"
2018-05-28 13:47:09 +02:00
frame %= 1000000;
frames = 0;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
Make recursive nature of iteration not fail.
2019-01-24 17:09:05 +01:00
iterating--;
Avoid cyclic iteration check, fixes #24969
2019-01-22 17:17:39 +01:00
Renderer/Simulator flags Now hopefully with correct code style
2017-08-30 12:40:35 +02:00
if (fixed_fps != -1)
return exit;
Move frame delaying functions from Main to OS. Will allow specific platforms to override it and avoid blocking on the main/GUI thread. (cherry picked from commit 1b6e3458b24836c362ac245ddeec627207dd2981)
2020-06-29 20:46:21 +02:00
OS::get_singleton()->add_frame_delay(OS::get_singleton()->can_draw());
Add possibility to limit frame to main loop (application/target_fps) target-fps working, and use fixed physics step before adding physics-fps in project setting Complete implementation of framelimit Conflicts: main/main.cpp
2014-02-19 16:35:39 +01:00
Added an auto quit and auto build flag to the command line options.
2018-02-14 16:23:04 +01:00
#ifdef TOOLS_ENABLED
if (auto_build_solutions) {
auto_build_solutions = false;
Ignore command line --build-solutions when not editing project This option is meant to use together with `--path` or from a project folder. Otherwise the project manager is opened and the option triggers a crash. Fixes #25589.
2020-01-13 13:55:54 +01:00
// Only relevant when running the editor.
if (!editor) {
ERR_FAIL_V_MSG(true, "Command line option --build-solutions was passed, but no project is being edited. Aborting.");
}
Added an auto quit and auto build flag to the command line options.
2018-02-14 16:23:04 +01:00
if (!EditorNode::get_singleton()->call_build()) {
Ignore command line --build-solutions when not editing project This option is meant to use together with `--path` or from a project folder. Otherwise the project manager is opened and the option triggers a crash. Fixes #25589.
2020-01-13 13:55:54 +01:00
ERR_FAIL_V_MSG(true, "Command line option --build-solutions was passed, but the build callback failed. Aborting.");
Added an auto quit and auto build flag to the command line options.
2018-02-14 16:23:04 +01:00
}
}
#endif
return exit || auto_quit;
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
}
void Main::force_redraw() {
force_redraw_requested = true;
Main: Group static members and add some docs
2018-09-20 11:45:05 +02:00
}
/* Engine deinitialization
*
* Responsible for freeing all the memory allocated by previous setup steps,
* so that the engine closes cleanly without leaking memory or crashing.
* The order matters as some of those steps are linked with each other.
*/
Make glue generation shutdown more graceful (cherry picked from commit 23907e6f193636c4907d0ccdb9a886fff63ab275)
2021-02-22 11:06:33 +01:00
void Main::cleanup(bool p_force) {
if (!p_force) {
ERR_FAIL_COND(!_start_success);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
Flush remaining messages before quitting the game when loading fails This change allows error messages to be printed in the editor debugger when the game fails on load, instead of displaying them in the console terminal only.
2019-11-29 14:01:56 +01:00
if (script_debugger) {
// Flush any remaining messages
script_debugger->idle_poll();
}
Added basic support for custom resource savers and loaders
2018-06-11 02:59:53 +02:00
ResourceLoader::remove_custom_loaders();
ResourceSaver::remove_custom_savers();
Main::cleanup: Move MessageQueue deletion further down where it's safer Partial revert of #15702 which triggered the issue. Fixes #39786. (cherry picked from commit 6480efba45ae467e38955012d67857a4a81b752b)
2020-06-24 16:57:37 +02:00
// Flush before uninitializing the scene, but delete the MessageQueue as late as possible.
Fix crash when closing the editor
2018-01-14 13:50:52 +01:00
message_queue->flush();
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
if (script_debugger) {
if (use_debug_profiler) {
script_debugger->profiling_end();
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
memdelete(script_debugger);
First version of Profiler It is now possible to profile GDScript as well as some parts of Godot internals.
2016-05-22 02:18:16 +02:00
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->delete_main_loop();
OS::get_singleton()->_cmdline.clear();
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
2017-03-05 16:44:50 +01:00
OS::get_singleton()->_execpath = "";
OS::get_singleton()->_local_clipboard = "";
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
GDScript files are converted to binary on export now.
2017-12-14 19:33:54 +01:00
ResourceLoader::clear_translation_remaps();
ResourceLoader::clear_path_remaps();
Script languges are uninitialized properly now.
2017-07-22 21:11:04 +02:00
ScriptServer::finish_languages();
Oops! Audio engine has vanished :D
2017-01-15 20:06:14 +01:00
Sync pending VisualServer commands after ScriptServer finalization This is needed as C# may free resources from the finalizer thread during CSharpLanguage::finish(). Previously this would result in RIDs not being freed.
2020-01-13 21:46:41 +01:00
// Sync pending commands that may have been queued from a different thread during ScriptServer finalization
VisualServer::get_singleton()->sync();
-scripts are converted to bytecode on export -fix bug in doc where touchscreen events were not documented
2014-02-25 13:31:47 +01:00
#ifdef TOOLS_ENABLED
EditorNode::unregister_editor_types();
#endif
Redoing the ARVR GDNative interface as module and tighter implementation
2017-10-07 15:51:17 +02:00
if (arvr_server) {
// cleanup now before we pull the rug from underneath...
memdelete(arvr_server);
}
Improved support for custom image loaders
2018-09-03 06:36:35 +02:00
ImageLoader::cleanup();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
unregister_driver_types();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
unregister_module_types();
Facilitate exposing platform-exclusive interfaces to all platforms This makes the interfaces available, without implementation, in other platforms and the editor, which facilitates documenting platform-exclusive classes. Platform-exclusive APIs must be set up in platform/<platform>/api/api.cpp. Provide noop method-implementations where necessary. Also setup and document the HTML5 platform's JavaScript singleton.
2017-11-16 01:33:48 +01:00
unregister_platform_apis();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
unregister_scene_types();
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
unregister_server_types();
Destroy AudioServer after other non-core types are unregistered This is important for some GDNative bindings and probably for Mono. They may keep references to audio objects which are freed when they are unregistered. If AudioServer is already deleted at that point, it causes segfaults.
2018-01-11 11:01:35 +01:00
if (audio_server) {
audio_server->finish();
memdelete(audio_server);
}
iOS modular build and export implementation.
2019-11-29 07:54:39 +01:00
if (camera_server) {
memdelete(camera_server);
}
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
OS::get_singleton()->finalize();
Implemented physics plug Moved init_physics Implemented physics 2D plug Fix clang Fix clang Fix static check Fix clang Fix static check Moved physics server initialization Moved physics server settings initialization
2017-10-21 13:02:06 +02:00
finalize_physics();
remove trailing whitespace
2016-03-09 00:00:52 +01:00
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (packed_data)
memdelete(packed_data);
if (file_access_network_client)
memdelete(file_access_network_client);
if (performance)
memdelete(performance);
if (input_map)
memdelete(input_map);
if (translation_server)
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
2017-03-05 16:44:50 +01:00
memdelete(translation_server);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
if (globals)
memdelete(globals);
Created new Engine singleton, and moved engine related OS functions to it.
2017-01-13 16:51:14 +01:00
if (engine)
memdelete(engine);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
-Project/Editor settings now use new inspector -Project/Editor settings now show tooltips properly -Settings thar require restart now will show a restart warning -Video driver is now visible all the time, can be changed easily -Added function to request current video driver
2018-07-19 23:58:15 +02:00
if (OS::get_singleton()->is_restart_on_exit_set()) {
//attempt to restart with arguments
String exec = OS::get_singleton()->get_executable_path();
Fix build issues and typos after c69de2ba4
2018-07-20 08:37:10 +02:00
List<String> args = OS::get_singleton()->get_restart_on_exit_arguments();
-Project/Editor settings now use new inspector -Project/Editor settings now show tooltips properly -Settings thar require restart now will show a restart warning -Video driver is now visible all the time, can be changed easily -Added function to request current video driver
2018-07-19 23:58:15 +02:00
OS::ProcessID pid = 0;
OS::get_singleton()->execute(exec, args, false, &pid);
OS::get_singleton()->set_restart_on_exit(false, List<String>()); //clear list (uses memory)
}
Main::cleanup: Move MessageQueue deletion further down where it's safer Partial revert of #15702 which triggered the issue. Fixes #39786. (cherry picked from commit 6480efba45ae467e38955012d67857a4a81b752b)
2020-06-24 16:57:37 +02:00
// Now should be safe to delete MessageQueue (famous last words).
message_queue->flush();
memdelete(message_queue);
GODOT IS OPEN SOURCE
2014-02-10 02:10:30 +01:00
unregister_core_driver_types();
unregister_core_types();
OS::get_singleton()->finalize_core();
}
Reference in a new issue Copy permalink