From 710b34b70227becdc652b4ae027fe0ac47409642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 13:20:05 +0200 Subject: [PATCH 1/4] Style: Fix missing/invalid copyright headers --- core/math/delaunay_3d.h | 30 +++++++++++++++++++ .../plugins/texture_layered_editor_plugin.cpp | 2 +- .../plugins/texture_layered_editor_plugin.h | 2 +- modules/denoise/denoise_wrapper.cpp | 30 +++++++++++++++++++ modules/denoise/denoise_wrapper.h | 30 +++++++++++++++++++ modules/lightmapper_rd/lightmapper_rd.cpp | 30 +++++++++++++++++++ modules/lightmapper_rd/lightmapper_rd.h | 30 +++++++++++++++++++ .../editor_debugger_server_websocket.cpp | 6 ++-- .../editor_debugger_server_websocket.h | 6 ++-- .../remote_debugger_peer_websocket.cpp | 6 ++-- .../remote_debugger_peer_websocket.h | 6 ++-- .../javascript/display_server_javascript.cpp | 30 +++++++++++++++++++ scene/3d/lightmap_probe.cpp | 30 +++++++++++++++++++ scene/3d/lightmap_probe.h | 30 +++++++++++++++++++ scene/3d/lightmapper.cpp | 30 +++++++++++++++++++ scene/3d/lightmapper.h | 30 +++++++++++++++++++ 16 files changed, 314 insertions(+), 14 deletions(-) diff --git a/core/math/delaunay_3d.h b/core/math/delaunay_3d.h index ab0993abc9..0976d8556f 100644 --- a/core/math/delaunay_3d.h +++ b/core/math/delaunay_3d.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* delaunay_3d.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef DELAUNAY_3D_H #define DELAUNAY_3D_H diff --git a/editor/plugins/texture_layered_editor_plugin.cpp b/editor/plugins/texture_layered_editor_plugin.cpp index 6d716951b3..8ab17590f4 100644 --- a/editor/plugins/texture_layered_editor_plugin.cpp +++ b/editor/plugins/texture_layered_editor_plugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* texture_editor_plugin.cpp */ +/* texture_layered_editor_plugin.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/editor/plugins/texture_layered_editor_plugin.h b/editor/plugins/texture_layered_editor_plugin.h index e8503e845e..4339486061 100644 --- a/editor/plugins/texture_layered_editor_plugin.h +++ b/editor/plugins/texture_layered_editor_plugin.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* texture_editor_plugin.h */ +/* texture_layered_editor_plugin.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/denoise/denoise_wrapper.cpp b/modules/denoise/denoise_wrapper.cpp index feeeaef507..c12c6d9c31 100644 --- a/modules/denoise/denoise_wrapper.cpp +++ b/modules/denoise/denoise_wrapper.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* denoise_wrapper.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #include "denoise_wrapper.h" #include "thirdparty/oidn/include/OpenImageDenoise/oidn.h" #include diff --git a/modules/denoise/denoise_wrapper.h b/modules/denoise/denoise_wrapper.h index 3aef326e22..2107df09c1 100644 --- a/modules/denoise/denoise_wrapper.h +++ b/modules/denoise/denoise_wrapper.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* denoise_wrapper.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef DENOISE_WRAPPER_H #define DENOISE_WRAPPER_H diff --git a/modules/lightmapper_rd/lightmapper_rd.cpp b/modules/lightmapper_rd/lightmapper_rd.cpp index 6983c222c0..10f8512237 100644 --- a/modules/lightmapper_rd/lightmapper_rd.cpp +++ b/modules/lightmapper_rd/lightmapper_rd.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmapper_rd.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #include "lightmapper_rd.h" #include "core/math/geometry.h" #include "core/project_settings.h" diff --git a/modules/lightmapper_rd/lightmapper_rd.h b/modules/lightmapper_rd/lightmapper_rd.h index cb98efbeaa..c6f1b0e710 100644 --- a/modules/lightmapper_rd/lightmapper_rd.h +++ b/modules/lightmapper_rd/lightmapper_rd.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmapper_rd.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef LIGHTMAPPER_RD_H #define LIGHTMAPPER_RD_H diff --git a/modules/websocket/editor_debugger_server_websocket.cpp b/modules/websocket/editor_debugger_server_websocket.cpp index 0cf78eaa9e..66f3dac907 100644 --- a/modules/websocket/editor_debugger_server_websocket.cpp +++ b/modules/websocket/editor_debugger_server_websocket.cpp @@ -1,12 +1,12 @@ /*************************************************************************/ -/* script_editor_debugger_websocket.cpp */ +/* editor_debugger_server_websocket.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/websocket/editor_debugger_server_websocket.h b/modules/websocket/editor_debugger_server_websocket.h index 81a31d8364..cd2c1e45cd 100644 --- a/modules/websocket/editor_debugger_server_websocket.h +++ b/modules/websocket/editor_debugger_server_websocket.h @@ -1,12 +1,12 @@ /*************************************************************************/ -/* script_editor_debugger_websocket.h */ +/* editor_debugger_server_websocket.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/websocket/remote_debugger_peer_websocket.cpp b/modules/websocket/remote_debugger_peer_websocket.cpp index d156a39f53..6ff03651d1 100644 --- a/modules/websocket/remote_debugger_peer_websocket.cpp +++ b/modules/websocket/remote_debugger_peer_websocket.cpp @@ -1,12 +1,12 @@ /*************************************************************************/ -/* script_debugger_websocket.cpp */ +/* remote_debugger_peer_websocket.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/modules/websocket/remote_debugger_peer_websocket.h b/modules/websocket/remote_debugger_peer_websocket.h index fe46533bed..33e4edaa21 100644 --- a/modules/websocket/remote_debugger_peer_websocket.h +++ b/modules/websocket/remote_debugger_peer_websocket.h @@ -1,12 +1,12 @@ /*************************************************************************/ -/* script_debugger_websocket.h */ +/* remote_debugger_peer_websocket.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index c302614eca..53b22bbe7c 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* display_server_javascript.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #include "platform/javascript/display_server_javascript.h" #include "drivers/dummy/rasterizer_dummy.h" diff --git a/scene/3d/lightmap_probe.cpp b/scene/3d/lightmap_probe.cpp index 2da81337f0..ee21934b80 100644 --- a/scene/3d/lightmap_probe.cpp +++ b/scene/3d/lightmap_probe.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmap_probe.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #include "lightmap_probe.h" LightmapProbe::LightmapProbe() { diff --git a/scene/3d/lightmap_probe.h b/scene/3d/lightmap_probe.h index 65bc6914f4..c4bd33556f 100644 --- a/scene/3d/lightmap_probe.h +++ b/scene/3d/lightmap_probe.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmap_probe.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef LIGHTMAP_PROBE_H #define LIGHTMAP_PROBE_H diff --git a/scene/3d/lightmapper.cpp b/scene/3d/lightmapper.cpp index 53ebd5ee2e..26faf5154c 100644 --- a/scene/3d/lightmapper.cpp +++ b/scene/3d/lightmapper.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmapper.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #include "lightmapper.h" LightmapDenoiser *(*LightmapDenoiser::create_function)() = nullptr; diff --git a/scene/3d/lightmapper.h b/scene/3d/lightmapper.h index 7c052a30a0..ccf9bde279 100644 --- a/scene/3d/lightmapper.h +++ b/scene/3d/lightmapper.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* lightmapper.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* 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. */ +/*************************************************************************/ + #ifndef LIGHTMAPPER_H #define LIGHTMAPPER_H From 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 May 2020 13:23:58 +0200 Subject: [PATCH 2/4] Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks Which means that reduz' beloved style which we all became used to will now be changed automatically to remove the first empty line. This makes us lean closer to 1TBS (the one true brace style) instead of hybridating it with some Allman-inspired spacing. There's still the case of braces around single-statement blocks that needs to be addressed (but clang-format can't help with that, but clang-tidy may if we agree about it). Part of #33027. --- .clang-format | 2 +- core/array.cpp | 44 -- core/array.h | 1 - core/bind/core_bind.cpp | 231 --------- core/bind/core_bind.h | 7 - core/callable.cpp | 7 - core/callable.h | 1 - core/callable_method_pointer.cpp | 1 - core/callable_method_pointer.h | 8 - core/class_db.cpp | 119 ----- core/class_db.h | 18 - core/color.cpp | 39 -- core/color.h | 10 - core/command_queue_mt.cpp | 6 - core/command_queue_mt.h | 9 - core/compressed_translation.cpp | 16 - core/compressed_translation.h | 5 - core/container_type_validate.h | 2 - core/core_string_names.h | 1 - core/cowdata.h | 16 - core/crypto/crypto.cpp | 8 - core/crypto/crypto_core.h | 5 - core/crypto/hashing_context.cpp | 1 - core/debugger/debugger_marshalls.h | 1 - core/debugger/engine_debugger.cpp | 1 - core/debugger/local_debugger.cpp | 34 -- core/debugger/local_debugger.h | 1 - core/debugger/remote_debugger.cpp | 16 - core/debugger/remote_debugger_peer.cpp | 4 - core/debugger/script_debugger.cpp | 13 - core/debugger/script_debugger.h | 1 - core/dictionary.cpp | 26 - core/dictionary.h | 1 - core/engine.cpp | 12 - core/engine.h | 1 - core/error_macros.cpp | 7 - core/error_macros.h | 1 - core/func_ref.cpp | 5 - core/func_ref.h | 1 - core/global_constants.cpp | 7 - core/hash_map.h | 46 -- core/hashfuncs.h | 7 - core/image.cpp | 209 -------- core/input/input.cpp | 77 --- core/input/input.h | 1 - core/input/input_event.cpp | 140 ------ core/input/input_event.h | 11 - core/input/input_map.cpp | 20 - core/input/input_map.h | 1 - core/io/compression.cpp | 10 - core/io/compression.h | 1 - core/io/config_file.cpp | 26 - core/io/config_file.h | 1 - core/io/dtls_server.cpp | 2 - core/io/file_access_buffered.cpp | 18 - core/io/file_access_buffered.h | 3 - core/io/file_access_buffered_fa.h | 12 - core/io/file_access_compressed.cpp | 31 -- core/io/file_access_compressed.h | 1 - core/io/file_access_encrypted.cpp | 33 -- core/io/file_access_memory.cpp | 18 - core/io/file_access_memory.h | 1 - core/io/file_access_network.cpp | 40 -- core/io/file_access_network.h | 3 - core/io/file_access_pack.cpp | 51 -- core/io/file_access_pack.h | 8 - core/io/file_access_zip.cpp | 35 -- core/io/file_access_zip.h | 3 - core/io/http_client.cpp | 49 -- core/io/http_client.h | 1 - core/io/image_loader.cpp | 16 - core/io/image_loader.h | 1 - core/io/ip.cpp | 21 - core/io/ip_address.cpp | 16 - core/io/ip_address.h | 1 - core/io/json.cpp | 43 -- core/io/json.h | 2 - core/io/logger.h | 1 - core/io/marshalls.cpp | 114 ----- core/io/marshalls.h | 21 - core/io/multiplayer_api.cpp | 44 -- core/io/multiplayer_api.h | 1 - core/io/net_socket.cpp | 1 - core/io/net_socket.h | 1 - core/io/networked_multiplayer_peer.cpp | 1 - core/io/networked_multiplayer_peer.h | 1 - core/io/packet_peer.cpp | 24 - core/io/packet_peer.h | 2 - core/io/packet_peer_dtls.cpp | 2 - core/io/packet_peer_udp.cpp | 19 - core/io/pck_packer.cpp | 11 - core/io/pck_packer.h | 2 - core/io/resource_format_binary.cpp | 159 ------ core/io/resource_format_binary.h | 3 - core/io/resource_importer.cpp | 32 -- core/io/resource_importer.h | 2 - core/io/resource_loader.cpp | 59 --- core/io/resource_loader.h | 2 - core/io/resource_saver.cpp | 17 - core/io/resource_saver.h | 1 - core/io/stream_peer.cpp | 49 -- core/io/stream_peer.h | 1 - core/io/stream_peer_ssl.cpp | 2 - core/io/stream_peer_tcp.cpp | 32 -- core/io/stream_peer_tcp.h | 1 - core/io/tcp_server.cpp | 7 - core/io/tcp_server.h | 1 - core/io/translation_loader_po.cpp | 13 - core/io/udp_server.cpp | 6 - core/io/xml_parser.cpp | 24 - core/io/xml_parser.h | 1 - core/io/zip_io.cpp | 12 - core/list.h | 50 -- core/local_vector.h | 10 - core/map.h | 46 -- core/math/a_star.cpp | 39 -- core/math/a_star.h | 2 - core/math/aabb.cpp | 34 -- core/math/aabb.h | 17 - core/math/audio_frame.h | 2 - core/math/basis.cpp | 33 -- core/math/basis.h | 19 - core/math/camera_matrix.cpp | 34 -- core/math/camera_matrix.h | 3 - core/math/delaunay_2d.h | 4 - core/math/delaunay_3d.h | 8 - core/math/disjoint_set.h | 2 - core/math/expression.cpp | 158 ------ core/math/expression.h | 8 - core/math/face3.cpp | 29 -- core/math/face3.h | 15 - core/math/geometry.cpp | 98 ---- core/math/geometry.h | 43 -- core/math/math_fieldwise.cpp | 1 - core/math/math_funcs.cpp | 2 - core/math/math_funcs.h | 7 - core/math/octree.h | 118 ----- core/math/plane.cpp | 13 - core/math/plane.h | 7 - core/math/quat.cpp | 5 - core/math/quat.h | 2 - core/math/quick_hull.cpp | 31 -- core/math/quick_hull.h | 5 - core/math/rect2.cpp | 5 - core/math/rect2.h | 16 - core/math/transform.cpp | 21 - core/math/transform.h | 11 - core/math/transform_2d.cpp | 24 - core/math/transform_2d.h | 11 - core/math/triangle_mesh.cpp | 67 --- core/math/triangle_mesh.h | 9 - core/math/triangulate.cpp | 1 - core/math/vector2.cpp | 33 -- core/math/vector2.h | 20 - core/math/vector3.cpp | 12 - core/math/vector3.h | 42 -- core/math/vector3i.cpp | 4 - core/math/vector3i.h | 26 - core/message_queue.cpp | 29 -- core/message_queue.h | 2 - core/method_bind.cpp | 7 - core/method_bind.h | 18 - core/method_ptrcall.h | 8 - core/node_path.cpp | 35 -- core/node_path.h | 2 - core/oa_hash_map.h | 9 - core/object.cpp | 128 ----- core/object.h | 8 - core/os/dir_access.cpp | 38 -- core/os/dir_access.h | 4 - core/os/file_access.cpp | 72 --- core/os/file_access.h | 5 - core/os/keyboard.cpp | 11 - core/os/main_loop.cpp | 6 - core/os/main_loop.h | 1 - core/os/memory.cpp | 11 - core/os/memory.h | 9 - core/os/midi_driver.cpp | 5 - core/os/midi_driver.h | 1 - core/os/mutex.h | 1 - core/os/os.cpp | 48 -- core/os/os.h | 3 - core/os/rw_lock.cpp | 1 - core/os/rw_lock.h | 2 - core/os/thread.cpp | 5 - core/os/thread.h | 1 - core/os/thread_dummy.h | 2 - core/os/threaded_array_processor.h | 3 - core/packed_data_container.cpp | 43 -- core/packed_data_container.h | 1 - core/pair.h | 2 - core/pool_allocator.cpp | 50 -- core/pool_allocator.h | 2 - core/print_string.cpp | 9 - core/print_string.h | 1 - core/project_settings.cpp | 65 --- core/project_settings.h | 1 - core/reference.cpp | 11 - core/reference.h | 24 - core/register_core_types.cpp | 3 - core/resource.cpp | 52 -- core/resource.h | 1 - core/rid.h | 5 - core/rid_owner.h | 6 - core/ring_buffer.h | 5 - core/safe_refcount.cpp | 8 - core/safe_refcount.h | 14 - core/script_language.cpp | 33 -- core/script_language.h | 3 - core/self_list.h | 4 - core/set.h | 42 -- core/simple_type.h | 3 - core/sort_array.h | 28 -- core/string_buffer.h | 1 - core/string_builder.cpp | 4 - core/string_builder.h | 1 - core/string_name.cpp | 29 -- core/string_name.h | 10 - core/thread_work_pool.cpp | 3 - core/thread_work_pool.h | 3 - core/translation.cpp | 33 -- core/translation.h | 2 - core/type_info.h | 4 - core/typed_array.h | 5 - core/ucaps.h | 2 - core/undo_redo.cpp | 42 -- core/undo_redo.h | 2 - core/ustring.cpp | 311 ------------ core/ustring.h | 9 - core/variant.cpp | 476 ------------------ core/variant.h | 6 - core/variant_call.cpp | 78 --- core/variant_op.cpp | 186 ------- core/variant_parser.cpp | 153 ------ core/variant_parser.h | 6 - core/vector.h | 6 - core/vmap.h | 17 - core/vset.h | 9 - drivers/alsa/audio_driver_alsa.cpp | 13 - drivers/alsa/audio_driver_alsa.h | 1 - drivers/alsamidi/midi_driver_alsamidi.cpp | 7 - drivers/alsamidi/midi_driver_alsamidi.h | 1 - drivers/coreaudio/audio_driver_coreaudio.cpp | 15 - drivers/coreaudio/audio_driver_coreaudio.h | 1 - drivers/coremidi/midi_driver_coremidi.cpp | 4 - drivers/coremidi/midi_driver_coremidi.h | 1 - drivers/dummy/rasterizer_dummy.h | 1 - drivers/gles2/rasterizer_canvas_gles2.cpp | 69 --- drivers/gles2/rasterizer_canvas_gles2.h | 1 - drivers/gles2/rasterizer_gles2.cpp | 16 - drivers/gles2/rasterizer_gles2.h | 1 - drivers/gles2/rasterizer_scene_gles2.cpp | 115 ----- drivers/gles2/rasterizer_scene_gles2.h | 6 - drivers/gles2/rasterizer_storage_gles2.cpp | 247 --------- drivers/gles2/rasterizer_storage_gles2.h | 26 - drivers/gles2/shader_compiler_gles2.cpp | 38 -- drivers/gles2/shader_compiler_gles2.h | 3 - drivers/gles2/shader_gles2.cpp | 24 - drivers/gles2/shader_gles2.h | 10 - drivers/gles2/shaders/blend_shape.glsl | 1 - drivers/gles2/shaders/canvas.glsl | 5 - drivers/gles2/shaders/canvas_shadow.glsl | 2 - drivers/gles2/shaders/copy.glsl | 3 - drivers/gles2/shaders/cube_to_dp.glsl | 2 - drivers/gles2/shaders/cubemap_filter.glsl | 4 - drivers/gles2/shaders/effect_blur.glsl | 4 - drivers/gles2/shaders/exposure.glsl | 2 - drivers/gles2/shaders/lens_distorted.glsl | 1 - drivers/gles2/shaders/particles.glsl | 6 - drivers/gles2/shaders/resolve.glsl | 2 - drivers/gles2/shaders/scene.glsl | 21 - .../shaders/screen_space_reflection.glsl | 5 - drivers/gles2/shaders/ssao.glsl | 2 - drivers/gles2/shaders/ssao_blur.glsl | 3 - drivers/gles2/shaders/ssao_minify.glsl | 2 - drivers/gles2/shaders/subsurf_scattering.glsl | 3 - drivers/png/image_loader_png.cpp | 6 - drivers/png/png_driver_common.cpp | 3 - drivers/png/resource_saver_png.cpp | 6 - .../pulseaudio/audio_driver_pulseaudio.cpp | 24 - drivers/pulseaudio/audio_driver_pulseaudio.h | 1 - drivers/register_driver_types.cpp | 2 - drivers/unix/dir_access_unix.cpp | 24 - drivers/unix/dir_access_unix.h | 1 - drivers/unix/file_access_unix.cpp | 23 - drivers/unix/file_access_unix.h | 1 - drivers/unix/ip_unix.cpp | 10 - drivers/unix/net_socket_posix.cpp | 13 - drivers/unix/net_socket_posix.h | 1 - drivers/unix/os_unix.cpp | 29 -- drivers/unix/os_unix.h | 1 - drivers/unix/rw_lock_posix.cpp | 9 - drivers/unix/rw_lock_posix.h | 1 - drivers/unix/thread_posix.cpp | 9 - drivers/unix/thread_posix.h | 1 - drivers/vulkan/rendering_device_vulkan.cpp | 121 ----- drivers/vulkan/rendering_device_vulkan.h | 9 - drivers/vulkan/vulkan_context.cpp | 19 - drivers/vulkan/vulkan_context.h | 2 - drivers/wasapi/audio_driver_wasapi.cpp | 27 - drivers/wasapi/audio_driver_wasapi.h | 1 - drivers/windows/dir_access_windows.cpp | 25 - drivers/windows/dir_access_windows.h | 1 - drivers/windows/file_access_windows.cpp | 25 - drivers/windows/file_access_windows.h | 1 - drivers/windows/rw_lock_windows.cpp | 8 - drivers/windows/rw_lock_windows.h | 1 - drivers/windows/thread_windows.cpp | 7 - drivers/windows/thread_windows.h | 1 - drivers/winmidi/midi_driver_winmidi.cpp | 5 - drivers/winmidi/midi_driver_winmidi.h | 1 - drivers/xaudio2/audio_driver_xaudio2.cpp | 13 - drivers/xaudio2/audio_driver_xaudio2.h | 2 - editor/animation_bezier_editor.cpp | 50 -- editor/animation_bezier_editor.h | 2 - editor/animation_track_editor.cpp | 332 ------------ editor/animation_track_editor.h | 4 - editor/animation_track_editor_plugins.cpp | 76 --- editor/array_property_edit.cpp | 18 - editor/array_property_edit.h | 1 - editor/audio_stream_preview.cpp | 7 - editor/code_editor.cpp | 63 --- editor/code_editor.h | 3 - editor/connections_dialog.cpp | 57 --- editor/connections_dialog.h | 3 - editor/create_dialog.cpp | 38 -- editor/create_dialog.h | 1 - editor/debugger/editor_debugger_inspector.cpp | 9 - editor/debugger/editor_debugger_inspector.h | 2 - editor/debugger/editor_debugger_node.cpp | 3 - editor/debugger/editor_debugger_node.h | 1 - editor/debugger/editor_debugger_server.cpp | 1 - editor/debugger/editor_debugger_server.h | 1 - editor/debugger/editor_debugger_tree.cpp | 8 - editor/debugger/editor_debugger_tree.h | 1 - editor/debugger/editor_network_profiler.cpp | 7 - editor/debugger/editor_network_profiler.h | 1 - editor/debugger/editor_profiler.cpp | 38 -- editor/debugger/editor_profiler.h | 4 - editor/debugger/editor_visual_profiler.cpp | 32 -- editor/debugger/editor_visual_profiler.h | 2 - editor/debugger/script_editor_debugger.cpp | 86 ---- editor/debugger/script_editor_debugger.h | 1 - editor/dependency_editor.cpp | 45 -- editor/dictionary_property_edit.cpp | 12 - editor/doc_data.cpp | 93 ---- editor/doc_data.h | 5 - editor/editor_about.cpp | 11 - editor/editor_about.h | 1 - editor/editor_asset_installer.cpp | 13 - editor/editor_asset_installer.h | 1 - editor/editor_atlas_packer.cpp | 12 - editor/editor_audio_buses.cpp | 85 ---- editor/editor_audio_buses.h | 4 - editor/editor_autoload_settings.cpp | 25 - editor/editor_autoload_settings.h | 1 - editor/editor_data.cpp | 103 ---- editor/editor_data.h | 8 - editor/editor_dir_dialog.cpp | 11 - editor/editor_export.cpp | 110 ---- editor/editor_export.h | 7 - editor/editor_feature_profile.cpp | 31 -- editor/editor_feature_profile.h | 1 - editor/editor_file_dialog.cpp | 106 ---- editor/editor_file_dialog.h | 1 - editor/editor_file_system.cpp | 137 ----- editor/editor_file_system.h | 5 - editor/editor_folding.cpp | 12 - editor/editor_folding.h | 1 - editor/editor_help.cpp | 103 ---- editor/editor_help.h | 2 - editor/editor_help_search.cpp | 36 -- editor/editor_help_search.h | 1 - editor/editor_inspector.cpp | 127 ----- editor/editor_inspector.h | 1 - editor/editor_layouts_dialog.cpp | 13 - editor/editor_layouts_dialog.h | 1 - editor/editor_log.cpp | 10 - editor/editor_log.h | 1 - editor/editor_node.cpp | 361 ------------- editor/editor_node.h | 3 - editor/editor_path.cpp | 9 - editor/editor_path.h | 1 - editor/editor_plugin.cpp | 68 --- editor/editor_plugin.h | 3 - editor/editor_plugin_settings.cpp | 7 - editor/editor_plugin_settings.h | 1 - editor/editor_properties.cpp | 141 ------ editor/editor_properties_array_dict.cpp | 63 --- editor/editor_properties_array_dict.h | 2 - editor/editor_resource_preview.cpp | 32 -- editor/editor_resource_preview.h | 2 - editor/editor_run.cpp | 9 - editor/editor_run_native.cpp | 11 - editor/editor_run_native.h | 1 - editor/editor_run_script.cpp | 8 - editor/editor_run_script.h | 1 - editor/editor_scale.cpp | 2 - editor/editor_sectioned_inspector.cpp | 24 - editor/editor_sectioned_inspector.h | 1 - editor/editor_settings.cpp | 73 --- editor/editor_settings.h | 2 - editor/editor_spin_slider.cpp | 23 - editor/editor_sub_scene.cpp | 13 - editor/editor_sub_scene.h | 1 - editor/editor_themes.cpp | 3 - editor/editor_vcs_interface.cpp | 26 - editor/editor_vcs_interface.h | 1 - editor/export_template_manager.cpp | 23 - editor/fileserver/editor_file_server.cpp | 19 - editor/fileserver/editor_file_server.h | 2 - editor/filesystem_dock.cpp | 11 - editor/find_in_files.cpp | 31 -- editor/groups_editor.cpp | 10 - editor/groups_editor.h | 2 - editor/import/collada.cpp | 281 ----------- editor/import/collada.h | 39 -- editor/import/editor_import_collada.cpp | 162 ------ editor/import/editor_import_collada.h | 1 - editor/import/editor_import_plugin.cpp | 3 - editor/import/editor_scene_importer_gltf.cpp | 95 ---- editor/import/editor_scene_importer_gltf.h | 7 - editor/import/resource_importer_bitmask.cpp | 9 - editor/import/resource_importer_csv.cpp | 6 - .../resource_importer_csv_translation.cpp | 11 - editor/import/resource_importer_image.cpp | 7 - .../resource_importer_layered_texture.cpp | 18 - editor/import/resource_importer_obj.cpp | 19 - editor/import/resource_importer_obj.h | 1 - editor/import/resource_importer_scene.cpp | 113 ----- editor/import/resource_importer_scene.h | 2 - .../import/resource_importer_shader_file.cpp | 6 - editor/import/resource_importer_texture.cpp | 30 -- editor/import/resource_importer_texture.h | 1 - .../resource_importer_texture_atlas.cpp | 18 - editor/import/resource_importer_wav.cpp | 28 -- editor/import/resource_importer_wav.h | 3 - editor/import_dock.cpp | 30 -- editor/inspector_dock.cpp | 11 - editor/inspector_dock.h | 1 - editor/multi_node_edit.cpp | 5 - editor/multi_node_edit.h | 1 - editor/node_3d_editor_gizmos.cpp | 244 --------- editor/node_3d_editor_gizmos.h | 23 - editor/node_dock.cpp | 6 - editor/node_dock.h | 1 - editor/pane_drag.cpp | 8 - editor/pane_drag.h | 1 - editor/plugin_config_dialog.cpp | 1 - editor/plugin_config_dialog.h | 1 - editor/plugins/abstract_polygon_2d_editor.cpp | 100 ---- editor/plugins/abstract_polygon_2d_editor.h | 2 - .../animation_blend_space_1d_editor.cpp | 12 - .../plugins/animation_blend_space_1d_editor.h | 1 - .../animation_blend_space_2d_editor.cpp | 34 -- .../plugins/animation_blend_space_2d_editor.h | 1 - .../animation_blend_tree_editor_plugin.cpp | 40 -- .../animation_blend_tree_editor_plugin.h | 1 - .../animation_player_editor_plugin.cpp | 125 ----- .../plugins/animation_player_editor_plugin.h | 3 - .../animation_state_machine_editor.cpp | 57 --- .../plugins/animation_state_machine_editor.h | 1 - .../plugins/animation_tree_editor_plugin.cpp | 12 - editor/plugins/animation_tree_editor_plugin.h | 2 - .../plugins/asset_library_editor_plugin.cpp | 75 --- editor/plugins/asset_library_editor_plugin.h | 5 - editor/plugins/audio_stream_editor_plugin.cpp | 14 - editor/plugins/audio_stream_editor_plugin.h | 2 - .../plugins/baked_lightmap_editor_plugin.cpp | 9 - editor/plugins/baked_lightmap_editor_plugin.h | 1 - editor/plugins/camera_3d_editor_plugin.cpp | 9 - editor/plugins/camera_3d_editor_plugin.h | 2 - editor/plugins/canvas_item_editor_plugin.cpp | 97 ---- editor/plugins/canvas_item_editor_plugin.h | 6 - .../collision_polygon_2d_editor_plugin.cpp | 2 - .../collision_polygon_2d_editor_plugin.h | 2 - .../collision_polygon_3d_editor_plugin.cpp | 47 -- .../collision_polygon_3d_editor_plugin.h | 2 - .../collision_shape_2d_editor_plugin.cpp | 26 - .../cpu_particles_2d_editor_plugin.cpp | 20 - .../plugins/cpu_particles_2d_editor_plugin.h | 1 - .../cpu_particles_3d_editor_plugin.cpp | 13 - .../plugins/cpu_particles_3d_editor_plugin.h | 2 - editor/plugins/curve_editor_plugin.cpp | 17 - editor/plugins/debugger_editor_plugin.cpp | 6 - editor/plugins/debugger_editor_plugin.h | 1 - editor/plugins/editor_preview_plugins.cpp | 42 -- editor/plugins/editor_preview_plugins.h | 4 - editor/plugins/gi_probe_editor_plugin.cpp | 9 - editor/plugins/gi_probe_editor_plugin.h | 1 - .../gpu_particles_2d_editor_plugin.cpp | 26 - .../plugins/gpu_particles_2d_editor_plugin.h | 1 - .../gpu_particles_3d_editor_plugin.cpp | 35 -- .../plugins/gpu_particles_3d_editor_plugin.h | 3 - editor/plugins/gradient_editor_plugin.cpp | 5 - editor/plugins/gradient_editor_plugin.h | 1 - editor/plugins/item_list_editor_plugin.cpp | 42 -- editor/plugins/item_list_editor_plugin.h | 6 - .../light_occluder_2d_editor_plugin.cpp | 12 - .../plugins/light_occluder_2d_editor_plugin.h | 2 - editor/plugins/line_2d_editor_plugin.cpp | 6 - editor/plugins/line_2d_editor_plugin.h | 2 - editor/plugins/material_editor_plugin.cpp | 29 -- editor/plugins/material_editor_plugin.h | 2 - editor/plugins/mesh_editor_plugin.cpp | 12 - editor/plugins/mesh_editor_plugin.h | 2 - .../mesh_instance_3d_editor_plugin.cpp | 24 - .../plugins/mesh_instance_3d_editor_plugin.h | 2 - editor/plugins/mesh_library_editor_plugin.cpp | 29 -- editor/plugins/mesh_library_editor_plugin.h | 2 - editor/plugins/multimesh_editor_plugin.cpp | 28 -- editor/plugins/multimesh_editor_plugin.h | 2 - .../navigation_polygon_editor_plugin.cpp | 12 - .../navigation_polygon_editor_plugin.h | 2 - editor/plugins/node_3d_editor_plugin.cpp | 329 ------------ editor/plugins/node_3d_editor_plugin.h | 12 - editor/plugins/path_2d_editor_plugin.cpp | 39 -- editor/plugins/path_2d_editor_plugin.h | 2 - editor/plugins/path_3d_editor_plugin.cpp | 38 -- editor/plugins/path_3d_editor_plugin.h | 3 - .../physical_bone_3d_editor_plugin.cpp | 5 - editor/plugins/polygon_2d_editor_plugin.cpp | 71 --- editor/plugins/polygon_2d_editor_plugin.h | 2 - .../resource_preloader_editor_plugin.cpp | 27 - .../resource_preloader_editor_plugin.h | 2 - editor/plugins/root_motion_editor_plugin.cpp | 11 - editor/plugins/script_editor_plugin.cpp | 218 -------- editor/plugins/script_editor_plugin.h | 5 - editor/plugins/script_text_editor.cpp | 119 ----- editor/plugins/script_text_editor.h | 2 - editor/plugins/shader_editor_plugin.cpp | 52 -- editor/plugins/shader_editor_plugin.h | 3 - editor/plugins/shader_file_editor_plugin.cpp | 11 - editor/plugins/shader_file_editor_plugin.h | 2 - editor/plugins/skeleton_2d_editor_plugin.cpp | 10 - editor/plugins/skeleton_2d_editor_plugin.h | 2 - editor/plugins/skeleton_3d_editor_plugin.cpp | 9 - editor/plugins/skeleton_3d_editor_plugin.h | 1 - .../plugins/skeleton_ik_3d_editor_plugin.cpp | 5 - editor/plugins/skeleton_ik_3d_editor_plugin.h | 1 - editor/plugins/sprite_2d_editor_plugin.cpp | 27 - editor/plugins/sprite_2d_editor_plugin.h | 2 - .../plugins/sprite_frames_editor_plugin.cpp | 54 -- editor/plugins/sprite_frames_editor_plugin.h | 2 - editor/plugins/style_box_editor_plugin.cpp | 5 - editor/plugins/style_box_editor_plugin.h | 2 - editor/plugins/text_editor.cpp | 61 --- editor/plugins/text_editor.h | 1 - editor/plugins/texture_editor_plugin.cpp | 10 - editor/plugins/texture_editor_plugin.h | 2 - .../plugins/texture_layered_editor_plugin.cpp | 13 - .../plugins/texture_layered_editor_plugin.h | 2 - .../plugins/texture_region_editor_plugin.cpp | 11 - editor/plugins/texture_region_editor_plugin.h | 1 - editor/plugins/theme_editor_plugin.cpp | 40 -- editor/plugins/theme_editor_plugin.h | 2 - editor/plugins/tile_map_editor_plugin.cpp | 138 ----- editor/plugins/tile_map_editor_plugin.h | 2 - editor/plugins/tile_set_editor_plugin.cpp | 46 -- editor/plugins/tile_set_editor_plugin.h | 3 - .../plugins/version_control_editor_plugin.cpp | 58 --- .../plugins/version_control_editor_plugin.h | 1 - .../plugins/visual_shader_editor_plugin.cpp | 110 ---- editor/plugins/visual_shader_editor_plugin.h | 5 - editor/progress_dialog.cpp | 14 - editor/progress_dialog.h | 4 - editor/project_export.cpp | 57 --- editor/project_manager.cpp | 109 ---- editor/project_manager.h | 2 - editor/project_settings_editor.cpp | 98 ---- editor/project_settings_editor.h | 1 - editor/property_editor.cpp | 175 ------- editor/property_editor.h | 2 - editor/property_selector.cpp | 30 -- editor/pvrtc_compress.cpp | 5 - editor/quick_open.cpp | 23 - editor/quick_open.h | 1 - editor/rename_dialog.cpp | 19 - editor/rename_dialog.h | 1 - editor/reparent_dialog.cpp | 9 - editor/reparent_dialog.h | 1 - editor/run_settings_dialog.cpp | 8 - editor/run_settings_dialog.h | 1 - editor/scene_tree_dock.cpp | 150 ------ editor/scene_tree_dock.h | 1 - editor/scene_tree_editor.cpp | 72 --- editor/scene_tree_editor.h | 2 - editor/script_create_dialog.cpp | 29 -- editor/settings_config_dialog.cpp | 20 - editor/settings_config_dialog.h | 1 - editor/shader_globals_editor.cpp | 4 - editor/shader_globals_editor.h | 1 - main/main.cpp | 64 --- main/main.h | 1 - main/performance.cpp | 6 - main/performance.h | 1 - main/tests/test_gdscript.cpp | 94 ---- main/tests/test_gui.cpp | 4 - main/tests/test_main.cpp | 18 - main/tests/test_math.cpp | 26 - main/tests/test_oa_hash_map.cpp | 2 - main/tests/test_ordered_hash_map.cpp | 1 - main/tests/test_physics_2d.cpp | 31 -- main/tests/test_physics_3d.cpp | 27 - main/tests/test_render.cpp | 8 - main/tests/test_shader_lang.cpp | 24 - main/tests/test_string.cpp | 32 -- .../assimp/editor_scene_importer_assimp.cpp | 25 - modules/assimp/import_state.h | 1 - modules/assimp/import_utils.h | 2 - modules/assimp/register_types.cpp | 1 - modules/basis_universal/register_types.cpp | 5 - modules/bmp/image_loader_bmp.cpp | 4 - modules/bullet/area_bullet.cpp | 2 - modules/bullet/btRayShape.cpp | 3 - modules/bullet/btRayShape.h | 1 - modules/bullet/bullet_physics_server.cpp | 21 - modules/bullet/collision_object_bullet.cpp | 2 - modules/bullet/cone_twist_joint_bullet.cpp | 2 - modules/bullet/constraint_bullet.h | 1 - modules/bullet/generic_6dof_joint_bullet.cpp | 1 - .../bullet/godot_collision_configuration.cpp | 22 - modules/bullet/godot_motion_state.h | 1 - modules/bullet/godot_ray_world_algorithm.cpp | 4 - modules/bullet/godot_ray_world_algorithm.h | 3 - modules/bullet/godot_result_callbacks.cpp | 5 - modules/bullet/hinge_joint_bullet.cpp | 5 - modules/bullet/joint_bullet.h | 1 - modules/bullet/pin_joint_bullet.cpp | 1 - modules/bullet/rigid_body_bullet.cpp | 19 - modules/bullet/rigid_body_bullet.h | 2 - modules/bullet/shape_bullet.cpp | 5 - modules/bullet/shape_bullet.h | 9 - modules/bullet/slider_joint_bullet.cpp | 2 - modules/bullet/soft_body_bullet.cpp | 6 - modules/bullet/soft_body_bullet.h | 1 - modules/bullet/space_bullet.cpp | 38 -- modules/bullet/space_bullet.h | 1 - modules/csg/csg.cpp | 69 --- modules/csg/csg.h | 4 - modules/csg/csg_gizmos.cpp | 18 - modules/csg/csg_gizmos.h | 1 - modules/csg/csg_shape.cpp | 84 ---- modules/csg/csg_shape.h | 5 - modules/csg/register_types.cpp | 1 - modules/cvtt/image_compress_cvtt.cpp | 4 - modules/cvtt/register_types.cpp | 1 - modules/dds/register_types.cpp | 2 - modules/dds/texture_loader_dds.cpp | 43 -- modules/denoise/lightmap_denoiser.cpp | 1 - modules/denoise/lightmap_denoiser.h | 1 - modules/denoise/register_types.cpp | 1 - modules/enet/networked_multiplayer_enet.cpp | 60 --- modules/enet/networked_multiplayer_enet.h | 2 - modules/enet/register_types.cpp | 2 - modules/etc/image_etc.cpp | 1 - modules/etc/register_types.cpp | 2 - modules/etc/texture_loader_pkm.cpp | 4 - modules/gdnative/gdnative.cpp | 8 - modules/gdnative/gdnative/color.cpp | 2 - modules/gdnative/gdnative/gdnative.cpp | 2 - modules/gdnative/gdnative/plane.cpp | 1 - modules/gdnative/gdnative/quat.cpp | 1 - modules/gdnative/gdnative/rect2.cpp | 1 - modules/gdnative/gdnative/vector2.cpp | 1 - modules/gdnative/gdnative/vector3.cpp | 1 - .../gdnative_library_editor_plugin.cpp | 22 - .../gdnative/gdnative_library_editor_plugin.h | 2 - .../gdnative_library_singleton_editor.cpp | 6 - modules/gdnative/include/net/godot_net.h | 1 - .../gdnative/nativescript/api_generator.cpp | 7 - .../nativescript/godot_nativescript.cpp | 6 - .../gdnative/nativescript/nativescript.cpp | 49 -- modules/gdnative/nativescript/nativescript.h | 3 - .../gdnative/nativescript/register_types.cpp | 1 - .../net/multiplayer_peer_gdnative.cpp | 1 - modules/gdnative/net/packet_peer_gdnative.cpp | 1 - modules/gdnative/net/stream_peer_gdnative.h | 1 - .../pluginscript/pluginscript_loader.cpp | 2 - .../pluginscript/pluginscript_loader.h | 2 - .../pluginscript/pluginscript_script.cpp | 5 - .../pluginscript/pluginscript_script.h | 1 - modules/gdnative/register_types.cpp | 7 - .../gdnative/videodecoder/register_types.cpp | 2 - .../videodecoder/video_stream_gdnative.cpp | 8 - .../videodecoder/video_stream_gdnative.h | 2 - modules/gdnative/xr/xr_interface_gdnative.cpp | 8 - modules/gdnavigation/gd_navigation_server.cpp | 1 - modules/gdnavigation/nav_map.cpp | 23 - modules/gdnavigation/nav_map.h | 1 - modules/gdnavigation/nav_region.cpp | 2 - modules/gdnavigation/nav_utils.h | 3 - .../navigation_mesh_editor_plugin.cpp | 11 - .../navigation_mesh_editor_plugin.h | 1 - .../navigation_mesh_generator.cpp | 8 - .../gdscript/editor/gdscript_highlighter.cpp | 6 - modules/gdscript/gdscript.cpp | 146 ------ modules/gdscript/gdscript.h | 8 - modules/gdscript/gdscript_compiler.cpp | 108 ---- modules/gdscript/gdscript_compiler.h | 4 - modules/gdscript/gdscript_editor.cpp | 65 --- modules/gdscript/gdscript_function.cpp | 106 ---- modules/gdscript/gdscript_function.h | 3 - modules/gdscript/gdscript_functions.cpp | 114 ----- modules/gdscript/gdscript_parser.cpp | 285 ----------- modules/gdscript/gdscript_parser.h | 6 - modules/gdscript/gdscript_tokenizer.cpp | 73 --- modules/gdscript/gdscript_tokenizer.h | 2 - .../gdscript_extend_parser.cpp | 21 - .../language_server/gdscript_extend_parser.h | 1 - .../gdscript_language_protocol.cpp | 5 - .../gdscript_language_server.cpp | 1 - .../gdscript_text_document.cpp | 17 - .../language_server/gdscript_workspace.cpp | 21 - modules/gdscript/language_server/lsp.hpp | 11 - modules/gdscript/register_types.cpp | 8 - modules/glslang/register_types.cpp | 3 - modules/gridmap/grid_map.cpp | 73 --- modules/gridmap/grid_map.h | 9 - modules/gridmap/grid_map_editor_plugin.cpp | 104 ---- modules/gridmap/grid_map_editor_plugin.h | 5 - modules/gridmap/register_types.cpp | 1 - modules/hdr/image_loader_hdr.cpp | 4 - modules/hdr/image_loader_hdr.h | 1 - modules/hdr/register_types.cpp | 2 - modules/jpg/image_loader_jpegd.cpp | 5 - modules/jpg/image_loader_jpegd.h | 1 - modules/jpg/register_types.cpp | 2 - modules/jsonrpc/jsonrpc.cpp | 1 - modules/lightmapper_rd/lightmapper_rd.cpp | 39 -- modules/lightmapper_rd/lightmapper_rd.h | 1 - modules/lightmapper_rd/lm_blendseams.glsl | 2 - modules/lightmapper_rd/lm_compute.glsl | 7 - modules/lightmapper_rd/lm_raster.glsl | 2 - modules/lightmapper_rd/register_types.cpp | 1 - modules/mbedtls/crypto_mbedtls.cpp | 1 - modules/mbedtls/crypto_mbedtls.h | 3 - modules/mbedtls/dtls_server_mbedtls.cpp | 2 - modules/mbedtls/dtls_server_mbedtls.h | 1 - modules/mbedtls/packet_peer_mbed_dtls.cpp | 15 - modules/mbedtls/register_types.cpp | 2 - modules/mbedtls/ssl_context_mbedtls.cpp | 1 - modules/mbedtls/ssl_context_mbedtls.h | 2 - modules/mbedtls/stream_peer_mbedtls.cpp | 18 - modules/mono/class_db_api_json.cpp | 6 - modules/mono/csharp_script.cpp | 128 ----- modules/mono/csharp_script.h | 4 - modules/mono/editor/bindings_generator.cpp | 32 -- modules/mono/editor/bindings_generator.h | 1 - modules/mono/editor/csharp_project.cpp | 1 - modules/mono/editor/editor_internal_calls.cpp | 1 - modules/mono/editor/script_class_parser.cpp | 9 - modules/mono/editor/script_class_parser.h | 1 - modules/mono/glue/arguments_vector.h | 1 - modules/mono/glue/gd_glue.cpp | 1 - modules/mono/godotsharp_dirs.cpp | 1 - modules/mono/mono_gc_handle.cpp | 2 - modules/mono/mono_gc_handle.h | 1 - modules/mono/mono_gd/gd_mono.cpp | 44 -- modules/mono/mono_gd/gd_mono.h | 2 - modules/mono/mono_gd/gd_mono_assembly.cpp | 14 - modules/mono/mono_gd/gd_mono_assembly.h | 1 - modules/mono/mono_gd/gd_mono_cache.cpp | 4 - modules/mono/mono_gd/gd_mono_cache.h | 1 - modules/mono/mono_gd/gd_mono_class.cpp | 23 - modules/mono/mono_gd/gd_mono_field.h | 1 - modules/mono/mono_gd/gd_mono_internals.cpp | 1 - modules/mono/mono_gd/gd_mono_log.cpp | 9 - modules/mono/mono_gd/gd_mono_log.h | 1 - modules/mono/mono_gd/gd_mono_marshal.cpp | 1 - modules/mono/mono_gd/gd_mono_method.cpp | 1 - modules/mono/mono_gd/gd_mono_method.h | 1 - modules/mono/mono_gd/gd_mono_method_thunk.h | 4 - modules/mono/mono_gd/gd_mono_property.h | 1 - modules/mono/mono_gd/gd_mono_utils.cpp | 1 - modules/mono/signal_awaiter_utils.cpp | 1 - modules/mono/utils/mono_reg_utils.cpp | 6 - modules/mono/utils/mono_reg_utils.h | 1 - modules/mono/utils/osx_utils.cpp | 1 - modules/mono/utils/string_utils.cpp | 1 - modules/opensimplex/noise_texture.cpp | 11 - modules/opensimplex/open_simplex_noise.cpp | 11 - modules/opensimplex/register_types.cpp | 1 - modules/pvr/register_types.cpp | 2 - modules/pvr/texture_loader_pvr.cpp | 20 - modules/regex/regex.cpp | 48 -- modules/regex/regex.h | 2 - modules/regex/register_types.cpp | 1 - modules/squish/image_compress_squish.cpp | 9 - modules/squish/register_types.cpp | 1 - .../stb_vorbis/audio_stream_ogg_vorbis.cpp | 20 - modules/stb_vorbis/audio_stream_ogg_vorbis.h | 2 - modules/stb_vorbis/register_types.cpp | 1 - .../resource_importer_ogg_vorbis.cpp | 8 - modules/svg/image_loader_svg.cpp | 7 - modules/svg/image_loader_svg.h | 1 - modules/svg/register_types.cpp | 2 - modules/tga/image_loader_tga.cpp | 4 - modules/tga/register_types.cpp | 2 - modules/theora/register_types.cpp | 2 - modules/theora/video_stream_theora.cpp | 39 -- modules/theora/video_stream_theora.h | 2 - modules/tinyexr/image_loader_tinyexr.cpp | 7 - modules/tinyexr/image_loader_tinyexr.h | 1 - modules/tinyexr/image_saver_tinyexr.cpp | 5 - modules/tinyexr/register_types.cpp | 2 - modules/upnp/register_types.cpp | 1 - modules/upnp/upnp.h | 1 - modules/upnp/upnp_device.h | 1 - modules/vhacd/register_types.cpp | 1 - modules/visual_script/register_types.cpp | 2 - modules/visual_script/visual_script.cpp | 205 -------- modules/visual_script/visual_script.h | 17 - .../visual_script_builtin_funcs.cpp | 119 ----- .../visual_script_builtin_funcs.h | 1 - .../visual_script/visual_script_editor.cpp | 200 -------- modules/visual_script/visual_script_editor.h | 1 - .../visual_script_expression.cpp | 93 ---- .../visual_script/visual_script_expression.h | 9 - .../visual_script_flow_control.cpp | 98 ---- .../visual_script_flow_control.h | 7 - .../visual_script_func_nodes.cpp | 215 -------- .../visual_script/visual_script_func_nodes.h | 4 - modules/visual_script/visual_script_nodes.cpp | 422 ---------------- modules/visual_script/visual_script_nodes.h | 28 -- .../visual_script_property_selector.cpp | 17 - .../visual_script_yield_nodes.cpp | 53 -- .../visual_script/visual_script_yield_nodes.h | 2 - modules/webm/register_types.cpp | 2 - modules/webm/video_stream_webm.cpp | 56 --- modules/webm/video_stream_webm.h | 2 - modules/webp/image_loader_webp.cpp | 7 - modules/webp/image_loader_webp.h | 1 - modules/webp/register_types.cpp | 2 - modules/webrtc/webrtc_data_channel_js.cpp | 1 - modules/webrtc/webrtc_multiplayer.cpp | 2 - modules/webrtc/webrtc_multiplayer.h | 2 - modules/webrtc/webrtc_peer_connection.cpp | 2 - .../webrtc_peer_connection_gdnative.cpp | 1 - modules/webrtc/webrtc_peer_connection_js.h | 1 - .../editor_debugger_server_websocket.h | 1 - modules/websocket/emws_client.cpp | 7 - modules/websocket/emws_client.h | 1 - modules/websocket/emws_peer.cpp | 12 - modules/websocket/emws_peer.h | 1 - modules/websocket/emws_server.cpp | 3 - modules/websocket/emws_server.h | 1 - modules/websocket/packet_buffer.h | 1 - .../remote_debugger_peer_websocket.cpp | 2 - .../remote_debugger_peer_websocket.h | 1 - modules/websocket/websocket_client.cpp | 11 - modules/websocket/websocket_client.h | 1 - .../websocket/websocket_multiplayer_peer.cpp | 28 -- .../websocket/websocket_multiplayer_peer.h | 1 - modules/websocket/websocket_peer.h | 1 - modules/websocket/websocket_server.cpp | 6 - modules/websocket/websocket_server.h | 1 - modules/websocket/wsl_client.cpp | 7 - modules/websocket/wsl_client.h | 1 - modules/websocket/wsl_peer.cpp | 9 - modules/websocket/wsl_peer.h | 1 - modules/websocket/wsl_server.cpp | 1 - modules/websocket/wsl_server.h | 2 - modules/xatlas_unwrap/register_types.cpp | 2 - platform/android/android_keys_utils.cpp | 2 - platform/android/android_keys_utils.h | 1 - platform/android/api/api.cpp | 3 - platform/android/api/java_class_wrapper.h | 6 - platform/android/api/jni_singleton.h | 19 - platform/android/audio_driver_jandroid.cpp | 16 - platform/android/audio_driver_jandroid.h | 1 - platform/android/audio_driver_opensl.cpp | 19 - platform/android/audio_driver_opensl.h | 1 - platform/android/dir_access_jandroid.cpp | 20 - platform/android/dir_access_jandroid.h | 1 - platform/android/display_server_android.cpp | 6 - platform/android/display_server_android.h | 1 - platform/android/export/export.cpp | 82 --- platform/android/file_access_android.cpp | 16 - platform/android/file_access_android.h | 1 - platform/android/file_access_jandroid.cpp | 16 - platform/android/file_access_jandroid.h | 1 - .../src/org/godotengine/godot/Dictionary.java | 6 - .../lib/src/org/godotengine/godot/Godot.java | 17 - .../godot/GodotDownloaderAlarmReceiver.java | 1 - .../godotengine/godot/GodotGLRenderView.java | 3 - .../src/org/godotengine/godot/GodotIO.java | 35 -- .../src/org/godotengine/godot/GodotLib.java | 1 - .../godotengine/godot/GodotRenderView.java | 1 - .../org/godotengine/godot/GodotRenderer.java | 1 - .../godot/GodotVulkanRenderView.java | 1 - .../godot/input/GodotGestureHandler.java | 1 - .../godot/input/GodotInputHandler.java | 4 - .../godot/input/InputManagerCompat.java | 1 - .../godot/input/InputManagerV16.java | 1 - .../godotengine/godot/plugin/GodotPlugin.java | 1 - .../godot/plugin/GodotPluginRegistry.java | 1 - .../godotengine/godot/plugin/SignalInfo.java | 1 - .../org/godotengine/godot/utils/Crypt.java | 1 - .../org/godotengine/godot/utils/GLUtils.java | 1 - .../godot/utils/GodotNetUtils.java | 1 - .../godot/utils/PermissionsUtil.java | 1 - .../godot/xr/ovr/OvrConfigChooser.java | 1 - .../godot/xr/ovr/OvrContextFactory.java | 1 - .../godot/xr/ovr/OvrWindowSurfaceFactory.java | 1 - .../xr/regular/RegularConfigChooser.java | 3 - .../regular/RegularFallbackConfigChooser.java | 1 - .../godot/plugin/payment/ConsumeTask.java | 2 - .../godot/plugin/payment/GodotPayment.java | 1 - .../plugin/payment/HandlePurchaseTask.java | 1 - .../godot/plugin/payment/PaymentsCache.java | 1 - .../godot/plugin/payment/PaymentsManager.java | 5 - .../godot/plugin/payment/PurchaseTask.java | 1 - .../payment/ReleaseAllConsumablesTask.java | 4 - .../godot/plugin/payment/ValidateTask.java | 1 - .../plugin/payment/utils/HttpRequester.java | 1 - .../plugin/payment/utils/RequestParams.java | 1 - platform/android/java_class_wrapper.cpp | 94 ---- platform/android/java_godot_lib_jni.cpp | 14 - platform/android/jni_utils.cpp | 34 -- platform/android/jni_utils.h | 1 - platform/android/net_socket_android.cpp | 1 - platform/android/net_socket_android.h | 1 - platform/android/os_android.cpp | 17 - platform/android/plugin/godot_plugin_jni.cpp | 6 - platform/android/thread_jandroid.cpp | 11 - platform/android/thread_jandroid.h | 1 - .../android/vulkan/vulkan_context_android.h | 1 - platform/haiku/os_haiku.cpp | 4 - platform/iphone/app_delegate.mm | 4 - platform/iphone/export/export.cpp | 10 - platform/iphone/game_center.h | 1 - platform/iphone/game_center.mm | 13 - platform/iphone/gl_view.mm | 21 - platform/iphone/godot_iphone.cpp | 2 - platform/iphone/icloud.h | 1 - platform/iphone/icloud.mm | 2 - platform/iphone/in_app_store.h | 1 - platform/iphone/in_app_store.mm | 14 - platform/iphone/ios.h | 1 - platform/iphone/ios.mm | 1 - platform/iphone/os_iphone.cpp | 36 -- platform/iphone/os_iphone.h | 2 - platform/iphone/view_controller.mm | 4 - platform/iphone/vulkan_context_iphone.h | 1 - platform/iphone/vulkan_context_iphone.mm | 1 - platform/javascript/api/api.cpp | 6 - .../javascript/audio_driver_javascript.cpp | 13 - platform/javascript/audio_driver_javascript.h | 1 - .../javascript/display_server_javascript.cpp | 40 -- .../javascript/display_server_javascript.h | 1 - platform/javascript/dom_keys.inc | 1 - platform/javascript/export/export.cpp | 27 - .../javascript/http_client_javascript.cpp | 22 - platform/javascript/javascript_eval.cpp | 2 - platform/javascript/javascript_main.cpp | 3 - platform/javascript/os_javascript.cpp | 27 - platform/javascript/os_javascript.h | 1 - platform/linuxbsd/context_gl_x11.cpp | 9 - platform/linuxbsd/context_gl_x11.h | 1 - platform/linuxbsd/crash_handler_linuxbsd.h | 1 - platform/linuxbsd/display_server_x11.cpp | 121 ----- platform/linuxbsd/export/export.cpp | 3 - platform/linuxbsd/godot_linuxbsd.cpp | 1 - platform/linuxbsd/joypad_linux.cpp | 30 -- platform/linuxbsd/key_mapping_x11.cpp | 12 - platform/linuxbsd/os_linuxbsd.cpp | 25 - platform/linuxbsd/os_linuxbsd.h | 1 - platform/linuxbsd/vulkan_context_x11.cpp | 1 - platform/linuxbsd/vulkan_context_x11.h | 1 - platform/osx/context_gl_osx.h | 1 - platform/osx/context_gl_osx.mm | 11 - platform/osx/crash_handler_osx.h | 1 - platform/osx/dir_access_osx.mm | 1 - platform/osx/display_server_osx.mm | 5 - platform/osx/export/export.cpp | 13 - platform/osx/godot_main_osx.mm | 1 - platform/osx/joypad_osx.cpp | 8 - platform/osx/joypad_osx.h | 1 - platform/osx/os_osx.mm | 3 - platform/osx/vulkan_context_osx.h | 1 - platform/osx/vulkan_context_osx.mm | 1 - platform/server/godot_server.cpp | 1 - platform/server/os_server.cpp | 32 -- platform/server/os_server.h | 1 - platform/uwp/app.cpp | 25 - platform/uwp/context_egl_uwp.cpp | 10 - platform/uwp/context_egl_uwp.h | 1 - platform/uwp/export/export.cpp | 42 -- platform/uwp/joypad_uwp.cpp | 13 - platform/uwp/joypad_uwp.h | 2 - platform/uwp/os_uwp.cpp | 75 --- platform/uwp/os_uwp.h | 2 - platform/uwp/thread_uwp.cpp | 4 - platform/uwp/thread_uwp.h | 1 - platform/windows/context_gl_windows.cpp | 11 - platform/windows/context_gl_windows.h | 1 - platform/windows/crash_handler_windows.h | 1 - platform/windows/display_server_windows.cpp | 145 ------ platform/windows/display_server_windows.h | 1 - platform/windows/export/export.cpp | 4 - platform/windows/godot_windows.cpp | 1 - platform/windows/joypad_windows.cpp | 49 -- platform/windows/joypad_windows.h | 2 - platform/windows/key_mapping_windows.cpp | 4 - platform/windows/key_mapping_windows.h | 1 - platform/windows/os_windows.cpp | 46 -- platform/windows/os_windows.h | 2 - platform/windows/vulkan_context_win.cpp | 1 - platform/windows/vulkan_context_win.h | 1 - platform/windows/windows_terminal_logger.cpp | 1 - scene/2d/animated_sprite_2d.cpp | 55 -- scene/2d/animated_sprite_2d.h | 6 - scene/2d/area_2d.cpp | 64 --- scene/2d/area_2d.h | 5 - scene/2d/audio_stream_player_2d.cpp | 39 -- scene/2d/audio_stream_player_2d.h | 2 - scene/2d/back_buffer_copy.cpp | 12 - scene/2d/camera_2d.cpp | 63 --- scene/2d/camera_2d.h | 1 - scene/2d/canvas_modulate.cpp | 8 - scene/2d/canvas_modulate.h | 1 - scene/2d/collision_object_2d.cpp | 38 -- scene/2d/collision_object_2d.h | 2 - scene/2d/collision_polygon_2d.cpp | 22 - scene/2d/collision_polygon_2d.h | 1 - scene/2d/collision_shape_2d.cpp | 15 - scene/2d/collision_shape_2d.h | 1 - scene/2d/cpu_particles_2d.cpp | 79 --- scene/2d/cpu_particles_2d.h | 1 - scene/2d/gpu_particles_2d.cpp | 38 -- scene/2d/joints_2d.cpp | 41 -- scene/2d/joints_2d.h | 4 - scene/2d/light_2d.cpp | 47 -- scene/2d/light_2d.h | 1 - scene/2d/light_occluder_2d.cpp | 33 -- scene/2d/light_occluder_2d.h | 1 - scene/2d/line_2d.cpp | 4 - scene/2d/line_2d.h | 1 - scene/2d/line_builder.cpp | 5 - scene/2d/mesh_instance_2d.cpp | 9 - scene/2d/multimesh_instance_2d.cpp | 9 - scene/2d/navigation_2d.cpp | 2 - scene/2d/navigation_2d.h | 1 - scene/2d/navigation_agent_2d.cpp | 4 - scene/2d/navigation_obstacle_2d.cpp | 2 - scene/2d/navigation_region_2d.cpp | 50 -- scene/2d/navigation_region_2d.h | 2 - scene/2d/node_2d.cpp | 41 -- scene/2d/node_2d.h | 1 - scene/2d/parallax_background.cpp | 26 - scene/2d/parallax_background.h | 1 - scene/2d/parallax_layer.cpp | 14 - scene/2d/parallax_layer.h | 1 - scene/2d/path_2d.cpp | 38 -- scene/2d/path_2d.h | 2 - scene/2d/physics_body_2d.cpp | 121 ----- scene/2d/physics_body_2d.h | 9 - scene/2d/polygon_2d.cpp | 44 -- scene/2d/polygon_2d.h | 1 - scene/2d/position_2d.cpp | 6 - scene/2d/position_2d.h | 1 - scene/2d/ray_cast_2d.cpp | 33 -- scene/2d/ray_cast_2d.h | 1 - scene/2d/remote_transform_2d.cpp | 13 - scene/2d/remote_transform_2d.h | 1 - scene/2d/skeleton_2d.cpp | 17 - scene/2d/sprite_2d.cpp | 35 -- scene/2d/sprite_2d.h | 1 - scene/2d/tile_map.cpp | 142 ------ scene/2d/tile_map.h | 4 - scene/2d/touch_screen_button.cpp | 40 -- scene/2d/touch_screen_button.h | 1 - scene/2d/visibility_notifier_2d.cpp | 34 -- scene/2d/visibility_notifier_2d.h | 2 - scene/2d/y_sort.cpp | 4 - scene/3d/area_3d.cpp | 70 --- scene/3d/area_3d.h | 5 - scene/3d/audio_stream_player_3d.cpp | 70 --- scene/3d/audio_stream_player_3d.h | 2 - scene/3d/baked_lightmap.cpp | 49 -- scene/3d/baked_lightmap.h | 1 - scene/3d/bone_attachment_3d.cpp | 14 - scene/3d/bone_attachment_3d.h | 1 - scene/3d/camera_3d.cpp | 65 --- scene/3d/camera_3d.h | 2 - scene/3d/collision_object_3d.cpp | 33 -- scene/3d/collision_object_3d.h | 2 - scene/3d/collision_polygon_3d.cpp | 15 - scene/3d/collision_polygon_3d.h | 1 - scene/3d/collision_shape_3d.cpp | 14 - scene/3d/collision_shape_3d.h | 1 - scene/3d/cpu_particles_3d.cpp | 80 --- scene/3d/cpu_particles_3d.h | 1 - scene/3d/decal.cpp | 5 - scene/3d/gi_probe.cpp | 24 - scene/3d/gi_probe.h | 1 - scene/3d/gpu_particles_3d.cpp | 42 -- scene/3d/immediate_geometry_3d.cpp | 16 - scene/3d/immediate_geometry_3d.h | 1 - scene/3d/light_3d.cpp | 42 -- scene/3d/light_3d.h | 4 - scene/3d/listener_3d.cpp | 16 - scene/3d/listener_3d.h | 1 - scene/3d/mesh_instance_3d.cpp | 26 - scene/3d/mesh_instance_3d.h | 2 - scene/3d/multimesh_instance_3d.cpp | 5 - scene/3d/navigation_3d.cpp | 6 - scene/3d/navigation_3d.h | 1 - scene/3d/navigation_agent_3d.cpp | 4 - scene/3d/navigation_obstacle_3d.cpp | 4 - scene/3d/navigation_region_3d.cpp | 20 - scene/3d/navigation_region_3d.h | 1 - scene/3d/node_3d.cpp | 66 --- scene/3d/node_3d.h | 3 - scene/3d/path_3d.cpp | 29 -- scene/3d/path_3d.h | 2 - scene/3d/physics_body_3d.cpp | 137 ----- scene/3d/physics_body_3d.h | 10 - scene/3d/physics_joint_3d.cpp | 74 --- scene/3d/physics_joint_3d.h | 6 - scene/3d/position_3d.h | 1 - scene/3d/proximity_group_3d.cpp | 23 - scene/3d/proximity_group_3d.h | 1 - scene/3d/ray_cast_3d.cpp | 35 -- scene/3d/ray_cast_3d.h | 1 - scene/3d/reflection_probe.cpp | 27 - scene/3d/remote_transform_3d.cpp | 11 - scene/3d/skeleton_3d.cpp | 65 --- scene/3d/skeleton_3d.h | 4 - scene/3d/skeleton_ik_3d.cpp | 24 - scene/3d/skeleton_ik_3d.h | 2 - scene/3d/soft_body_3d.cpp | 26 - scene/3d/soft_body_3d.h | 1 - scene/3d/spring_arm_3d.cpp | 2 - scene/3d/sprite_3d.cpp | 81 --- scene/3d/sprite_3d.h | 3 - scene/3d/vehicle_body_3d.cpp | 56 --- scene/3d/vehicle_body_3d.h | 2 - scene/3d/velocity_tracker_3d.cpp | 6 - scene/3d/visibility_notifier_3d.cpp | 29 -- scene/3d/visibility_notifier_3d.h | 2 - scene/3d/visual_instance_3d.cpp | 36 -- scene/3d/visual_instance_3d.h | 2 - scene/3d/voxelizer.cpp | 42 -- scene/3d/voxelizer.h | 1 - scene/3d/world_environment.cpp | 9 - scene/3d/world_environment.h | 1 - scene/3d/xr_nodes.cpp | 1 - scene/3d/xr_nodes.h | 3 - scene/animation/animation_blend_space_1d.cpp | 5 - scene/animation/animation_blend_space_2d.cpp | 23 - scene/animation/animation_blend_tree.cpp | 79 --- scene/animation/animation_blend_tree.h | 2 - scene/animation/animation_cache.cpp | 34 -- scene/animation/animation_cache.h | 2 - .../animation_node_state_machine.cpp | 48 -- .../animation/animation_node_state_machine.h | 2 - scene/animation/animation_player.cpp | 133 ----- scene/animation/animation_player.h | 13 - scene/animation/animation_tree.cpp | 75 --- scene/animation/animation_tree.h | 9 - scene/animation/root_motion_view.cpp | 6 - scene/animation/tween.cpp | 17 - scene/animation/tween.h | 1 - scene/audio/audio_stream_player.cpp | 32 -- scene/audio/audio_stream_player.h | 1 - scene/debugger/scene_debugger.cpp | 20 - scene/debugger/scene_debugger.h | 4 - scene/gui/base_button.cpp | 45 -- scene/gui/base_button.h | 3 - scene/gui/box_container.cpp | 15 - scene/gui/box_container.h | 3 - scene/gui/button.cpp | 27 - scene/gui/button.h | 1 - scene/gui/center_container.cpp | 9 - scene/gui/center_container.h | 1 - scene/gui/check_box.cpp | 5 - scene/gui/check_box.h | 1 - scene/gui/check_button.cpp | 6 - scene/gui/check_button.h | 1 - scene/gui/color_picker.cpp | 53 -- scene/gui/color_picker.h | 2 - scene/gui/color_rect.cpp | 5 - scene/gui/container.cpp | 15 - scene/gui/container.h | 1 - scene/gui/control.cpp | 212 -------- scene/gui/control.h | 3 - scene/gui/dialogs.cpp | 24 - scene/gui/dialogs.h | 2 - scene/gui/file_dialog.cpp | 78 --- scene/gui/file_dialog.h | 1 - scene/gui/gradient_edit.cpp | 18 - scene/gui/gradient_edit.h | 1 - scene/gui/graph_edit.cpp | 104 ---- scene/gui/graph_edit.h | 3 - scene/gui/graph_node.cpp | 52 -- scene/gui/graph_node.h | 1 - scene/gui/grid_container.cpp | 9 - scene/gui/grid_container.h | 1 - scene/gui/item_list.cpp | 126 ----- scene/gui/item_list.h | 2 - scene/gui/label.cpp | 58 --- scene/gui/label.h | 2 - scene/gui/line_edit.cpp | 101 ---- scene/gui/line_edit.h | 2 - scene/gui/link_button.cpp | 14 - scene/gui/link_button.h | 1 - scene/gui/margin_container.cpp | 6 - scene/gui/menu_button.cpp | 14 - scene/gui/menu_button.h | 1 - scene/gui/nine_patch_rect.cpp | 15 - scene/gui/nine_patch_rect.h | 1 - scene/gui/option_button.cpp | 39 -- scene/gui/option_button.h | 1 - scene/gui/panel.cpp | 2 - scene/gui/panel.h | 1 - scene/gui/panel_container.cpp | 6 - scene/gui/panel_container.h | 1 - scene/gui/popup.cpp | 12 - scene/gui/popup.h | 2 - scene/gui/popup_menu.cpp | 131 ----- scene/gui/popup_menu.h | 1 - scene/gui/progress_bar.cpp | 8 - scene/gui/progress_bar.h | 1 - scene/gui/range.cpp | 34 -- scene/gui/range.h | 1 - scene/gui/reference_rect.cpp | 2 - scene/gui/reference_rect.h | 1 - scene/gui/rich_text_effect.cpp | 1 - scene/gui/rich_text_label.cpp | 175 ------- scene/gui/rich_text_label.h | 3 - scene/gui/scroll_bar.cpp | 64 --- scene/gui/scroll_bar.h | 4 - scene/gui/scroll_container.cpp | 42 -- scene/gui/scroll_container.h | 1 - scene/gui/separator.cpp | 8 - scene/gui/separator.h | 3 - scene/gui/shortcut.cpp | 6 - scene/gui/shortcut.h | 1 - scene/gui/slider.cpp | 27 - scene/gui/slider.h | 3 - scene/gui/spin_box.cpp | 33 -- scene/gui/spin_box.h | 1 - scene/gui/split_container.cpp | 35 -- scene/gui/split_container.h | 3 - scene/gui/subviewport_container.cpp | 20 - scene/gui/subviewport_container.h | 1 - scene/gui/tab_container.cpp | 56 --- scene/gui/tab_container.h | 1 - scene/gui/tabs.cpp | 58 --- scene/gui/tabs.h | 2 - scene/gui/text_edit.cpp | 321 ------------ scene/gui/text_edit.h | 7 - scene/gui/texture_button.cpp | 22 - scene/gui/texture_button.h | 1 - scene/gui/texture_progress.cpp | 10 - scene/gui/texture_progress.h | 1 - scene/gui/texture_rect.cpp | 16 - scene/gui/texture_rect.h | 1 - scene/gui/tree.cpp | 345 ------------- scene/gui/tree.h | 6 - scene/gui/video_player.cpp | 43 -- scene/gui/video_player.h | 2 - scene/main/canvas_item.cpp | 104 ---- scene/main/canvas_item.h | 4 - scene/main/canvas_layer.cpp | 30 -- scene/main/canvas_layer.h | 1 - scene/main/http_request.cpp | 38 -- scene/main/http_request.h | 1 - scene/main/instance_placeholder.cpp | 8 - scene/main/instance_placeholder.h | 1 - scene/main/node.cpp | 227 --------- scene/main/node.h | 6 - scene/main/resource_preloader.cpp | 16 - scene/main/resource_preloader.h | 1 - scene/main/scene_tree.cpp | 102 ---- scene/main/scene_tree.h | 3 - scene/main/shader_globals_override.cpp | 11 - scene/main/shader_globals_override.h | 1 - scene/main/timer.cpp | 13 - scene/main/timer.h | 1 - scene/main/viewport.cpp | 239 --------- scene/main/viewport.h | 4 - scene/main/window.cpp | 48 -- scene/register_scene_types.cpp | 2 - scene/resources/animation.cpp | 278 ---------- scene/resources/animation.h | 16 - scene/resources/audio_stream_sample.cpp | 39 -- scene/resources/audio_stream_sample.h | 2 - scene/resources/bit_map.cpp | 29 -- scene/resources/bit_map.h | 1 - scene/resources/box_shape_3d.cpp | 6 - scene/resources/box_shape_3d.h | 1 - scene/resources/capsule_shape_2d.cpp | 11 - scene/resources/capsule_shape_3d.cpp | 10 - scene/resources/capsule_shape_3d.h | 1 - scene/resources/circle_shape_2d.cpp | 8 - scene/resources/concave_polygon_shape_2d.cpp | 6 - scene/resources/concave_polygon_shape_3d.cpp | 8 - scene/resources/concave_polygon_shape_3d.h | 2 - scene/resources/convex_polygon_shape_2d.cpp | 8 - scene/resources/convex_polygon_shape_3d.cpp | 6 - scene/resources/convex_polygon_shape_3d.h | 1 - scene/resources/curve.cpp | 90 ---- scene/resources/curve.h | 7 - scene/resources/cylinder_shape_3d.cpp | 10 - scene/resources/cylinder_shape_3d.h | 1 - .../resources/default_theme/default_theme.cpp | 11 - scene/resources/dynamic_font.cpp | 64 --- scene/resources/dynamic_font.h | 5 - scene/resources/environment.cpp | 144 ------ scene/resources/environment.h | 2 - scene/resources/font.cpp | 60 --- scene/resources/font.h | 4 - scene/resources/gradient.cpp | 4 - scene/resources/gradient.h | 2 - scene/resources/height_map_shape_3d.cpp | 3 - scene/resources/line_shape_2d.cpp | 10 - scene/resources/material.cpp | 167 ------ scene/resources/material.h | 5 - scene/resources/mesh.cpp | 89 ---- scene/resources/mesh.h | 1 - scene/resources/mesh_data_tool.cpp | 50 -- scene/resources/mesh_data_tool.h | 3 - scene/resources/mesh_library.cpp | 29 -- scene/resources/mesh_library.h | 1 - scene/resources/multimesh.cpp | 34 -- scene/resources/multimesh.h | 1 - scene/resources/navigation_mesh.cpp | 20 - scene/resources/navigation_mesh.h | 2 - scene/resources/packed_scene.cpp | 112 ----- scene/resources/packed_scene.h | 5 - scene/resources/particles_material.cpp | 59 --- scene/resources/particles_material.h | 3 - scene/resources/physics_material.cpp | 1 - scene/resources/physics_material.h | 1 - scene/resources/polygon_path_finder.cpp | 42 -- scene/resources/polygon_path_finder.h | 4 - scene/resources/primitive_meshes.cpp | 9 - scene/resources/primitive_meshes.h | 8 - scene/resources/ray_shape_3d.cpp | 7 - scene/resources/ray_shape_3d.h | 1 - scene/resources/rectangle_shape_2d.cpp | 7 - scene/resources/resource_format_text.cpp | 98 ---- scene/resources/resource_format_text.h | 3 - scene/resources/segment_shape_2d.cpp | 18 - scene/resources/shader.cpp | 22 - scene/resources/shader.h | 1 - scene/resources/shape_2d.cpp | 8 - scene/resources/shape_3d.cpp | 5 - scene/resources/shape_3d.h | 1 - scene/resources/skin.cpp | 3 - scene/resources/sky.cpp | 4 - scene/resources/sky_material.cpp | 51 -- scene/resources/sky_material.h | 1 - scene/resources/sphere_shape_3d.cpp | 7 - scene/resources/sphere_shape_3d.h | 1 - scene/resources/style_box.cpp | 59 --- scene/resources/style_box.h | 5 - scene/resources/surface_tool.cpp | 68 --- scene/resources/surface_tool.h | 2 - scene/resources/text_file.cpp | 1 - scene/resources/text_file.h | 1 - scene/resources/texture.cpp | 153 ------ scene/resources/texture.h | 18 - scene/resources/theme.cpp | 87 ---- scene/resources/theme.h | 1 - scene/resources/tile_set.cpp | 79 --- scene/resources/tile_set.h | 2 - scene/resources/video_stream.h | 2 - scene/resources/visual_shader.cpp | 75 --- scene/resources/visual_shader.h | 1 - scene/resources/visual_shader_nodes.cpp | 138 ----- scene/resources/world_2d.cpp | 46 -- scene/resources/world_2d.h | 1 - scene/resources/world_3d.cpp | 35 -- scene/resources/world_margin_shape_3d.cpp | 6 - scene/resources/world_margin_shape_3d.h | 1 - scene/scene_string_names.cpp | 2 - scene/scene_string_names.h | 1 - servers/audio/audio_driver_dummy.cpp | 11 - servers/audio/audio_driver_dummy.h | 1 - servers/audio/audio_filter_sw.cpp | 21 - servers/audio/audio_filter_sw.h | 3 - servers/audio/audio_rb_resampler.cpp | 15 - servers/audio/audio_rb_resampler.h | 10 - servers/audio/audio_stream.cpp | 13 - servers/audio/audio_stream.h | 7 - .../audio/effects/audio_effect_amplify.cpp | 3 - servers/audio/effects/audio_effect_chorus.cpp | 25 - servers/audio/effects/audio_effect_chorus.h | 2 - .../audio/effects/audio_effect_compressor.cpp | 20 - servers/audio/effects/audio_effect_delay.cpp | 31 -- .../audio/effects/audio_effect_distortion.cpp | 18 - servers/audio/effects/audio_effect_eq.cpp | 9 - servers/audio/effects/audio_effect_filter.cpp | 12 - .../audio/effects/audio_effect_limiter.cpp | 11 - servers/audio/effects/audio_effect_panner.cpp | 4 - servers/audio/effects/audio_effect_phaser.cpp | 13 - .../effects/audio_effect_pitch_shift.cpp | 4 - .../audio/effects/audio_effect_pitch_shift.h | 1 - servers/audio/effects/audio_effect_record.cpp | 3 - servers/audio/effects/audio_effect_reverb.cpp | 20 - .../audio_effect_spectrum_analyzer.cpp | 7 - .../effects/audio_effect_stereo_enhance.cpp | 12 - .../audio/effects/audio_stream_generator.cpp | 10 - .../audio/effects/audio_stream_generator.h | 1 - servers/audio/effects/eq.cpp | 18 - servers/audio/effects/eq.h | 3 - servers/audio/effects/reverb.cpp | 29 -- servers/audio/effects/reverb.h | 3 - servers/audio_server.cpp | 106 ---- servers/audio_server.h | 7 - servers/display_server.cpp | 1 - servers/navigation_server_3d.cpp | 1 - servers/physics_2d/area_2d_sw.cpp | 15 - servers/physics_2d/area_2d_sw.h | 10 - servers/physics_2d/area_pair_2d_sw.cpp | 14 - servers/physics_2d/area_pair_2d_sw.h | 2 - servers/physics_2d/body_2d_sw.cpp | 58 --- servers/physics_2d/body_2d_sw.h | 13 - servers/physics_2d/body_pair_2d_sw.cpp | 23 - servers/physics_2d/body_pair_2d_sw.h | 2 - servers/physics_2d/broad_phase_2d_basic.cpp | 21 - servers/physics_2d/broad_phase_2d_basic.h | 3 - .../physics_2d/broad_phase_2d_hash_grid.cpp | 62 --- servers/physics_2d/broad_phase_2d_hash_grid.h | 7 - servers/physics_2d/broad_phase_2d_sw.h | 1 - servers/physics_2d/collision_object_2d_sw.cpp | 20 - servers/physics_2d/collision_object_2d_sw.h | 2 - .../physics_2d/collision_solver_2d_sat.cpp | 64 --- servers/physics_2d/collision_solver_2d_sw.cpp | 14 - servers/physics_2d/constraint_2d_sw.h | 1 - servers/physics_2d/joints_2d_sw.cpp | 28 -- servers/physics_2d/joints_2d_sw.h | 4 - servers/physics_2d/physics_server_2d_sw.cpp | 153 ------ servers/physics_2d/physics_server_2d_sw.h | 2 - .../physics_2d/physics_server_2d_wrap_mt.cpp | 17 - .../physics_2d/physics_server_2d_wrap_mt.h | 9 - servers/physics_2d/shape_2d_sw.cpp | 104 ---- servers/physics_2d/shape_2d_sw.h | 31 -- servers/physics_2d/space_2d_sw.cpp | 94 ---- servers/physics_2d/space_2d_sw.h | 2 - servers/physics_2d/step_2d_sw.cpp | 18 - servers/physics_2d/step_2d_sw.h | 1 - servers/physics_3d/area_3d_sw.cpp | 15 - servers/physics_3d/area_3d_sw.h | 10 - servers/physics_3d/area_pair_3d_sw.cpp | 14 - servers/physics_3d/area_pair_3d_sw.h | 2 - servers/physics_3d/body_3d_sw.cpp | 53 -- servers/physics_3d/body_3d_sw.h | 18 - servers/physics_3d/body_pair_3d_sw.cpp | 25 - servers/physics_3d/body_pair_3d_sw.h | 1 - servers/physics_3d/broad_phase_3d_basic.cpp | 27 - servers/physics_3d/broad_phase_3d_basic.h | 3 - servers/physics_3d/broad_phase_3d_sw.h | 1 - servers/physics_3d/broad_phase_octree.cpp | 15 - servers/physics_3d/broad_phase_octree.h | 1 - servers/physics_3d/collision_object_3d_sw.cpp | 19 - servers/physics_3d/collision_object_3d_sw.h | 1 - .../physics_3d/collision_solver_3d_sat.cpp | 93 ---- servers/physics_3d/collision_solver_3d_sw.cpp | 21 - servers/physics_3d/constraint_3d_sw.h | 1 - servers/physics_3d/gjk_epa.cpp | 3 - .../joints/cone_twist_joint_3d_sw.cpp | 15 - .../joints/generic_6dof_joint_3d_sw.cpp | 40 -- .../physics_3d/joints/hinge_joint_3d_sw.cpp | 11 - servers/physics_3d/joints/hinge_joint_3d_sw.h | 1 - servers/physics_3d/joints/pin_joint_3d_sw.cpp | 5 - servers/physics_3d/joints/pin_joint_3d_sw.h | 1 - .../physics_3d/joints/slider_joint_3d_sw.cpp | 5 - servers/physics_3d/joints_3d_sw.h | 1 - servers/physics_3d/physics_server_3d_sw.cpp | 159 ------ servers/physics_3d/physics_server_3d_sw.h | 2 - servers/physics_3d/shape_3d_sw.cpp | 174 ------- servers/physics_3d/shape_3d_sw.h | 17 - servers/physics_3d/space_3d_sw.cpp | 85 ---- servers/physics_3d/space_3d_sw.h | 2 - servers/physics_3d/step_3d_sw.cpp | 17 - servers/physics_3d/step_3d_sw.h | 1 - servers/physics_server_2d.cpp | 54 -- servers/physics_server_2d.h | 11 - servers/physics_server_3d.cpp | 37 -- servers/physics_server_3d.h | 10 - servers/register_server_types.cpp | 4 - servers/rendering/rasterizer.cpp | 2 - servers/rendering/rasterizer.h | 29 -- .../rasterizer_rd/light_cluster_builder.cpp | 6 - .../rasterizer_rd/light_cluster_builder.h | 3 - .../rasterizer_rd/rasterizer_canvas_rd.cpp | 71 --- .../rasterizer_rd/rasterizer_canvas_rd.h | 7 - .../rasterizer_rd/rasterizer_effects_rd.cpp | 40 -- .../rasterizer_rd/rasterizer_effects_rd.h | 21 - .../rendering/rasterizer_rd/rasterizer_rd.cpp | 4 - .../rasterizer_scene_high_end_rd.cpp | 97 ---- .../rasterizer_scene_high_end_rd.h | 13 - .../rasterizer_rd/rasterizer_scene_rd.cpp | 121 ----- .../rasterizer_rd/rasterizer_scene_rd.h | 31 -- .../rasterizer_rd/rasterizer_storage_rd.cpp | 243 --------- .../rasterizer_rd/rasterizer_storage_rd.h | 19 - ...render_pipeline_vertex_format_cache_rd.cpp | 2 - .../render_pipeline_vertex_format_cache_rd.h | 1 - .../rasterizer_rd/shader_compiler_rd.cpp | 65 --- .../rasterizer_rd/shader_compiler_rd.h | 3 - servers/rendering/rasterizer_rd/shader_rd.cpp | 19 - servers/rendering/rasterizer_rd/shader_rd.h | 1 - .../rasterizer_rd/shaders/bokeh_dof.glsl | 5 - .../rasterizer_rd/shaders/canvas.glsl | 8 - .../shaders/canvas_occlusion.glsl | 3 - .../rendering/rasterizer_rd/shaders/copy.glsl | 5 - .../rasterizer_rd/shaders/copy_to_fb.glsl | 2 - .../rasterizer_rd/shaders/cube_to_dp.glsl | 1 - .../shaders/cubemap_roughness.glsl | 3 - .../rasterizer_rd/shaders/giprobe.glsl | 18 - .../rasterizer_rd/shaders/giprobe_debug.glsl | 3 - .../rasterizer_rd/shaders/giprobe_sdf.glsl | 1 - .../rasterizer_rd/shaders/giprobe_write.glsl | 11 - .../shaders/luminance_reduce.glsl | 2 - .../shaders/roughness_limiter.glsl | 1 - .../rasterizer_rd/shaders/scene_high_end.glsl | 56 --- .../shaders/scene_high_end_inc.glsl | 2 - .../shaders/screen_space_reflection.glsl | 5 - .../screen_space_reflection_filter.glsl | 5 - .../screen_space_reflection_scale.glsl | 4 - .../rendering/rasterizer_rd/shaders/sky.glsl | 2 - .../rasterizer_rd/shaders/specular_merge.glsl | 2 - .../rasterizer_rd/shaders/ssao_blur.glsl | 2 - .../rasterizer_rd/shaders/ssao_minify.glsl | 1 - .../shaders/subsurface_scattering.glsl | 4 - .../rasterizer_rd/shaders/tonemap.glsl | 4 - servers/rendering/rendering_device.cpp | 10 - servers/rendering/rendering_device.h | 3 - servers/rendering/rendering_device_binds.cpp | 5 - servers/rendering/rendering_device_binds.h | 3 - servers/rendering/rendering_server_canvas.cpp | 127 ----- servers/rendering/rendering_server_canvas.h | 8 - servers/rendering/rendering_server_raster.cpp | 19 - servers/rendering/rendering_server_raster.h | 2 - servers/rendering/rendering_server_scene.cpp | 191 ------- servers/rendering/rendering_server_scene.h | 17 - .../rendering/rendering_server_viewport.cpp | 50 -- servers/rendering/rendering_server_viewport.h | 5 - .../rendering/rendering_server_wrap_mt.cpp | 20 - servers/rendering/rendering_server_wrap_mt.h | 1 - servers/rendering/shader_language.cpp | 210 -------- servers/rendering/shader_language.h | 4 - servers/rendering/shader_types.cpp | 3 - servers/rendering/shader_types.h | 2 - servers/rendering_server.cpp | 151 ------ servers/rendering_server.h | 2 - servers/xr_server.cpp | 7 - 1552 files changed, 1 insertion(+), 33876 deletions(-) mode change 100755 => 100644 modules/mbedtls/register_types.cpp diff --git a/.clang-format b/.clang-format index 75715a3173..1c26421a7f 100644 --- a/.clang-format +++ b/.clang-format @@ -76,7 +76,7 @@ IndentWidth: 4 # IndentWrappedFunctionNames: false # JavaScriptQuotes: Leave # JavaScriptWrapImports: true -# KeepEmptyLinesAtTheStartOfBlocks: true +KeepEmptyLinesAtTheStartOfBlocks: false # MacroBlockBegin: '' # MacroBlockEnd: '' # MaxEmptyLinesToKeep: 1 diff --git a/core/array.cpp b/core/array.cpp index 7c0129ffde..75efe8f8ff 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -46,7 +46,6 @@ public: }; void Array::_ref(const Array &p_from) const { - ArrayPrivate *_fp = p_from._p; ERR_FAIL_COND(!_fp); // should NOT happen. @@ -64,7 +63,6 @@ void Array::_ref(const Array &p_from) const { } void Array::_unref() const { - if (!_p) return; @@ -75,46 +73,37 @@ void Array::_unref() const { } Variant &Array::operator[](int p_idx) { - return _p->array.write[p_idx]; } const Variant &Array::operator[](int p_idx) const { - return _p->array[p_idx]; } int Array::size() const { - return _p->array.size(); } bool Array::empty() const { - return _p->array.empty(); } void Array::clear() { - _p->array.clear(); } bool Array::operator==(const Array &p_array) const { - return _p == p_array._p; } uint32_t Array::hash() const { - uint32_t h = hash_djb2_one_32(0); for (int i = 0; i < _p->array.size(); i++) { - h = hash_djb2_one_32(_p->array[i].hash(), h); } return h; } void Array::_assign(const Array &p_array) { - if (_p->typed.type != Variant::OBJECT && _p->typed.type == p_array._p->typed.type) { //same type or untyped, just reference, shuold be fine _ref(p_array); @@ -163,24 +152,20 @@ void Array::operator=(const Array &p_array) { _assign(p_array); } void Array::push_back(const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "push_back")); _p->array.push_back(p_value); } Error Array::resize(int p_new_size) { - return _p->array.resize(p_new_size); } void Array::insert(int p_pos, const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "insert")); _p->array.insert(p_pos, p_value); } void Array::erase(const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "erase")); _p->array.erase(p_value); } @@ -196,13 +181,11 @@ Variant Array::back() const { } int Array::find(const Variant &p_value, int p_from) const { - ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find"), -1); return _p->array.find(p_value, p_from); } int Array::rfind(const Variant &p_value, int p_from) const { - if (_p->array.size() == 0) return -1; ERR_FAIL_COND_V(!_p->typed.validate(p_value, "rfind"), -1); @@ -217,7 +200,6 @@ int Array::rfind(const Variant &p_value, int p_from) const { } for (int i = p_from; i >= 0; i--) { - if (_p->array[i] == p_value) { return i; } @@ -227,20 +209,17 @@ int Array::rfind(const Variant &p_value, int p_from) const { } int Array::find_last(const Variant &p_value) const { - ERR_FAIL_COND_V(!_p->typed.validate(p_value, "find_last"), -1); return rfind(p_value); } int Array::count(const Variant &p_value) const { - ERR_FAIL_COND_V(!_p->typed.validate(p_value, "count"), 0); if (_p->array.size() == 0) return 0; int amount = 0; for (int i = 0; i < _p->array.size(); i++) { - if (_p->array[i] == p_value) { amount++; } @@ -256,24 +235,20 @@ bool Array::has(const Variant &p_value) const { } void Array::remove(int p_pos) { - _p->array.remove(p_pos); } void Array::set(int p_idx, const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "set")); operator[](p_idx) = p_value; } const Variant &Array::get(int p_idx) const { - return operator[](p_idx); } Array Array::duplicate(bool p_deep) const { - Array new_arr; int element_count = size(); new_arr.resize(element_count); @@ -286,7 +261,6 @@ Array Array::duplicate(bool p_deep) const { } int Array::_clamp_slice_index(int p_index) const { - int arr_size = size(); int fixed_index = CLAMP(p_index, -arr_size, arr_size - 1); if (fixed_index < 0) { @@ -335,7 +309,6 @@ Array Array::slice(int p_begin, int p_end, int p_step, bool p_deep) const { // l } struct _ArrayVariantSort { - _FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const { bool valid = false; Variant res; @@ -347,18 +320,15 @@ struct _ArrayVariantSort { }; Array &Array::sort() { - _p->array.sort_custom<_ArrayVariantSort>(); return *this; } struct _ArrayVariantSortCustom { - Object *obj; StringName func; _FORCE_INLINE_ bool operator()(const Variant &p_l, const Variant &p_r) const { - const Variant *args[2] = { &p_l, &p_r }; Callable::CallError err; bool res = obj->call(func, args, 2, err); @@ -368,7 +338,6 @@ struct _ArrayVariantSortCustom { } }; Array &Array::sort_custom(Object *p_obj, const StringName &p_function) { - ERR_FAIL_NULL_V(p_obj, *this); SortArray avs; @@ -379,7 +348,6 @@ Array &Array::sort_custom(Object *p_obj, const StringName &p_function) { } void Array::shuffle() { - const int n = _p->array.size(); if (n < 2) return; @@ -394,7 +362,6 @@ void Array::shuffle() { template _FORCE_INLINE_ int bisect(const Vector &p_array, const Variant &p_value, bool p_before, const Less &p_less) { - int lo = 0; int hi = p_array.size(); if (p_before) { @@ -420,13 +387,11 @@ _FORCE_INLINE_ int bisect(const Vector &p_array, const Variant &p_value } int Array::bsearch(const Variant &p_value, bool p_before) { - ERR_FAIL_COND_V(!_p->typed.validate(p_value, "binary search"), -1); return bisect(_p->array, p_value, p_before, _ArrayVariantSort()); } int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before) { - ERR_FAIL_COND_V(!_p->typed.validate(p_value, "custom binary search"), -1); ERR_FAIL_NULL_V(p_obj, 0); @@ -438,19 +403,16 @@ int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringNam } Array &Array::invert() { - _p->array.invert(); return *this; } void Array::push_front(const Variant &p_value) { - ERR_FAIL_COND(!_p->typed.validate(p_value, "push_front")); _p->array.insert(0, p_value); } Variant Array::pop_back() { - if (!_p->array.empty()) { int n = _p->array.size() - 1; Variant ret = _p->array.get(n); @@ -461,7 +423,6 @@ Variant Array::pop_back() { } Variant Array::pop_front() { - if (!_p->array.empty()) { Variant ret = _p->array.get(0); _p->array.remove(0); @@ -471,7 +432,6 @@ Variant Array::pop_front() { } Variant Array::min() const { - Variant minval; for (int i = 0; i < size(); i++) { if (i == 0) { @@ -494,7 +454,6 @@ Variant Array::min() const { } Variant Array::max() const { - Variant maxval; for (int i = 0; i < size(); i++) { if (i == 0) { @@ -542,17 +501,14 @@ void Array::set_typed(uint32_t p_type, const StringName &p_class_name, const Var } Array::Array(const Array &p_from) { - _p = nullptr; _ref(p_from); } Array::Array() { - _p = memnew(ArrayPrivate); _p->refcount.init(); } Array::~Array() { - _unref(); } diff --git a/core/array.h b/core/array.h index 14db57f15f..d2e0537ad5 100644 --- a/core/array.h +++ b/core/array.h @@ -39,7 +39,6 @@ class Object; class StringName; class Array { - mutable ArrayPrivate *_p; void _ref(const Array &p_from) const; void _unref() const; diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index ed0e7b1018..a5809d6678 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -67,7 +67,6 @@ static const unsigned int MONTH_DAYS_TABLE[2][12] = { _ResourceLoader *_ResourceLoader::singleton = nullptr; Error _ResourceLoader::load_threaded_request(const String &p_path, const String &p_type_hint, bool p_use_sub_threads) { - return ResourceLoader::load_threaded_request(p_path, p_type_hint, p_use_sub_threads); } _ResourceLoader::ThreadLoadStatus _ResourceLoader::load_threaded_get_status(const String &p_path, Array r_progress) { @@ -84,7 +83,6 @@ RES _ResourceLoader::load_threaded_get(const String &p_path) { } RES _ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache) { - Error err = OK; RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache, &err); @@ -93,12 +91,10 @@ RES _ResourceLoader::load(const String &p_path, const String &p_type_hint, bool } Vector _ResourceLoader::get_recognized_extensions_for_type(const String &p_type) { - List exts; ResourceLoader::get_recognized_extensions_for_type(p_type, &exts); Vector ret; for (List::Element *E = exts.front(); E; E = E->next()) { - ret.push_back(E->get()); } @@ -106,12 +102,10 @@ Vector _ResourceLoader::get_recognized_extensions_for_type(const String } void _ResourceLoader::set_abort_on_missing_resources(bool p_abort) { - ResourceLoader::set_abort_on_missing_resources(p_abort); } PackedStringArray _ResourceLoader::get_dependencies(const String &p_path) { - List deps; ResourceLoader::get_dependencies(p_path, &deps); @@ -124,7 +118,6 @@ PackedStringArray _ResourceLoader::get_dependencies(const String &p_path) { }; bool _ResourceLoader::has_cached(const String &p_path) { - String local_path = ProjectSettings::get_singleton()->localize_path(p_path); return ResourceCache::has(local_path); } @@ -134,7 +127,6 @@ bool _ResourceLoader::exists(const String &p_path, const String &p_type_hint) { } void _ResourceLoader::_bind_methods() { - ClassDB::bind_method(D_METHOD("load_threaded_request", "path", "type_hint", "use_sub_threads"), &_ResourceLoader::load_threaded_request, DEFVAL(""), DEFVAL(false)); ClassDB::bind_method(D_METHOD("load_threaded_get_status", "path", "progress"), &_ResourceLoader::load_threaded_get_status, DEFVAL(Array())); ClassDB::bind_method(D_METHOD("load_threaded_get", "path"), &_ResourceLoader::load_threaded_get); @@ -160,13 +152,11 @@ Error _ResourceSaver::save(const String &p_path, const RES &p_resource, SaverFla } Vector _ResourceSaver::get_recognized_extensions(const RES &p_resource) { - ERR_FAIL_COND_V_MSG(p_resource.is_null(), Vector(), "It's not a reference to a valid Resource object."); List exts; ResourceSaver::get_recognized_extensions(p_resource, &exts); Vector ret; for (List::Element *E = exts.front(); E; E = E->next()) { - ret.push_back(E->get()); } return ret; @@ -175,7 +165,6 @@ Vector _ResourceSaver::get_recognized_extensions(const RES &p_resource) _ResourceSaver *_ResourceSaver::singleton = nullptr; void _ResourceSaver::_bind_methods() { - ClassDB::bind_method(D_METHOD("save", "path", "resource", "flags"), &_ResourceSaver::save, DEFVAL(0)); ClassDB::bind_method(D_METHOD("get_recognized_extensions", "type"), &_ResourceSaver::get_recognized_extensions); @@ -203,36 +192,29 @@ void _OS::close_midi_inputs() { } void _OS::set_use_file_access_save_and_swap(bool p_enable) { - FileAccess::set_backup_save(p_enable); } void _OS::set_low_processor_usage_mode(bool p_enabled) { - OS::get_singleton()->set_low_processor_usage_mode(p_enabled); } bool _OS::is_in_low_processor_usage_mode() const { - return OS::get_singleton()->is_in_low_processor_usage_mode(); } void _OS::set_low_processor_usage_mode_sleep_usec(int p_usec) { - OS::get_singleton()->set_low_processor_usage_mode_sleep_usec(p_usec); } int _OS::get_low_processor_usage_mode_sleep_usec() const { - return OS::get_singleton()->get_low_processor_usage_mode_sleep_usec(); } String _OS::get_executable_path() const { - return OS::get_singleton()->get_executable_path(); } Error _OS::shell_open(String p_uri) { - if (p_uri.begins_with("res://")) { WARN_PRINT("Attempting to open an URL with the \"res://\" protocol. Use `ProjectSettings.globalize_path()` to convert a Godot-specific path to a system path before opening it with `OS.shell_open()`."); } else if (p_uri.begins_with("user://")) { @@ -242,7 +224,6 @@ Error _OS::shell_open(String p_uri) { }; int _OS::execute(const String &p_path, const Vector &p_arguments, bool p_blocking, Array p_output, bool p_read_stderr) { - OS::ProcessID pid = -2; int exitcode = 0; List args; @@ -261,34 +242,27 @@ int _OS::execute(const String &p_path, const Vector &p_arguments, bool p } Error _OS::kill(int p_pid) { - return OS::get_singleton()->kill(p_pid); } int _OS::get_process_id() const { - return OS::get_singleton()->get_process_id(); }; bool _OS::has_environment(const String &p_var) const { - return OS::get_singleton()->has_environment(p_var); } String _OS::get_environment(const String &p_var) const { - return OS::get_singleton()->get_environment(p_var); } String _OS::get_name() const { - return OS::get_singleton()->get_name(); } Vector _OS::get_cmdline_args() { - List cmdline = OS::get_singleton()->get_cmdline_args(); Vector cmdlinev; for (List::Element *E = cmdline.front(); E; E = E->next()) { - cmdlinev.push_back(E->get()); } @@ -296,42 +270,34 @@ Vector _OS::get_cmdline_args() { } String _OS::get_locale() const { - return OS::get_singleton()->get_locale(); } String _OS::get_model_name() const { - return OS::get_singleton()->get_model_name(); } Error _OS::set_thread_name(const String &p_name) { - return Thread::set_name(p_name); }; bool _OS::has_feature(const String &p_feature) const { - return OS::get_singleton()->has_feature(p_feature); } uint64_t _OS::get_static_memory_usage() const { - return OS::get_singleton()->get_static_memory_usage(); } uint64_t _OS::get_static_memory_peak_usage() const { - return OS::get_singleton()->get_static_memory_peak_usage(); } int _OS::get_exit_code() const { - return OS::get_singleton()->get_exit_code(); } void _OS::set_exit_code(int p_code) { - if (p_code < 0 || p_code > 125) { WARN_PRINT("For portability reasons, the exit code should be set between 0 and 125 (inclusive)."); } @@ -344,7 +310,6 @@ void _OS::set_exit_code(int p_code) { * dst */ Dictionary _OS::get_datetime(bool utc) const { - Dictionary dated = get_date(utc); Dictionary timed = get_time(utc); @@ -359,7 +324,6 @@ Dictionary _OS::get_datetime(bool utc) const { } Dictionary _OS::get_date(bool utc) const { - OS::Date date = OS::get_singleton()->get_date(utc); Dictionary dated; dated[YEAR_KEY] = date.year; @@ -371,7 +335,6 @@ Dictionary _OS::get_date(bool utc) const { } Dictionary _OS::get_time(bool utc) const { - OS::Time time = OS::get_singleton()->get_time(utc); Dictionary timed; timed[HOUR_KEY] = time.hour; @@ -393,7 +356,6 @@ Dictionary _OS::get_time(bool utc) const { * @return epoch calculated */ int64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { - // Bunch of conversion constants static const unsigned int SECONDS_PER_MINUTE = 60; static const unsigned int MINUTES_PER_HOUR = 60; @@ -466,7 +428,6 @@ int64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { * @return dictionary of date and time values */ Dictionary _OS::get_datetime_from_unix_time(int64_t unix_time_val) const { - OS::Date date; OS::Time time; @@ -530,7 +491,6 @@ Dictionary _OS::get_time_zone_info() const { } uint64_t _OS::get_unix_time() const { - return OS::get_singleton()->get_unix_time(); } @@ -543,57 +503,46 @@ uint64_t _OS::get_system_time_msecs() const { } void _OS::delay_usec(uint32_t p_usec) const { - OS::get_singleton()->delay_usec(p_usec); } void _OS::delay_msec(uint32_t p_msec) const { - OS::get_singleton()->delay_usec(int64_t(p_msec) * 1000); } uint32_t _OS::get_ticks_msec() const { - return OS::get_singleton()->get_ticks_msec(); } uint64_t _OS::get_ticks_usec() const { - return OS::get_singleton()->get_ticks_usec(); } uint32_t _OS::get_splash_tick_msec() const { - return OS::get_singleton()->get_splash_tick_msec(); } bool _OS::can_use_threads() const { - return OS::get_singleton()->can_use_threads(); } bool _OS::is_userfs_persistent() const { - return OS::get_singleton()->is_userfs_persistent(); } int _OS::get_processor_count() const { - return OS::get_singleton()->get_processor_count(); } bool _OS::is_stdout_verbose() const { - return OS::get_singleton()->is_stdout_verbose(); } void _OS::dump_memory_to_file(const String &p_file) { - OS::get_singleton()->dump_memory_to_file(p_file.utf8().get_data()); } struct _OSCoreBindImg { - String path; Size2 size; int fmt; @@ -603,7 +552,6 @@ struct _OSCoreBindImg { }; void _OS::print_all_textures_by_size() { - List<_OSCoreBindImg> imgs; int total = 0; { @@ -611,7 +559,6 @@ void _OS::print_all_textures_by_size() { ResourceCache::get_cached_resources(&rsrc); for (List>::Element *E = rsrc.front(); E; E = E->next()) { - if (!E->get()->is_class("ImageTexture")) continue; @@ -632,13 +579,11 @@ void _OS::print_all_textures_by_size() { imgs.sort(); for (List<_OSCoreBindImg>::Element *E = imgs.front(); E; E = E->next()) { - total -= E->get().vram; } } void _OS::print_resources_by_type(const Vector &p_types) { - Map type_count; List> resources; @@ -648,7 +593,6 @@ void _OS::print_resources_by_type(const Vector &p_types) { ResourceCache::get_cached_resources(&rsrc); for (List>::Element *E = rsrc.front(); E; E = E->next()) { - Ref r = E->get(); bool found = false; @@ -669,27 +613,22 @@ void _OS::print_resources_by_type(const Vector &p_types) { }; void _OS::print_all_resources(const String &p_to_file) { - OS::get_singleton()->print_all_resources(p_to_file); } void _OS::print_resources_in_use(bool p_short) { - OS::get_singleton()->print_resources_in_use(p_short); } void _OS::dump_resources_to_file(const String &p_file) { - OS::get_singleton()->dump_resources_to_file(p_file.utf8().get_data()); } String _OS::get_user_data_dir() const { - return OS::get_singleton()->get_user_data_dir(); }; bool _OS::is_debug_build() const { - #ifdef DEBUG_ENABLED return true; #else @@ -698,37 +637,30 @@ bool _OS::is_debug_build() const { } String _OS::get_system_dir(SystemDir p_dir) const { - return OS::get_singleton()->get_system_dir(OS::SystemDir(p_dir)); } String _OS::get_keycode_string(uint32_t p_code) const { - return keycode_get_string(p_code); } bool _OS::is_keycode_unicode(uint32_t p_unicode) const { - return keycode_has_unicode(p_unicode); } int _OS::find_keycode_from_string(const String &p_code) const { - return find_keycode(p_code); } bool _OS::request_permission(const String &p_name) { - return OS::get_singleton()->request_permission(p_name); } bool _OS::request_permissions() { - return OS::get_singleton()->request_permissions(); } Vector _OS::get_granted_permissions() const { - return OS::get_singleton()->get_granted_permissions(); } @@ -739,7 +671,6 @@ String _OS::get_unique_id() const { _OS *_OS::singleton = nullptr; void _OS::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_connected_midi_inputs"), &_OS::get_connected_midi_inputs); ClassDB::bind_method(D_METHOD("open_midi_inputs"), &_OS::open_midi_inputs); ClassDB::bind_method(D_METHOD("close_midi_inputs"), &_OS::close_midi_inputs); @@ -870,39 +801,31 @@ void _OS::_bind_methods() { _Geometry *_Geometry::singleton = nullptr; _Geometry *_Geometry::get_singleton() { - return singleton; } Vector _Geometry::build_box_planes(const Vector3 &p_extents) { - return Geometry::build_box_planes(p_extents); } Vector _Geometry::build_cylinder_planes(float p_radius, float p_height, int p_sides, Vector3::Axis p_axis) { - return Geometry::build_cylinder_planes(p_radius, p_height, p_sides, p_axis); } Vector _Geometry::build_capsule_planes(float p_radius, float p_height, int p_sides, int p_lats, Vector3::Axis p_axis) { - return Geometry::build_capsule_planes(p_radius, p_height, p_sides, p_lats, p_axis); } bool _Geometry::is_point_in_circle(const Vector2 &p_point, const Vector2 &p_circle_pos, real_t p_circle_radius) { - return Geometry::is_point_in_circle(p_point, p_circle_pos, p_circle_radius); } real_t _Geometry::segment_intersects_circle(const Vector2 &p_from, const Vector2 &p_to, const Vector2 &p_circle_pos, real_t p_circle_radius) { - return Geometry::segment_intersects_circle(p_from, p_to, p_circle_pos, p_circle_radius); } Variant _Geometry::segment_intersects_segment_2d(const Vector2 &p_from_a, const Vector2 &p_to_a, const Vector2 &p_from_b, const Vector2 &p_to_b) { - Vector2 result; if (Geometry::segment_intersects_segment_2d(p_from_a, p_to_a, p_from_b, p_to_b, &result)) { - return result; } else { return Variant(); @@ -910,7 +833,6 @@ Variant _Geometry::segment_intersects_segment_2d(const Vector2 &p_from_a, const }; Variant _Geometry::line_intersects_line_2d(const Vector2 &p_from_a, const Vector2 &p_dir_a, const Vector2 &p_from_b, const Vector2 &p_dir_b) { - Vector2 result; if (Geometry::line_intersects_line_2d(p_from_a, p_dir_a, p_from_b, p_dir_b, result)) { return result; @@ -920,7 +842,6 @@ Variant _Geometry::line_intersects_line_2d(const Vector2 &p_from_a, const Vector } Vector _Geometry::get_closest_points_between_segments_2d(const Vector2 &p1, const Vector2 &q1, const Vector2 &p2, const Vector2 &q2) { - Vector2 r1, r2; Geometry::get_closest_points_between_segments(p1, q1, p2, q2, r1, r2); Vector r; @@ -931,7 +852,6 @@ Vector _Geometry::get_closest_points_between_segments_2d(const Vector2 } Vector _Geometry::get_closest_points_between_segments(const Vector3 &p1, const Vector3 &p2, const Vector3 &q1, const Vector3 &q2) { - Vector3 r1, r2; Geometry::get_closest_points_between_segments(p1, p2, q1, q2, r1, r2); Vector r; @@ -941,27 +861,22 @@ Vector _Geometry::get_closest_points_between_segments(const Vector3 &p1 return r; } Vector2 _Geometry::get_closest_point_to_segment_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) { - Vector2 s[2] = { p_a, p_b }; return Geometry::get_closest_point_to_segment_2d(p_point, s); } Vector3 _Geometry::get_closest_point_to_segment(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) { - Vector3 s[2] = { p_a, p_b }; return Geometry::get_closest_point_to_segment(p_point, s); } Vector2 _Geometry::get_closest_point_to_segment_uncapped_2d(const Vector2 &p_point, const Vector2 &p_a, const Vector2 &p_b) { - Vector2 s[2] = { p_a, p_b }; return Geometry::get_closest_point_to_segment_uncapped_2d(p_point, s); } Vector3 _Geometry::get_closest_point_to_segment_uncapped(const Vector3 &p_point, const Vector3 &p_a, const Vector3 &p_b) { - Vector3 s[2] = { p_a, p_b }; return Geometry::get_closest_point_to_segment_uncapped(p_point, s); } Variant _Geometry::ray_intersects_triangle(const Vector3 &p_from, const Vector3 &p_dir, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2) { - Vector3 res; if (Geometry::ray_intersects_triangle(p_from, p_dir, p_v0, p_v1, p_v2, &res)) return res; @@ -969,7 +884,6 @@ Variant _Geometry::ray_intersects_triangle(const Vector3 &p_from, const Vector3 return Variant(); } Variant _Geometry::segment_intersects_triangle(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_v0, const Vector3 &p_v1, const Vector3 &p_v2) { - Vector3 res; if (Geometry::segment_intersects_triangle(p_from, p_to, p_v0, p_v1, p_v2, &res)) return res; @@ -978,12 +892,10 @@ Variant _Geometry::segment_intersects_triangle(const Vector3 &p_from, const Vect } bool _Geometry::point_is_inside_triangle(const Vector2 &s, const Vector2 &a, const Vector2 &b, const Vector2 &c) const { - return Geometry::is_point_in_triangle(s, a, b, c); } Vector _Geometry::segment_intersects_sphere(const Vector3 &p_from, const Vector3 &p_to, const Vector3 &p_sphere_pos, real_t p_sphere_radius) { - Vector r; Vector3 res, norm; if (!Geometry::segment_intersects_sphere(p_from, p_to, p_sphere_pos, p_sphere_radius, &res, &norm)) @@ -995,7 +907,6 @@ Vector _Geometry::segment_intersects_sphere(const Vector3 &p_from, cons return r; } Vector _Geometry::segment_intersects_cylinder(const Vector3 &p_from, const Vector3 &p_to, float p_height, float p_radius) { - Vector r; Vector3 res, norm; if (!Geometry::segment_intersects_cylinder(p_from, p_to, p_height, p_radius, &res, &norm)) @@ -1007,7 +918,6 @@ Vector _Geometry::segment_intersects_cylinder(const Vector3 &p_from, co return r; } Vector _Geometry::segment_intersects_convex(const Vector3 &p_from, const Vector3 &p_to, const Vector &p_planes) { - Vector r; Vector3 res, norm; if (!Geometry::segment_intersects_convex(p_from, p_to, p_planes.ptr(), p_planes.size(), &res, &norm)) @@ -1020,37 +930,30 @@ Vector _Geometry::segment_intersects_convex(const Vector3 &p_from, cons } bool _Geometry::is_polygon_clockwise(const Vector &p_polygon) { - return Geometry::is_polygon_clockwise(p_polygon); } bool _Geometry::is_point_in_polygon(const Point2 &p_point, const Vector &p_polygon) { - return Geometry::is_point_in_polygon(p_point, p_polygon); } Vector _Geometry::triangulate_polygon(const Vector &p_polygon) { - return Geometry::triangulate_polygon(p_polygon); } Vector _Geometry::triangulate_delaunay_2d(const Vector &p_points) { - return Geometry::triangulate_delaunay_2d(p_points); } Vector _Geometry::convex_hull_2d(const Vector &p_points) { - return Geometry::convex_hull_2d(p_points); } Vector _Geometry::clip_polygon(const Vector &p_points, const Plane &p_plane) { - return Geometry::clip_polygon(p_points, p_plane); } Array _Geometry::merge_polygons_2d(const Vector &p_polygon_a, const Vector &p_polygon_b) { - Vector> polys = Geometry::merge_polygons_2d(p_polygon_a, p_polygon_b); Array ret; @@ -1062,7 +965,6 @@ Array _Geometry::merge_polygons_2d(const Vector &p_polygon_a, const Vec } Array _Geometry::clip_polygons_2d(const Vector &p_polygon_a, const Vector &p_polygon_b) { - Vector> polys = Geometry::clip_polygons_2d(p_polygon_a, p_polygon_b); Array ret; @@ -1074,7 +976,6 @@ Array _Geometry::clip_polygons_2d(const Vector &p_polygon_a, const Vect } Array _Geometry::intersect_polygons_2d(const Vector &p_polygon_a, const Vector &p_polygon_b) { - Vector> polys = Geometry::intersect_polygons_2d(p_polygon_a, p_polygon_b); Array ret; @@ -1086,7 +987,6 @@ Array _Geometry::intersect_polygons_2d(const Vector &p_polygon_a, const } Array _Geometry::exclude_polygons_2d(const Vector &p_polygon_a, const Vector &p_polygon_b) { - Vector> polys = Geometry::exclude_polygons_2d(p_polygon_a, p_polygon_b); Array ret; @@ -1098,7 +998,6 @@ Array _Geometry::exclude_polygons_2d(const Vector &p_polygon_a, const V } Array _Geometry::clip_polyline_with_polygon_2d(const Vector &p_polyline, const Vector &p_polygon) { - Vector> polys = Geometry::clip_polyline_with_polygon_2d(p_polyline, p_polygon); Array ret; @@ -1110,7 +1009,6 @@ Array _Geometry::clip_polyline_with_polygon_2d(const Vector &p_polyline } Array _Geometry::intersect_polyline_with_polygon_2d(const Vector &p_polyline, const Vector &p_polygon) { - Vector> polys = Geometry::intersect_polyline_with_polygon_2d(p_polyline, p_polygon); Array ret; @@ -1122,7 +1020,6 @@ Array _Geometry::intersect_polyline_with_polygon_2d(const Vector &p_pol } Array _Geometry::offset_polygon_2d(const Vector &p_polygon, real_t p_delta, PolyJoinType p_join_type) { - Vector> polys = Geometry::offset_polygon_2d(p_polygon, p_delta, Geometry::PolyJoinType(p_join_type)); Array ret; @@ -1134,7 +1031,6 @@ Array _Geometry::offset_polygon_2d(const Vector &p_polygon, real_t p_de } Array _Geometry::offset_polyline_2d(const Vector &p_polygon, real_t p_delta, PolyJoinType p_join_type, PolyEndType p_end_type) { - Vector> polys = Geometry::offset_polyline_2d(p_polygon, p_delta, Geometry::PolyJoinType(p_join_type), Geometry::PolyEndType(p_end_type)); Array ret; @@ -1146,12 +1042,10 @@ Array _Geometry::offset_polyline_2d(const Vector &p_polygon, real_t p_d } Dictionary _Geometry::make_atlas(const Vector &p_rects) { - Dictionary ret; Vector rects; for (int i = 0; i < p_rects.size(); i++) { - rects.push_back(p_rects[i]); }; @@ -1163,7 +1057,6 @@ Dictionary _Geometry::make_atlas(const Vector &p_rects) { Size2 r_size = size; Vector r_result; for (int i = 0; i < result.size(); i++) { - r_result.push_back(result[i]); }; @@ -1174,12 +1067,10 @@ Dictionary _Geometry::make_atlas(const Vector &p_rects) { }; int _Geometry::get_uv84_normal_bit(const Vector3 &p_vector) { - return Geometry::get_uv84_normal_bit(p_vector); } void _Geometry::_bind_methods() { - ClassDB::bind_method(D_METHOD("build_box_planes", "extents"), &_Geometry::build_box_planes); ClassDB::bind_method(D_METHOD("build_cylinder_planes", "radius", "height", "sides", "axis"), &_Geometry::build_cylinder_planes, DEFVAL(Vector3::AXIS_Z)); ClassDB::bind_method(D_METHOD("build_capsule_planes", "radius", "height", "sides", "lats", "axis"), &_Geometry::build_capsule_planes, DEFVAL(Vector3::AXIS_Z)); @@ -1245,7 +1136,6 @@ void _Geometry::_bind_methods() { ////// _File ////// Error _File::open_encrypted(const String &p_path, ModeFlags p_mode_flags, const Vector &p_key) { - Error err = open(p_path, p_mode_flags); if (err) return err; @@ -1262,7 +1152,6 @@ Error _File::open_encrypted(const String &p_path, ModeFlags p_mode_flags, const } Error _File::open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags, const String &p_pass) { - Error err = open(p_path, p_mode_flags); if (err) return err; @@ -1280,7 +1169,6 @@ Error _File::open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags, c } Error _File::open_compressed(const String &p_path, ModeFlags p_mode_flags, CompressionMode p_compress_mode) { - FileAccessCompressed *fac = memnew(FileAccessCompressed); fac->configure("GCPF", (Compression::Mode)p_compress_mode); @@ -1297,7 +1185,6 @@ Error _File::open_compressed(const String &p_path, ModeFlags p_mode_flags, Compr } Error _File::open(const String &p_path, ModeFlags p_mode_flags) { - close(); Error err; f = FileAccess::open(p_path, p_mode_flags, &err); @@ -1307,94 +1194,77 @@ Error _File::open(const String &p_path, ModeFlags p_mode_flags) { } void _File::close() { - if (f) memdelete(f); f = nullptr; } bool _File::is_open() const { - return f != nullptr; } String _File::get_path() const { - ERR_FAIL_COND_V_MSG(!f, "", "File must be opened before use."); return f->get_path(); } String _File::get_path_absolute() const { - ERR_FAIL_COND_V_MSG(!f, "", "File must be opened before use."); return f->get_path_absolute(); } void _File::seek(int64_t p_position) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->seek(p_position); } void _File::seek_end(int64_t p_position) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->seek_end(p_position); } int64_t _File::get_position() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_position(); } int64_t _File::get_len() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_len(); } bool _File::eof_reached() const { - ERR_FAIL_COND_V_MSG(!f, false, "File must be opened before use."); return f->eof_reached(); } uint8_t _File::get_8() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_8(); } uint16_t _File::get_16() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_16(); } uint32_t _File::get_32() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_32(); } uint64_t _File::get_64() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_64(); } float _File::get_float() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_float(); } double _File::get_double() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_double(); } real_t _File::get_real() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); return f->get_real(); } Vector _File::get_buffer(int p_length) const { - Vector data; ERR_FAIL_COND_V_MSG(!f, data, "File must be opened before use."); @@ -1416,7 +1286,6 @@ Vector _File::get_buffer(int p_length) const { } String _File::get_as_text() const { - ERR_FAIL_COND_V_MSG(!f, String(), "File must be opened before use."); String text; @@ -1436,17 +1305,14 @@ String _File::get_as_text() const { } String _File::get_md5(const String &p_path) const { - return FileAccess::get_md5(p_path); } String _File::get_sha256(const String &p_path) const { - return FileAccess::get_sha256(p_path); } String _File::get_line() const { - ERR_FAIL_COND_V_MSG(!f, String(), "File must be opened before use."); return f->get_line(); } @@ -1462,90 +1328,76 @@ Vector _File::get_csv_line(const String &p_delim) const { */ void _File::set_endian_swap(bool p_swap) { - eswap = p_swap; if (f) f->set_endian_swap(p_swap); } bool _File::get_endian_swap() { - return eswap; } Error _File::get_error() const { - if (!f) return ERR_UNCONFIGURED; return f->get_error(); } void _File::store_8(uint8_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_8(p_dest); } void _File::store_16(uint16_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_16(p_dest); } void _File::store_32(uint32_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_32(p_dest); } void _File::store_64(uint64_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_64(p_dest); } void _File::store_float(float p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_float(p_dest); } void _File::store_double(double p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_double(p_dest); } void _File::store_real(real_t p_real) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_real(p_real); } void _File::store_string(const String &p_string) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_string(p_string); } void _File::store_pascal_string(const String &p_string) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_pascal_string(p_string); }; String _File::get_pascal_string() { - ERR_FAIL_COND_V_MSG(!f, "", "File must be opened before use."); return f->get_pascal_string(); }; void _File::store_line(const String &p_string) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); f->store_line(p_string); } @@ -1556,7 +1408,6 @@ void _File::store_csv_line(const Vector &p_values, const String &p_delim } void _File::store_buffer(const Vector &p_buffer) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); int len = p_buffer.size(); @@ -1569,12 +1420,10 @@ void _File::store_buffer(const Vector &p_buffer) { } bool _File::file_exists(const String &p_name) const { - return FileAccess::exists(p_name); } void _File::store_var(const Variant &p_var, bool p_full_objects) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); int len; Error err = encode_variant(p_var, nullptr, len, p_full_objects); @@ -1592,7 +1441,6 @@ void _File::store_var(const Variant &p_var, bool p_full_objects) { } Variant _File::get_var(bool p_allow_objects) const { - ERR_FAIL_COND_V_MSG(!f, Variant(), "File must be opened before use."); uint32_t len = get_32(); Vector buff = get_buffer(len); @@ -1608,12 +1456,10 @@ Variant _File::get_var(bool p_allow_objects) const { } uint64_t _File::get_modified_time(const String &p_file) const { - return FileAccess::get_modified_time(p_file); } void _File::_bind_methods() { - ClassDB::bind_method(D_METHOD("open_encrypted", "path", "mode_flags", "key"), &_File::open_encrypted); ClassDB::bind_method(D_METHOD("open_encrypted_with_pass", "path", "mode_flags", "pass"), &_File::open_encrypted_pass); ClassDB::bind_method(D_METHOD("open_compressed", "path", "mode_flags", "compression_mode"), &_File::open_compressed, DEFVAL(0)); @@ -1699,7 +1545,6 @@ Error _Directory::open(const String &p_path) { } Error _Directory::list_dir_begin(bool p_skip_navigational, bool p_skip_hidden) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); _list_skip_navigational = p_skip_navigational; @@ -1709,35 +1554,29 @@ Error _Directory::list_dir_begin(bool p_skip_navigational, bool p_skip_hidden) { } String _Directory::get_next() { - ERR_FAIL_COND_V_MSG(!d, "", "Directory must be opened before use."); String next = d->get_next(); while (next != "" && ((_list_skip_navigational && (next == "." || next == "..")) || (_list_skip_hidden && d->current_is_hidden()))) { - next = d->get_next(); } return next; } bool _Directory::current_is_dir() const { - ERR_FAIL_COND_V_MSG(!d, false, "Directory must be opened before use."); return d->current_is_dir(); } void _Directory::list_dir_end() { - ERR_FAIL_COND_MSG(!d, "Directory must be opened before use."); d->list_dir_end(); } int _Directory::get_drive_count() { - ERR_FAIL_COND_V_MSG(!d, 0, "Directory must be opened before use."); return d->get_drive_count(); } String _Directory::get_drive(int p_drive) { - ERR_FAIL_COND_V_MSG(!d, "", "Directory must be opened before use."); return d->get_drive(p_drive); } @@ -1747,17 +1586,14 @@ int _Directory::get_current_drive() { } Error _Directory::change_dir(String p_dir) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); return d->change_dir(p_dir); } String _Directory::get_current_dir() { - ERR_FAIL_COND_V_MSG(!d, "", "Directory must be opened before use."); return d->get_current_dir(); } Error _Directory::make_dir(String p_dir) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); if (!p_dir.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_dir); @@ -1768,7 +1604,6 @@ Error _Directory::make_dir(String p_dir) { return d->make_dir(p_dir); } Error _Directory::make_dir_recursive(String p_dir) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); if (!p_dir.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_dir); @@ -1780,7 +1615,6 @@ Error _Directory::make_dir_recursive(String p_dir) { } bool _Directory::file_exists(String p_file) { - ERR_FAIL_COND_V_MSG(!d, false, "Directory must be opened before use."); if (!p_file.is_rel_path()) { @@ -1793,7 +1627,6 @@ bool _Directory::file_exists(String p_file) { bool _Directory::dir_exists(String p_dir) { ERR_FAIL_COND_V_MSG(!d, false, "Directory must be opened before use."); if (!p_dir.is_rel_path()) { - DirAccess *d = DirAccess::create_for_path(p_dir); bool exists = d->dir_exists(p_dir); memdelete(d); @@ -1805,18 +1638,15 @@ bool _Directory::dir_exists(String p_dir) { } int _Directory::get_space_left() { - ERR_FAIL_COND_V_MSG(!d, 0, "Directory must be opened before use."); return d->get_space_left() / 1024 * 1024; //return value in megabytes, given binding is int } Error _Directory::copy(String p_from, String p_to) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); return d->copy(p_from, p_to); } Error _Directory::rename(String p_from, String p_to) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); if (!p_from.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_from); @@ -1828,7 +1658,6 @@ Error _Directory::rename(String p_from, String p_to) { return d->rename(p_from, p_to); } Error _Directory::remove(String p_name) { - ERR_FAIL_COND_V_MSG(!d, ERR_UNCONFIGURED, "Directory must be opened before use."); if (!p_name.is_rel_path()) { DirAccess *d = DirAccess::create_for_path(p_name); @@ -1841,7 +1670,6 @@ Error _Directory::remove(String p_name) { } void _Directory::_bind_methods() { - ClassDB::bind_method(D_METHOD("open", "path"), &_Directory::open); ClassDB::bind_method(D_METHOD("list_dir_begin", "skip_navigational", "skip_hidden"), &_Directory::list_dir_begin, DEFVAL(false), DEFVAL(false)); ClassDB::bind_method(D_METHOD("get_next"), &_Directory::get_next); @@ -1881,7 +1709,6 @@ _Marshalls *_Marshalls::get_singleton() { } String _Marshalls::variant_to_base64(const Variant &p_var, bool p_full_objects) { - int len; Error err = encode_variant(p_var, nullptr, len, p_full_objects); ERR_FAIL_COND_V_MSG(err != OK, "", "Error when trying to encode Variant."); @@ -1900,7 +1727,6 @@ String _Marshalls::variant_to_base64(const Variant &p_var, bool p_full_objects) }; Variant _Marshalls::base64_to_variant(const String &p_str, bool p_allow_objects) { - int strlen = p_str.length(); CharString cstr = p_str.ascii(); @@ -1919,14 +1745,12 @@ Variant _Marshalls::base64_to_variant(const String &p_str, bool p_allow_objects) }; String _Marshalls::raw_to_base64(const Vector &p_arr) { - String ret = CryptoCore::b64_encode_str(p_arr.ptr(), p_arr.size()); ERR_FAIL_COND_V(ret == "", ret); return ret; }; Vector _Marshalls::base64_to_raw(const String &p_str) { - int strlen = p_str.length(); CharString cstr = p_str.ascii(); @@ -1944,7 +1768,6 @@ Vector _Marshalls::base64_to_raw(const String &p_str) { }; String _Marshalls::utf8_to_base64(const String &p_str) { - CharString cstr = p_str.utf8(); String ret = CryptoCore::b64_encode_str((unsigned char *)cstr.get_data(), cstr.length()); ERR_FAIL_COND_V(ret == "", ret); @@ -1952,7 +1775,6 @@ String _Marshalls::utf8_to_base64(const String &p_str) { }; String _Marshalls::base64_to_utf8(const String &p_str) { - int strlen = p_str.length(); CharString cstr = p_str.ascii(); @@ -1970,7 +1792,6 @@ String _Marshalls::base64_to_utf8(const String &p_str) { }; void _Marshalls::_bind_methods() { - ClassDB::bind_method(D_METHOD("variant_to_base64", "variant", "full_objects"), &_Marshalls::variant_to_base64, DEFVAL(false)); ClassDB::bind_method(D_METHOD("base64_to_variant", "base64_str", "allow_objects"), &_Marshalls::base64_to_variant, DEFVAL(false)); @@ -1984,22 +1805,18 @@ void _Marshalls::_bind_methods() { ////// _Semaphore ////// void _Semaphore::wait() { - semaphore.wait(); } Error _Semaphore::try_wait() { - return semaphore.try_wait() ? OK : ERR_BUSY; } void _Semaphore::post() { - semaphore.post(); } void _Semaphore::_bind_methods() { - ClassDB::bind_method(D_METHOD("wait"), &_Semaphore::wait); ClassDB::bind_method(D_METHOD("try_wait"), &_Semaphore::try_wait); ClassDB::bind_method(D_METHOD("post"), &_Semaphore::post); @@ -2008,22 +1825,18 @@ void _Semaphore::_bind_methods() { ////// _Mutex ////// void _Mutex::lock() { - mutex.lock(); } Error _Mutex::try_lock() { - return mutex.try_lock(); } void _Mutex::unlock() { - mutex.unlock(); } void _Mutex::_bind_methods() { - ClassDB::bind_method(D_METHOD("lock"), &_Mutex::lock); ClassDB::bind_method(D_METHOD("try_lock"), &_Mutex::try_lock); ClassDB::bind_method(D_METHOD("unlock"), &_Mutex::unlock); @@ -2032,7 +1845,6 @@ void _Mutex::_bind_methods() { ////// _Thread ////// void _Thread::_start_func(void *ud) { - Ref<_Thread> *tud = (Ref<_Thread> *)ud; Ref<_Thread> t = *tud; memdelete(tud); @@ -2043,23 +1855,18 @@ void _Thread::_start_func(void *ud) { t->ret = t->target_instance->call(t->target_method, arg, 1, ce); if (ce.error != Callable::CallError::CALL_OK) { - String reason; switch (ce.error) { case Callable::CallError::CALL_ERROR_INVALID_ARGUMENT: { - reason = "Invalid Argument #" + itos(ce.argument); } break; case Callable::CallError::CALL_ERROR_TOO_MANY_ARGUMENTS: { - reason = "Too Many Arguments"; } break; case Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS: { - reason = "Too Few Arguments"; } break; case Callable::CallError::CALL_ERROR_INVALID_METHOD: { - reason = "Method Not Found"; } break; default: { @@ -2071,7 +1878,6 @@ void _Thread::_start_func(void *ud) { } Error _Thread::start(Object *p_instance, const StringName &p_method, const Variant &p_userdata, Priority p_priority) { - ERR_FAIL_COND_V_MSG(active, ERR_ALREADY_IN_USE, "Thread already started."); ERR_FAIL_COND_V(!p_instance, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_method == StringName(), ERR_INVALID_PARAMETER); @@ -2100,7 +1906,6 @@ Error _Thread::start(Object *p_instance, const StringName &p_method, const Varia } String _Thread::get_id() const { - if (!thread) return String(); @@ -2108,11 +1913,9 @@ String _Thread::get_id() const { } bool _Thread::is_active() const { - return active; } Variant _Thread::wait_to_finish() { - ERR_FAIL_COND_V_MSG(!thread, Variant(), "Thread must exist to wait for its completion."); ERR_FAIL_COND_V_MSG(!active, Variant(), "Thread must be active to wait for its completion."); Thread::wait_to_finish(thread); @@ -2129,7 +1932,6 @@ Variant _Thread::wait_to_finish() { } void _Thread::_bind_methods() { - ClassDB::bind_method(D_METHOD("start", "instance", "method", "userdata", "priority"), &_Thread::start, DEFVAL(Variant()), DEFVAL(PRIORITY_NORMAL)); ClassDB::bind_method(D_METHOD("get_id"), &_Thread::get_id); ClassDB::bind_method(D_METHOD("is_active"), &_Thread::is_active); @@ -2147,7 +1949,6 @@ _Thread::~_Thread() { ////// _ClassDB ////// PackedStringArray _ClassDB::get_class_list() const { - List classes; ClassDB::get_class_list(&classes); @@ -2161,7 +1962,6 @@ PackedStringArray _ClassDB::get_class_list() const { return ret; } PackedStringArray _ClassDB::get_inheriters_from_class(const StringName &p_class) const { - List classes; ClassDB::get_inheriters_from_class(p_class, &classes); @@ -2175,23 +1975,18 @@ PackedStringArray _ClassDB::get_inheriters_from_class(const StringName &p_class) return ret; } StringName _ClassDB::get_parent_class(const StringName &p_class) const { - return ClassDB::get_parent_class(p_class); } bool _ClassDB::class_exists(const StringName &p_class) const { - return ClassDB::class_exists(p_class); } bool _ClassDB::is_parent_class(const StringName &p_class, const StringName &p_inherits) const { - return ClassDB::is_parent_class(p_class, p_inherits); } bool _ClassDB::can_instance(const StringName &p_class) const { - return ClassDB::can_instance(p_class); } Variant _ClassDB::instance(const StringName &p_class) const { - Object *obj = ClassDB::instance(p_class); if (!obj) return Variant(); @@ -2205,11 +2000,9 @@ Variant _ClassDB::instance(const StringName &p_class) const { } bool _ClassDB::has_signal(StringName p_class, StringName p_signal) const { - return ClassDB::has_signal(p_class, p_signal); } Dictionary _ClassDB::get_signal(StringName p_class, StringName p_signal) const { - MethodInfo signal; if (ClassDB::get_signal(p_class, p_signal, &signal)) { return signal.operator Dictionary(); @@ -2218,7 +2011,6 @@ Dictionary _ClassDB::get_signal(StringName p_class, StringName p_signal) const { } } Array _ClassDB::get_signal_list(StringName p_class, bool p_no_inheritance) const { - List signals; ClassDB::get_signal_list(p_class, &signals, p_no_inheritance); Array ret; @@ -2231,7 +2023,6 @@ Array _ClassDB::get_signal_list(StringName p_class, bool p_no_inheritance) const } Array _ClassDB::get_property_list(StringName p_class, bool p_no_inheritance) const { - List plist; ClassDB::get_property_list(p_class, &plist, p_no_inheritance); Array ret; @@ -2260,12 +2051,10 @@ Error _ClassDB::set_property(Object *p_object, const StringName &p_property, con } bool _ClassDB::has_method(StringName p_class, StringName p_method, bool p_no_inheritance) const { - return ClassDB::has_method(p_class, p_method, p_no_inheritance); } Array _ClassDB::get_method_list(StringName p_class, bool p_no_inheritance) const { - List methods; ClassDB::get_method_list(p_class, &methods, p_no_inheritance); Array ret; @@ -2284,7 +2073,6 @@ Array _ClassDB::get_method_list(StringName p_class, bool p_no_inheritance) const } PackedStringArray _ClassDB::get_integer_constant_list(const StringName &p_class, bool p_no_inheritance) const { - List constants; ClassDB::get_integer_constant_list(p_class, &constants, p_no_inheritance); @@ -2299,31 +2087,26 @@ PackedStringArray _ClassDB::get_integer_constant_list(const StringName &p_class, } bool _ClassDB::has_integer_constant(const StringName &p_class, const StringName &p_name) const { - bool success; ClassDB::get_integer_constant(p_class, p_name, &success); return success; } int _ClassDB::get_integer_constant(const StringName &p_class, const StringName &p_name) const { - bool found; int c = ClassDB::get_integer_constant(p_class, p_name, &found); ERR_FAIL_COND_V(!found, 0); return c; } StringName _ClassDB::get_category(const StringName &p_node) const { - return ClassDB::get_category(p_node); } bool _ClassDB::is_class_enabled(StringName p_class) const { - return ClassDB::is_class_enabled(p_class); } void _ClassDB::_bind_methods() { - ClassDB::bind_method(D_METHOD("get_class_list"), &_ClassDB::get_class_list); ClassDB::bind_method(D_METHOD("get_inheriters_from_class", "class"), &_ClassDB::get_inheriters_from_class); ClassDB::bind_method(D_METHOD("get_parent_class", "class"), &_ClassDB::get_parent_class); @@ -2356,11 +2139,9 @@ void _ClassDB::_bind_methods() { ////// _Engine ////// void _Engine::set_iterations_per_second(int p_ips) { - Engine::get_singleton()->set_iterations_per_second(p_ips); } int _Engine::get_iterations_per_second() const { - return Engine::get_singleton()->get_iterations_per_second(); } @@ -2385,17 +2166,14 @@ int _Engine::get_target_fps() const { } float _Engine::get_frames_per_second() const { - return Engine::get_singleton()->get_frames_per_second(); } uint64_t _Engine::get_physics_frames() const { - return Engine::get_singleton()->get_physics_frames(); } uint64_t _Engine::get_idle_frames() const { - return Engine::get_singleton()->get_idle_frames(); } @@ -2404,23 +2182,19 @@ void _Engine::set_time_scale(float p_scale) { } float _Engine::get_time_scale() { - return Engine::get_singleton()->get_time_scale(); } int _Engine::get_frames_drawn() { - return Engine::get_singleton()->get_frames_drawn(); } MainLoop *_Engine::get_main_loop() const { - //needs to remain in OS, since it's actually OS that interacts with it, but it's better exposed here return OS::get_singleton()->get_main_loop(); } Dictionary _Engine::get_version_info() const { - return Engine::get_singleton()->get_version_info(); } @@ -2449,27 +2223,22 @@ bool _Engine::is_in_physics_frame() const { } bool _Engine::has_singleton(const String &p_name) const { - return Engine::get_singleton()->has_singleton(p_name); } Object *_Engine::get_singleton_object(const String &p_name) const { - return Engine::get_singleton()->get_singleton_object(p_name); } void _Engine::set_editor_hint(bool p_enabled) { - Engine::get_singleton()->set_editor_hint(p_enabled); } bool _Engine::is_editor_hint() const { - return Engine::get_singleton()->is_editor_hint(); } void _Engine::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_iterations_per_second", "iterations_per_second"), &_Engine::set_iterations_per_second); ClassDB::bind_method(D_METHOD("get_iterations_per_second"), &_Engine::get_iterations_per_second); ClassDB::bind_method(D_METHOD("set_physics_jitter_fix", "physics_jitter_fix"), &_Engine::set_physics_jitter_fix); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 44e573ccbe..32ddcf2c74 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -254,7 +254,6 @@ VARIANT_ENUM_CAST(_OS::Month); VARIANT_ENUM_CAST(_OS::SystemDir); class _Geometry : public Object { - GDCLASS(_Geometry, Object); static _Geometry *singleton; @@ -437,7 +436,6 @@ VARIANT_ENUM_CAST(_File::ModeFlags); VARIANT_ENUM_CAST(_File::CompressionMode); class _Directory : public Reference { - GDCLASS(_Directory, Reference); DirAccess *d; @@ -481,7 +479,6 @@ private: }; class _Marshalls : public Object { - GDCLASS(_Marshalls, Object); static _Marshalls *singleton; @@ -506,7 +503,6 @@ public: }; class _Mutex : public Reference { - GDCLASS(_Mutex, Reference); Mutex mutex; @@ -519,7 +515,6 @@ public: }; class _Semaphore : public Reference { - GDCLASS(_Semaphore, Reference); Semaphore semaphore; @@ -532,7 +527,6 @@ public: }; class _Thread : public Reference { - GDCLASS(_Thread, Reference); protected: @@ -566,7 +560,6 @@ public: VARIANT_ENUM_CAST(_Thread::Priority); class _ClassDB : public Object { - GDCLASS(_ClassDB, Object); protected: diff --git a/core/callable.cpp b/core/callable.cpp index 447cf78bea..dc2d034cc6 100644 --- a/core/callable.cpp +++ b/core/callable.cpp @@ -40,7 +40,6 @@ void Callable::call_deferred(const Variant **p_arguments, int p_argcount) const } void Callable::call(const Variant **p_arguments, int p_argcount, Variant &r_return_value, CallError &r_call_error) const { - if (is_null()) { r_call_error.error = CallError::CALL_ERROR_INSTANCE_IS_NULL; r_call_error.argument = 0; @@ -179,7 +178,6 @@ void Callable::operator=(const Callable &p_callable) { } Callable::operator String() const { - if (is_custom()) { return custom->get_as_text(); } else { @@ -192,7 +190,6 @@ Callable::operator String() const { String class_name = base->get_class(); Ref