diff options
Diffstat (limited to 'main')
31 files changed, 115 insertions, 121 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index d074e05f43..2efbb3f849 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -30,9 +30,9 @@ #include "input_default.h" -#include "default_controller_mappings.h" -#include "input_map.h" -#include "os/os.h" +#include "core/input_map.h" +#include "core/os/os.h" +#include "main/default_controller_mappings.h" #include "scene/resources/texture.h" #include "servers/visual_server.h" diff --git a/main/input_default.h b/main/input_default.h index 2e3cae8520..4441ade04e 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -31,7 +31,7 @@ #ifndef INPUT_DEFAULT_H #define INPUT_DEFAULT_H -#include "os/input.h" +#include "core/os/input.h" class InputDefault : public Input { diff --git a/main/main.cpp b/main/main.cpp index 96d00be737..34aca032da 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -30,37 +30,44 @@ #include "main.h" -#include "app_icon.gen.h" +#include "core/input_map.h" +#include "core/io/file_access_network.h" +#include "core/io/file_access_pack.h" +#include "core/io/file_access_zip.h" +#include "core/io/ip.h" +#include "core/io/resource_loader.h" +#include "core/io/stream_peer_ssl.h" +#include "core/io/stream_peer_tcp.h" +#include "core/message_queue.h" +#include "core/os/dir_access.h" +#include "core/os/os.h" +#include "core/project_settings.h" #include "core/register_core_types.h" +#include "core/script_debugger_local.h" +#include "core/script_debugger_remote.h" +#include "core/script_language.h" +#include "core/translation.h" +#include "core/version.h" +#include "core/version_hash.gen.h" #include "drivers/register_driver_types.h" -#include "message_queue.h" +#include "main/app_icon.gen.h" +#include "main/input_default.h" +#include "main/performance.h" +#include "main/splash.gen.h" +#include "main/splash_editor.gen.h" +#include "main/tests/test_main.h" +#include "main/timer_sync.h" #include "modules/register_module_types.h" -#include "os/os.h" #include "platform/register_platform_apis.h" -#include "project_settings.h" -#include "scene/register_scene_types.h" -#include "script_debugger_local.h" -#include "script_debugger_remote.h" -#include "servers/register_server_types.h" -#include "splash.gen.h" -#include "splash_editor.gen.h" - -#include "input_map.h" -#include "io/resource_loader.h" #include "scene/main/scene_tree.h" +#include "scene/main/viewport.h" +#include "scene/register_scene_types.h" +#include "scene/resources/packed_scene.h" #include "servers/arvr_server.h" #include "servers/audio_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" - -#include "io/resource_loader.h" -#include "script_language.h" - -#include "core/io/ip.h" -#include "main/tests/test_main.h" -#include "os/dir_access.h" -#include "scene/main/viewport.h" -#include "scene/resources/packed_scene.h" +#include "servers/register_server_types.h" #ifdef TOOLS_ENABLED #include "editor/doc/doc_data.h" @@ -69,21 +76,6 @@ #include "editor/project_manager.h" #endif -#include "io/file_access_network.h" -#include "servers/physics_2d_server.h" - -#include "core/io/file_access_pack.h" -#include "core/io/file_access_zip.h" -#include "core/io/stream_peer_ssl.h" -#include "core/io/stream_peer_tcp.h" -#include "main/input_default.h" -#include "performance.h" -#include "translation.h" -#include "version.h" -#include "version_hash.gen.h" - -#include "main/timer_sync.h" - static ProjectSettings *globals = NULL; static Engine *engine = NULL; static InputMap *input_map = NULL; diff --git a/main/main.h b/main/main.h index c20592bf3b..bd56e21d94 100644 --- a/main/main.h +++ b/main/main.h @@ -35,9 +35,9 @@ @author Juan Linietsky <reduzio@gmail.com> */ +#include "core/error_list.h" #include "core/os/thread.h" -#include "error_list.h" -#include "typedefs.h" +#include "core/typedefs.h" class Main { diff --git a/main/main_builders.py b/main/main_builders.py index 6d45768493..038a7d17f5 100644 --- a/main/main_builders.py +++ b/main/main_builders.py @@ -69,8 +69,8 @@ def make_default_controller_mappings(target, source, env): g = open(dst, "w") g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") - g.write("#include \"default_controller_mappings.h\"\n") - g.write("#include \"typedefs.h\"\n") + g.write("#include \"core/typedefs.h\"\n") + g.write("#include \"main/default_controller_mappings.h\"\n") # ensure mappings have a consistent order platform_mappings = OrderedDict() diff --git a/main/performance.cpp b/main/performance.cpp index 70e0a5f7aa..aab3a8646f 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -29,13 +29,15 @@ /*************************************************************************/ #include "performance.h" -#include "message_queue.h" -#include "os/os.h" + +#include "core/message_queue.h" +#include "core/os/os.h" #include "scene/main/scene_tree.h" #include "servers/audio_server.h" #include "servers/physics_2d_server.h" #include "servers/physics_server.h" #include "servers/visual_server.h" + Performance *Performance::singleton = NULL; void Performance::_bind_methods() { diff --git a/main/performance.h b/main/performance.h index de00df5ff9..41822562c5 100644 --- a/main/performance.h +++ b/main/performance.h @@ -31,7 +31,7 @@ #ifndef PERFORMANCE_H #define PERFORMANCE_H -#include "object.h" +#include "core/object.h" #define PERF_WARN_OFFLINE_FUNCTION #define PERF_WARN_PROCESS_SYNC diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp index 0a9d03c1b7..412e809732 100644 --- a/main/tests/test_gdscript.cpp +++ b/main/tests/test_gdscript.cpp @@ -30,9 +30,9 @@ #include "test_gdscript.h" -#include "os/file_access.h" -#include "os/main_loop.h" -#include "os/os.h" +#include "core/os/file_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" #ifdef GDSCRIPT_ENABLED diff --git a/main/tests/test_gdscript.h b/main/tests/test_gdscript.h index 91e0be1238..0a052c8db5 100644 --- a/main/tests/test_gdscript.h +++ b/main/tests/test_gdscript.h @@ -31,7 +31,7 @@ #ifndef TEST_GDSCRIPT_H #define TEST_GDSCRIPT_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestGDScript { diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index 305b749717..9b08ac4937 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -32,9 +32,9 @@ #include "test_gui.h" -#include "io/image_loader.h" -#include "os/os.h" -#include "print_string.h" +#include "core/io/image_loader.h" +#include "core/os/os.h" +#include "core/print_string.h" #include "scene/2d/sprite.h" #include "scene/gui/button.h" #include "scene/gui/control.h" diff --git a/main/tests/test_gui.h b/main/tests/test_gui.h index 3ed9dae522..25dfa3bc2b 100644 --- a/main/tests/test_gui.h +++ b/main/tests/test_gui.h @@ -31,7 +31,7 @@ #ifndef TEST_GUI_H #define TEST_GUI_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" /** @author Juan Linietsky <reduzio@gmail.com> diff --git a/main/tests/test_image.cpp b/main/tests/test_image.cpp index cb87458a93..979e590ab8 100644 --- a/main/tests/test_image.cpp +++ b/main/tests/test_image.cpp @@ -30,10 +30,10 @@ #include "test_image.h" -#include "io/image_loader.h" -#include "math_funcs.h" -#include "os/main_loop.h" -#include "print_string.h" +#include "core/io/image_loader.h" +#include "core/math/math_funcs.h" +#include "core/os/main_loop.h" +#include "core/print_string.h" namespace TestImage { diff --git a/main/tests/test_image.h b/main/tests/test_image.h index d45b4e4e15..381edf7ef9 100644 --- a/main/tests/test_image.h +++ b/main/tests/test_image.h @@ -35,7 +35,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestImage { diff --git a/main/tests/test_io.cpp b/main/tests/test_io.cpp index 4f98955995..c1b4b8af9b 100644 --- a/main/tests/test_io.cpp +++ b/main/tests/test_io.cpp @@ -32,16 +32,16 @@ #ifdef MINIZIP_ENABLED +#include "core/io/resource_loader.h" +#include "core/io/resource_saver.h" +#include "core/os/dir_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h" #include "core/project_settings.h" -#include "io/resource_loader.h" -#include "io/resource_saver.h" -#include "os/dir_access.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" #include "scene/resources/texture.h" -#include "io/file_access_memory.h" +#include "core/io/file_access_memory.h" namespace TestIO { diff --git a/main/tests/test_io.h b/main/tests/test_io.h index 76567829e7..ffebd05160 100644 --- a/main/tests/test_io.h +++ b/main/tests/test_io.h @@ -35,7 +35,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestIO { diff --git a/main/tests/test_main.cpp b/main/tests/test_main.cpp index cbc1107acb..cd70b95a28 100644 --- a/main/tests/test_main.cpp +++ b/main/tests/test_main.cpp @@ -28,8 +28,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "list.h" -#include "os/main_loop.h" +#include "core/list.h" +#include "core/os/main_loop.h" #ifdef DEBUG_ENABLED diff --git a/main/tests/test_main.h b/main/tests/test_main.h index d319391070..55ab4daeb8 100644 --- a/main/tests/test_main.h +++ b/main/tests/test_main.h @@ -31,8 +31,8 @@ #ifndef TEST_MAIN_H #define TEST_MAIN_H -#include "list.h" -#include "ustring.h" +#include "core/list.h" +#include "core/ustring.h" const char **tests_get_names(); MainLoop *test_main(String p_test, const List<String> &p_args); diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 1a72416d6a..a48fdbe4e3 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -30,22 +30,22 @@ #include "test_math.h" -#include "camera_matrix.h" -#include "math_funcs.h" -#include "matrix3.h" -#include "os/file_access.h" -#include "os/keyboard.h" -#include "os/os.h" -#include "print_string.h" +#include "core/math/camera_matrix.h" +#include "core/math/math_funcs.h" +#include "core/math/matrix3.h" +#include "core/math/transform.h" +#include "core/os/file_access.h" +#include "core/os/keyboard.h" +#include "core/os/os.h" +#include "core/print_string.h" +#include "core/ustring.h" +#include "core/variant.h" +#include "core/vmap.h" #include "scene/main/node.h" #include "scene/resources/texture.h" #include "servers/visual/shader_language.h" -#include "transform.h" -#include "ustring.h" -#include "variant.h" -#include "vmap.h" -#include "method_ptrcall.h" +#include "core/method_ptrcall.h" namespace TestMath { diff --git a/main/tests/test_math.h b/main/tests/test_math.h index 26a33aa164..2d0c6c461f 100644 --- a/main/tests/test_math.h +++ b/main/tests/test_math.h @@ -31,7 +31,7 @@ #ifndef TEST_MATH_H #define TEST_MATH_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestMath { diff --git a/main/tests/test_oa_hash_map.h b/main/tests/test_oa_hash_map.h index a63da537d8..677021f933 100644 --- a/main/tests/test_oa_hash_map.h +++ b/main/tests/test_oa_hash_map.h @@ -31,7 +31,7 @@ #ifndef TEST_OA_HASH_MAP_H #define TEST_OA_HASH_MAP_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestOAHashMap { diff --git a/main/tests/test_ordered_hash_map.cpp b/main/tests/test_ordered_hash_map.cpp index 668a8788ff..cad52ceedf 100644 --- a/main/tests/test_ordered_hash_map.cpp +++ b/main/tests/test_ordered_hash_map.cpp @@ -28,10 +28,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "ordered_hash_map.h" -#include "os/os.h" -#include "pair.h" -#include "vector.h" +#include "core/ordered_hash_map.h" +#include "core/os/os.h" +#include "core/pair.h" +#include "core/vector.h" namespace TestOrderedHashMap { @@ -168,4 +168,4 @@ MainLoop *test() { return NULL; } -} // namespace TestOrderedHashMap
\ No newline at end of file +} // namespace TestOrderedHashMap diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 99c8fce70e..c869b268b0 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -30,12 +30,12 @@ #include "test_physics.h" -#include "map.h" -#include "math_funcs.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" -#include "quick_hull.h" +#include "core/map.h" +#include "core/math/math_funcs.h" +#include "core/math/quick_hull.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h" #include "servers/physics_server.h" #include "servers/visual_server.h" diff --git a/main/tests/test_physics.h b/main/tests/test_physics.h index 4d62f3a0cf..c260bf9fcc 100644 --- a/main/tests/test_physics.h +++ b/main/tests/test_physics.h @@ -35,7 +35,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestPhysics { diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index 482a858650..8245ee276e 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -30,10 +30,10 @@ #include "test_physics_2d.h" -#include "map.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" +#include "core/map.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h" #include "scene/resources/texture.h" #include "servers/physics_2d_server.h" #include "servers/visual_server.h" diff --git a/main/tests/test_physics_2d.h b/main/tests/test_physics_2d.h index 1031aa7f71..52669777c0 100644 --- a/main/tests/test_physics_2d.h +++ b/main/tests/test_physics_2d.h @@ -31,7 +31,7 @@ #ifndef TEST_PHYSICS_2D_H #define TEST_PHYSICS_2D_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestPhysics2D { diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp index 9340e69bc5..ebf6d363be 100644 --- a/main/tests/test_render.cpp +++ b/main/tests/test_render.cpp @@ -30,12 +30,12 @@ #include "test_render.h" -#include "math_funcs.h" -#include "os/keyboard.h" -#include "os/main_loop.h" -#include "os/os.h" -#include "print_string.h" -#include "quick_hull.h" +#include "core/math/math_funcs.h" +#include "core/math/quick_hull.h" +#include "core/os/keyboard.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" +#include "core/print_string.h" #include "servers/visual_server.h" #define OBJECT_COUNT 50 diff --git a/main/tests/test_render.h b/main/tests/test_render.h index 9084b57067..717074021c 100644 --- a/main/tests/test_render.h +++ b/main/tests/test_render.h @@ -35,7 +35,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestRender { diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index 7103b436e1..2cd39d0208 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -30,11 +30,11 @@ #include "test_shader_lang.h" -#include "os/file_access.h" -#include "os/main_loop.h" -#include "os/os.h" +#include "core/os/file_access.h" +#include "core/os/main_loop.h" +#include "core/os/os.h" -#include "print_string.h" +#include "core/print_string.h" #include "scene/gui/control.h" #include "scene/gui/text_edit.h" #include "servers/visual/shader_language.h" diff --git a/main/tests/test_shader_lang.h b/main/tests/test_shader_lang.h index 235bf10463..e99858fdc6 100644 --- a/main/tests/test_shader_lang.h +++ b/main/tests/test_shader_lang.h @@ -31,7 +31,7 @@ #ifndef TEST_SHADER_LANG_H #define TEST_SHADER_LANG_H -#include "os/main_loop.h" +#include "core/os/main_loop.h" namespace TestShaderLang { diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index af948556c4..74157d63c9 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -28,11 +28,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "ustring.h" +#include "core/ustring.h" #include <wchar.h> -//#include "math_funcs.h" +//#include "core/math/math_funcs.h" #include "core/io/ip_address.h" -#include "os/os.h" +#include "core/os/os.h" #include <stdio.h> #include "test_string.h" diff --git a/main/tests/test_string.h b/main/tests/test_string.h index 110e115309..e293e96604 100644 --- a/main/tests/test_string.h +++ b/main/tests/test_string.h @@ -31,8 +31,8 @@ #ifndef TEST_STRING_H #define TEST_STRING_H -#include "os/main_loop.h" -#include "ustring.h" +#include "core/os/main_loop.h" +#include "core/ustring.h" namespace TestString { |