diff --git a/core/SCsub b/core/SCsub index b1cebfd49..f94268f56 100644 --- a/core/SCsub +++ b/core/SCsub @@ -200,6 +200,7 @@ SConscript("log/SCsub") SConscript("object/SCsub") SConscript("input/SCsub") SConscript("bind/SCsub") +SConscript("scene/SCsub") # Build it all as a library lib = env.add_library("core", env.core_sources) diff --git a/core/scene/SCsub b/core/scene/SCsub new file mode 100644 index 000000000..806cdb878 --- /dev/null +++ b/core/scene/SCsub @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +Import("env") + +env.add_source_files(env.core_sources, "resources/*.cpp") +#env.add_source_files(env.core_sources, "*.cpp") diff --git a/scene/resources/bit_map.cpp b/core/scene/resources/bit_map.cpp similarity index 100% rename from scene/resources/bit_map.cpp rename to core/scene/resources/bit_map.cpp diff --git a/scene/resources/bit_map.h b/core/scene/resources/bit_map.h similarity index 100% rename from scene/resources/bit_map.h rename to core/scene/resources/bit_map.h diff --git a/editor/editor_atlas_packer.cpp b/editor/editor_atlas_packer.cpp index 4d73dfe87..bbe341d40 100644 --- a/editor/editor_atlas_packer.cpp +++ b/editor/editor_atlas_packer.cpp @@ -33,7 +33,7 @@ #include "core/math/rect2.h" #include "core/typedefs.h" #include "core/string/ustring.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" void EditorAtlasPacker::_plot_triangle(Ref p_bitmap, Vector2i *vertices) { int width = p_bitmap->get_size().width; diff --git a/editor/editor_atlas_packer.h b/editor/editor_atlas_packer.h index c66b82925..cd476e6a0 100644 --- a/editor/editor_atlas_packer.h +++ b/editor/editor_atlas_packer.h @@ -32,7 +32,7 @@ #include "core/math/vector2.h" #include "core/containers/vector.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "core/object/reference.h" class BitMap; diff --git a/editor/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp index e0c1386c9..79788f680 100644 --- a/editor/import/resource_importer_bitmask.cpp +++ b/editor/import/resource_importer_bitmask.cpp @@ -34,7 +34,7 @@ #include "core/io/image_loader.h" #include "editor/editor_file_system.h" #include "editor/editor_node.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/resources/texture.h" #include "core/io/image.h" diff --git a/editor/plugins/bit_map_editor_plugin.h b/editor/plugins/bit_map_editor_plugin.h index e62668466..7a8eb1258 100644 --- a/editor/plugins/bit_map_editor_plugin.h +++ b/editor/plugins/bit_map_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/editor_inspector.h" #include "editor/editor_plugin.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/gui/box_container.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 32c63c2a5..123f4f0c4 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -34,7 +34,7 @@ #include "core/os/os.h" #include "editor/editor_settings.h" #include "editor/editor_scale.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/resources/font/dynamic_font.h" #include "scene/resources/material/material.h" #include "scene/resources/mesh/mesh.h" diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index 88429c889..24c817be4 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "scene/2d/mesh_instance_2d.h" #include "scene/2d/polygon_2d.h" #include "scene/gui/box_container.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "thirdparty/misc/clipper.hpp" #include "scene/resources/mesh/mesh.h" #include "core/variant/array.h" diff --git a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp index 19c981fa4..5b2624912 100644 --- a/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp +++ b/modules/material_maker/editor/widgets/image_picker_button/image_picker_button.cpp @@ -6,7 +6,7 @@ #include "core/io/resource_loader.h" #include "scene/resources/texture.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" String ImagePickerButton::get_image_path() { return image_path; diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index e0e1a300a..f04394300 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -33,7 +33,7 @@ #include "core/input/input_map.h" #include "core/input/input.h" #include "core/os/os.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/resources/shapes_2d/rectangle_shape_2d.h" #include "scene/resources/texture.h" #include "scene/main/scene_string_names.h" diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index 356c10ea5..2c1984f3f 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -31,7 +31,7 @@ #include "texture_button.h" #include "core/typedefs.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/main/scene_string_names.h" #include diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 0b91312c0..4f9662103 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -139,7 +139,7 @@ #include "scene/main/viewport.h" #include "scene/main/world.h" #include "scene/audio/audio_stream_sample.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" #include "scene/resources/shapes/box_shape.h" #include "scene/resources/shapes/capsule_shape.h" #include "scene/resources/shapes_2d/capsule_shape_2d.h" diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index c2fb8a918..a28f03d27 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -36,7 +36,7 @@ #include "core/object/method_bind_ext.gen.inc" #include "core/os/os.h" #include "scene/resources/mesh/mesh.h" -#include "scene/resources/bit_map.h" +#include "core/scene/resources/bit_map.h" Size2 Texture::get_size() const { return Size2(get_width(), get_height());