From 9f2996c770a6e50293e39221ec15d442e55b4c2e Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 14 Nov 2022 17:31:45 +0100 Subject: [PATCH] Reorganized the paint module. --- modules/paint/SCsub | 33 +++++++++---------- modules/paint/actions/brighten_action.cpp | 4 +-- modules/paint/actions/brush_action.cpp | 4 +-- modules/paint/actions/bucket_action.cpp | 4 +-- modules/paint/actions/cut_action.cpp | 4 +-- modules/paint/actions/darken_action.cpp | 4 +-- modules/paint/actions/line_action.cpp | 4 +-- modules/paint/actions/multiline_action.cpp | 4 +-- modules/paint/actions/paint_action.cpp | 4 +-- modules/paint/actions/paste_cut_action.cpp | 4 +-- modules/paint/actions/pencil_action.cpp | 4 +-- modules/paint/actions/rainbow_action.cpp | 4 +-- modules/paint/actions/rect_action.cpp | 4 +-- .../dialogs/paint_canvas_dialog.cpp | 0 .../dialogs/paint_canvas_dialog.h | 0 .../dialogs/paint_change_grid_size_dialog.cpp | 0 .../dialogs/paint_change_grid_size_dialog.h | 0 .../dialogs/paint_load_file_dialog.cpp | 2 +- .../dialogs/paint_load_file_dialog.h | 0 .../dialogs/paint_save_file_dialog.cpp | 0 .../dialogs/paint_save_file_dialog.h | 0 .../paint/{ => deprecated}/paint_canvas.cpp | 10 +++--- modules/paint/{ => deprecated}/paint_canvas.h | 0 .../{ => deprecated}/paint_canvas_layer.cpp | 2 +- .../{ => deprecated}/paint_canvas_layer.h | 0 .../{ => deprecated}/paint_layer_button.cpp | 2 +- .../{ => deprecated}/paint_layer_button.h | 0 .../paint/{ => deprecated}/paint_navbar.cpp | 0 modules/paint/{ => deprecated}/paint_navbar.h | 0 .../paint/{ => deprecated}/paint_settings.cpp | 2 +- .../paint/{ => deprecated}/paint_settings.h | 0 .../paint/{ => deprecated}/paint_window.cpp | 30 ++++++++--------- modules/paint/{ => deprecated}/paint_window.h | 2 +- modules/paint/paint_editor_plugin.cpp | 2 +- modules/paint/register_types.cpp | 2 +- .../{ => ui}/paint_canvas_background.cpp | 2 +- .../paint/{ => ui}/paint_canvas_background.h | 0 .../paint/{ => ui}/paint_canvas_outline.cpp | 0 modules/paint/{ => ui}/paint_canvas_outline.h | 0 modules/paint/{ => ui}/paint_color_grid.cpp | 0 modules/paint/{ => ui}/paint_color_grid.h | 0 .../paint/{ => ui}/paint_selection_box.cpp | 0 modules/paint/{ => ui}/paint_selection_box.h | 0 modules/paint/{ => ui}/paint_visual_grid.cpp | 0 modules/paint/{ => ui}/paint_visual_grid.h | 0 45 files changed, 68 insertions(+), 69 deletions(-) rename modules/paint/{ => deprecated}/dialogs/paint_canvas_dialog.cpp (100%) rename modules/paint/{ => deprecated}/dialogs/paint_canvas_dialog.h (100%) rename modules/paint/{ => deprecated}/dialogs/paint_change_grid_size_dialog.cpp (100%) rename modules/paint/{ => deprecated}/dialogs/paint_change_grid_size_dialog.h (100%) rename modules/paint/{ => deprecated}/dialogs/paint_load_file_dialog.cpp (99%) rename modules/paint/{ => deprecated}/dialogs/paint_load_file_dialog.h (100%) rename modules/paint/{ => deprecated}/dialogs/paint_save_file_dialog.cpp (100%) rename modules/paint/{ => deprecated}/dialogs/paint_save_file_dialog.h (100%) rename modules/paint/{ => deprecated}/paint_canvas.cpp (98%) rename modules/paint/{ => deprecated}/paint_canvas.h (100%) rename modules/paint/{ => deprecated}/paint_canvas_layer.cpp (99%) rename modules/paint/{ => deprecated}/paint_canvas_layer.h (100%) rename modules/paint/{ => deprecated}/paint_layer_button.cpp (99%) rename modules/paint/{ => deprecated}/paint_layer_button.h (100%) rename modules/paint/{ => deprecated}/paint_navbar.cpp (100%) rename modules/paint/{ => deprecated}/paint_navbar.h (100%) rename modules/paint/{ => deprecated}/paint_settings.cpp (98%) rename modules/paint/{ => deprecated}/paint_settings.h (100%) rename modules/paint/{ => deprecated}/paint_window.cpp (99%) rename modules/paint/{ => deprecated}/paint_window.h (99%) rename modules/paint/{ => ui}/paint_canvas_background.cpp (98%) rename modules/paint/{ => ui}/paint_canvas_background.h (100%) rename modules/paint/{ => ui}/paint_canvas_outline.cpp (100%) rename modules/paint/{ => ui}/paint_canvas_outline.h (100%) rename modules/paint/{ => ui}/paint_color_grid.cpp (100%) rename modules/paint/{ => ui}/paint_color_grid.h (100%) rename modules/paint/{ => ui}/paint_selection_box.cpp (100%) rename modules/paint/{ => ui}/paint_selection_box.h (100%) rename modules/paint/{ => ui}/paint_visual_grid.cpp (100%) rename modules/paint/{ => ui}/paint_visual_grid.h (100%) diff --git a/modules/paint/SCsub b/modules/paint/SCsub index e9126ffde..47d00c064 100644 --- a/modules/paint/SCsub +++ b/modules/paint/SCsub @@ -19,27 +19,26 @@ module_env.add_source_files(env.modules_sources,"actions/pencil_action.cpp") module_env.add_source_files(env.modules_sources,"actions/rainbow_action.cpp") module_env.add_source_files(env.modules_sources,"actions/rect_action.cpp") -module_env.add_source_files(env.modules_sources,"dialogs/paint_canvas_dialog.cpp") -module_env.add_source_files(env.modules_sources,"dialogs/paint_change_grid_size_dialog.cpp") -module_env.add_source_files(env.modules_sources,"dialogs/paint_load_file_dialog.cpp") -module_env.add_source_files(env.modules_sources,"dialogs/paint_save_file_dialog.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/dialogs/paint_canvas_dialog.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/dialogs/paint_change_grid_size_dialog.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/dialogs/paint_load_file_dialog.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/dialogs/paint_save_file_dialog.cpp") -module_env.add_source_files(env.modules_sources,"bush_prefabs.cpp") -module_env.add_source_files(env.modules_sources,"paint_canvas_layer.cpp") -module_env.add_source_files(env.modules_sources,"paint_canvas.cpp") -module_env.add_source_files(env.modules_sources,"paint_canvas_outline.cpp") -module_env.add_source_files(env.modules_sources,"paint_color_grid.cpp") -module_env.add_source_files(env.modules_sources,"paint_canvas_background.cpp") +module_env.add_source_files(env.modules_sources,"ui/paint_canvas_outline.cpp") +module_env.add_source_files(env.modules_sources,"ui/paint_color_grid.cpp") +module_env.add_source_files(env.modules_sources,"ui/paint_canvas_background.cpp") +module_env.add_source_files(env.modules_sources,"ui/paint_selection_box.cpp") +module_env.add_source_files(env.modules_sources,"ui/paint_visual_grid.cpp") -module_env.add_source_files(env.modules_sources,"paint_layer_button.cpp") - -module_env.add_source_files(env.modules_sources,"paint_navbar.cpp") -module_env.add_source_files(env.modules_sources,"paint_selection_box.cpp") -module_env.add_source_files(env.modules_sources,"paint_settings.cpp") module_env.add_source_files(env.modules_sources,"paint_utilities.cpp") +module_env.add_source_files(env.modules_sources,"bush_prefabs.cpp") -module_env.add_source_files(env.modules_sources,"paint_visual_grid.cpp") -module_env.add_source_files(env.modules_sources,"paint_window.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_canvas_layer.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_canvas.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_layer_button.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_window.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_navbar.cpp") +module_env.add_source_files(env.modules_sources,"deprecated/paint_settings.cpp") if 'TOOLS_ENABLED' in env["CPPDEFINES"]: module_env.add_source_files(env.modules_sources,"paint_editor_plugin.cpp") diff --git a/modules/paint/actions/brighten_action.cpp b/modules/paint/actions/brighten_action.cpp index 45e51d86f..d1b2be548 100644 --- a/modules/paint/actions/brighten_action.cpp +++ b/modules/paint/actions/brighten_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "brighten_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" float BrightenAction::get_brighten_color() { diff --git a/modules/paint/actions/brush_action.cpp b/modules/paint/actions/brush_action.cpp index 22a27d783..2bc3662ff 100644 --- a/modules/paint/actions/brush_action.cpp +++ b/modules/paint/actions/brush_action.cpp @@ -25,8 +25,8 @@ SOFTWARE. #include "brush_action.h" #include "../bush_prefabs.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" void BrushAction::do_action(PaintCanvas *canvas, const Array &data) { diff --git a/modules/paint/actions/bucket_action.cpp b/modules/paint/actions/bucket_action.cpp index 27f728f64..020ca43b1 100644 --- a/modules/paint/actions/bucket_action.cpp +++ b/modules/paint/actions/bucket_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "bucket_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" void BucketAction::do_action(PaintCanvas *canvas, const Array &data) { diff --git a/modules/paint/actions/cut_action.cpp b/modules/paint/actions/cut_action.cpp index b3ed92b5f..a2fd5e60b 100644 --- a/modules/paint/actions/cut_action.cpp +++ b/modules/paint/actions/cut_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "cut_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" Color CutAction::get_selection_color() { diff --git a/modules/paint/actions/darken_action.cpp b/modules/paint/actions/darken_action.cpp index c341a89b7..3782c041f 100644 --- a/modules/paint/actions/darken_action.cpp +++ b/modules/paint/actions/darken_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "darken_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" float DarkenAction::get_dark_factor() { diff --git a/modules/paint/actions/line_action.cpp b/modules/paint/actions/line_action.cpp index 07191e49e..d10285576 100644 --- a/modules/paint/actions/line_action.cpp +++ b/modules/paint/actions/line_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "line_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" Vector2i LineAction::get_mouse_start_pos() { diff --git a/modules/paint/actions/multiline_action.cpp b/modules/paint/actions/multiline_action.cpp index 7841500f8..29ea430e7 100644 --- a/modules/paint/actions/multiline_action.cpp +++ b/modules/paint/actions/multiline_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "multiline_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" bool MultiLineAction::can_commit() { diff --git a/modules/paint/actions/paint_action.cpp b/modules/paint/actions/paint_action.cpp index 42a794959..c6300fcab 100644 --- a/modules/paint/actions/paint_action.cpp +++ b/modules/paint/actions/paint_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "paint_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "core/object/object.h" Dictionary PaintAction::get_action_data_undo() { diff --git a/modules/paint/actions/paste_cut_action.cpp b/modules/paint/actions/paste_cut_action.cpp index c03594b91..e5d26d44c 100644 --- a/modules/paint/actions/paste_cut_action.cpp +++ b/modules/paint/actions/paste_cut_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "paste_cut_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" //arr.append(cell_mouse_position); diff --git a/modules/paint/actions/pencil_action.cpp b/modules/paint/actions/pencil_action.cpp index f255df0f7..7f926c8cc 100644 --- a/modules/paint/actions/pencil_action.cpp +++ b/modules/paint/actions/pencil_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "pencil_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" #include "core/string/print_string.h" diff --git a/modules/paint/actions/rainbow_action.cpp b/modules/paint/actions/rainbow_action.cpp index 40a69d552..171872621 100644 --- a/modules/paint/actions/rainbow_action.cpp +++ b/modules/paint/actions/rainbow_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "rainbow_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" void RainbowAction::do_action(PaintCanvas *canvas, const Array &data) { diff --git a/modules/paint/actions/rect_action.cpp b/modules/paint/actions/rect_action.cpp index 9b6397401..49390a45f 100644 --- a/modules/paint/actions/rect_action.cpp +++ b/modules/paint/actions/rect_action.cpp @@ -24,8 +24,8 @@ SOFTWARE. #include "rect_action.h" -#include "../paint_canvas.h" -#include "../paint_canvas_layer.h" +#include "../deprecated/paint_canvas.h" +#include "../deprecated/paint_canvas_layer.h" #include "../paint_utilities.h" Vector2i RectAction::get_mouse_start_pos() { diff --git a/modules/paint/dialogs/paint_canvas_dialog.cpp b/modules/paint/deprecated/dialogs/paint_canvas_dialog.cpp similarity index 100% rename from modules/paint/dialogs/paint_canvas_dialog.cpp rename to modules/paint/deprecated/dialogs/paint_canvas_dialog.cpp diff --git a/modules/paint/dialogs/paint_canvas_dialog.h b/modules/paint/deprecated/dialogs/paint_canvas_dialog.h similarity index 100% rename from modules/paint/dialogs/paint_canvas_dialog.h rename to modules/paint/deprecated/dialogs/paint_canvas_dialog.h diff --git a/modules/paint/dialogs/paint_change_grid_size_dialog.cpp b/modules/paint/deprecated/dialogs/paint_change_grid_size_dialog.cpp similarity index 100% rename from modules/paint/dialogs/paint_change_grid_size_dialog.cpp rename to modules/paint/deprecated/dialogs/paint_change_grid_size_dialog.cpp diff --git a/modules/paint/dialogs/paint_change_grid_size_dialog.h b/modules/paint/deprecated/dialogs/paint_change_grid_size_dialog.h similarity index 100% rename from modules/paint/dialogs/paint_change_grid_size_dialog.h rename to modules/paint/deprecated/dialogs/paint_change_grid_size_dialog.h diff --git a/modules/paint/dialogs/paint_load_file_dialog.cpp b/modules/paint/deprecated/dialogs/paint_load_file_dialog.cpp similarity index 99% rename from modules/paint/dialogs/paint_load_file_dialog.cpp rename to modules/paint/deprecated/dialogs/paint_load_file_dialog.cpp index 4d050d721..130421dfb 100644 --- a/modules/paint/dialogs/paint_load_file_dialog.cpp +++ b/modules/paint/deprecated/dialogs/paint_load_file_dialog.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "../paint_canvas.h" #include "../paint_canvas_layer.h" #include "../paint_window.h" -#include "../paint_utilities.h" +#include "../../paint_utilities.h" void PaintLoadFileDialog::load_img() { Ref image; diff --git a/modules/paint/dialogs/paint_load_file_dialog.h b/modules/paint/deprecated/dialogs/paint_load_file_dialog.h similarity index 100% rename from modules/paint/dialogs/paint_load_file_dialog.h rename to modules/paint/deprecated/dialogs/paint_load_file_dialog.h diff --git a/modules/paint/dialogs/paint_save_file_dialog.cpp b/modules/paint/deprecated/dialogs/paint_save_file_dialog.cpp similarity index 100% rename from modules/paint/dialogs/paint_save_file_dialog.cpp rename to modules/paint/deprecated/dialogs/paint_save_file_dialog.cpp diff --git a/modules/paint/dialogs/paint_save_file_dialog.h b/modules/paint/deprecated/dialogs/paint_save_file_dialog.h similarity index 100% rename from modules/paint/dialogs/paint_save_file_dialog.h rename to modules/paint/deprecated/dialogs/paint_save_file_dialog.h diff --git a/modules/paint/paint_canvas.cpp b/modules/paint/deprecated/paint_canvas.cpp similarity index 98% rename from modules/paint/paint_canvas.cpp rename to modules/paint/deprecated/paint_canvas.cpp index b5ac3eae0..711435d30 100644 --- a/modules/paint/paint_canvas.cpp +++ b/modules/paint/deprecated/paint_canvas.cpp @@ -24,16 +24,16 @@ SOFTWARE. #include "paint_canvas.h" -#include "paint_canvas_background.h" -#include "paint_canvas_outline.h" -#include "paint_utilities.h" -#include "paint_visual_grid.h" +#include "../ui/paint_canvas_background.h" +#include "../ui/paint_canvas_outline.h" +#include "../paint_utilities.h" +#include "../ui/paint_visual_grid.h" #include "scene/gui/control.h" #include "scene/gui/texture_rect.h" #include "paint_canvas_layer.h" -#include "icons/paint_icons.h" +#include "../icons/paint_icons.h" static float scale = 1; diff --git a/modules/paint/paint_canvas.h b/modules/paint/deprecated/paint_canvas.h similarity index 100% rename from modules/paint/paint_canvas.h rename to modules/paint/deprecated/paint_canvas.h diff --git a/modules/paint/paint_canvas_layer.cpp b/modules/paint/deprecated/paint_canvas_layer.cpp similarity index 99% rename from modules/paint/paint_canvas_layer.cpp rename to modules/paint/deprecated/paint_canvas_layer.cpp index 9c13f8d81..e7a217b68 100644 --- a/modules/paint/paint_canvas_layer.cpp +++ b/modules/paint/deprecated/paint_canvas_layer.cpp @@ -24,7 +24,7 @@ SOFTWARE. #include "paint_canvas_layer.h" -#include "paint_utilities.h" +#include "../paint_utilities.h" #include "scene/gui/texture_rect.h" bool PaintCanvasLayer::get_visible() { diff --git a/modules/paint/paint_canvas_layer.h b/modules/paint/deprecated/paint_canvas_layer.h similarity index 100% rename from modules/paint/paint_canvas_layer.h rename to modules/paint/deprecated/paint_canvas_layer.h diff --git a/modules/paint/paint_layer_button.cpp b/modules/paint/deprecated/paint_layer_button.cpp similarity index 99% rename from modules/paint/paint_layer_button.cpp rename to modules/paint/deprecated/paint_layer_button.cpp index b12b54bba..b773d89ef 100644 --- a/modules/paint/paint_layer_button.cpp +++ b/modules/paint/deprecated/paint_layer_button.cpp @@ -34,7 +34,7 @@ SOFTWARE. #include "scene/gui/margin_container.h" #include "scene/gui/texture_button.h" -#include "icons/paint_icons.h" +#include "../icons/paint_icons.h" static float scale = 1; diff --git a/modules/paint/paint_layer_button.h b/modules/paint/deprecated/paint_layer_button.h similarity index 100% rename from modules/paint/paint_layer_button.h rename to modules/paint/deprecated/paint_layer_button.h diff --git a/modules/paint/paint_navbar.cpp b/modules/paint/deprecated/paint_navbar.cpp similarity index 100% rename from modules/paint/paint_navbar.cpp rename to modules/paint/deprecated/paint_navbar.cpp diff --git a/modules/paint/paint_navbar.h b/modules/paint/deprecated/paint_navbar.h similarity index 100% rename from modules/paint/paint_navbar.h rename to modules/paint/deprecated/paint_navbar.h diff --git a/modules/paint/paint_settings.cpp b/modules/paint/deprecated/paint_settings.cpp similarity index 98% rename from modules/paint/paint_settings.cpp rename to modules/paint/deprecated/paint_settings.cpp index 6530398b5..8737c1f81 100644 --- a/modules/paint/paint_settings.cpp +++ b/modules/paint/deprecated/paint_settings.cpp @@ -24,7 +24,7 @@ SOFTWARE. #include "paint_settings.h" -#include "paint_canvas_outline.h" +#include "../ui/paint_canvas_outline.h" #include "scene/gui/box_container.h" #include "scene/gui/check_button.h" diff --git a/modules/paint/paint_settings.h b/modules/paint/deprecated/paint_settings.h similarity index 100% rename from modules/paint/paint_settings.h rename to modules/paint/deprecated/paint_settings.h diff --git a/modules/paint/paint_window.cpp b/modules/paint/deprecated/paint_window.cpp similarity index 99% rename from modules/paint/paint_window.cpp rename to modules/paint/deprecated/paint_window.cpp index f765fbbfa..084496abe 100644 --- a/modules/paint/paint_window.cpp +++ b/modules/paint/deprecated/paint_window.cpp @@ -28,25 +28,25 @@ SOFTWARE. #include "core/io/image.h" #include "scene/resources/texture.h" -#include "actions/brighten_action.h" -#include "actions/brush_action.h" -#include "actions/bucket_action.h" -#include "actions/cut_action.h" -#include "actions/darken_action.h" -#include "actions/line_action.h" -#include "actions/multiline_action.h" -#include "actions/paste_cut_action.h" -#include "actions/pencil_action.h" -#include "actions/rainbow_action.h" -#include "actions/rect_action.h" +#include "../actions/brighten_action.h" +#include "../actions/brush_action.h" +#include "../actions/bucket_action.h" +#include "../actions/cut_action.h" +#include "../actions/darken_action.h" +#include "../actions/line_action.h" +#include "../actions/multiline_action.h" +#include "../actions/paste_cut_action.h" +#include "../actions/pencil_action.h" +#include "../actions/rainbow_action.h" +#include "../actions/rect_action.h" #include "paint_canvas.h" -#include "paint_canvas_background.h" +#include "../ui/paint_canvas_background.h" #include "paint_canvas_layer.h" -#include "paint_color_grid.h" +#include "../ui/paint_color_grid.h" #include "paint_layer_button.h" #include "paint_navbar.h" -#include "paint_utilities.h" +#include "../paint_utilities.h" #include "scene/resources/style_box.h" #include "scene/gui/button.h" @@ -67,7 +67,7 @@ SOFTWARE. #include "dialogs/paint_save_file_dialog.h" #include "paint_settings.h" -#include "icons/paint_icons.h" +#include "../icons/paint_icons.h" static float scale = 1; diff --git a/modules/paint/paint_window.h b/modules/paint/deprecated/paint_window.h similarity index 99% rename from modules/paint/paint_window.h rename to modules/paint/deprecated/paint_window.h index 016d59f5c..2ec89cc01 100644 --- a/modules/paint/paint_window.h +++ b/modules/paint/deprecated/paint_window.h @@ -27,7 +27,7 @@ SOFTWARE. #include "scene/gui/control.h" -#include "bush_prefabs.h" +#include "../bush_prefabs.h" #include "core/containers/hash_map.h" #include "core/object/reference.h" #include "core/os/keyboard.h" diff --git a/modules/paint/paint_editor_plugin.cpp b/modules/paint/paint_editor_plugin.cpp index 6d7c09ac7..0b3197418 100644 --- a/modules/paint/paint_editor_plugin.cpp +++ b/modules/paint/paint_editor_plugin.cpp @@ -22,7 +22,7 @@ SOFTWARE. #include "paint_editor_plugin.h" -#include "paint_window.h" +#include "deprecated/paint_window.h" void PaintEditorPlugin::make_visible(const bool visible) { window->set_visible(visible); diff --git a/modules/paint/register_types.cpp b/modules/paint/register_types.cpp index 4dd5c029e..f8314a12d 100644 --- a/modules/paint/register_types.cpp +++ b/modules/paint/register_types.cpp @@ -36,7 +36,7 @@ SOFTWARE. #include "actions/rainbow_action.h" #include "actions/rect_action.h" -#include "paint_window.h" +#include "deprecated/paint_window.h" #ifdef TOOLS_ENABLED #include "paint_editor_plugin.h" diff --git a/modules/paint/paint_canvas_background.cpp b/modules/paint/ui/paint_canvas_background.cpp similarity index 98% rename from modules/paint/paint_canvas_background.cpp rename to modules/paint/ui/paint_canvas_background.cpp index 52eaa111b..5d8083e6c 100644 --- a/modules/paint/paint_canvas_background.cpp +++ b/modules/paint/ui/paint_canvas_background.cpp @@ -27,7 +27,7 @@ SOFTWARE. #include "scene/resources/material.h" #include "scene/resources/shader.h" -#include "shaders/shaders.h" +#include "../shaders/shaders.h" float PaintCanvasBackground::get_pixel_size() const { return _pixel_size; diff --git a/modules/paint/paint_canvas_background.h b/modules/paint/ui/paint_canvas_background.h similarity index 100% rename from modules/paint/paint_canvas_background.h rename to modules/paint/ui/paint_canvas_background.h diff --git a/modules/paint/paint_canvas_outline.cpp b/modules/paint/ui/paint_canvas_outline.cpp similarity index 100% rename from modules/paint/paint_canvas_outline.cpp rename to modules/paint/ui/paint_canvas_outline.cpp diff --git a/modules/paint/paint_canvas_outline.h b/modules/paint/ui/paint_canvas_outline.h similarity index 100% rename from modules/paint/paint_canvas_outline.h rename to modules/paint/ui/paint_canvas_outline.h diff --git a/modules/paint/paint_color_grid.cpp b/modules/paint/ui/paint_color_grid.cpp similarity index 100% rename from modules/paint/paint_color_grid.cpp rename to modules/paint/ui/paint_color_grid.cpp diff --git a/modules/paint/paint_color_grid.h b/modules/paint/ui/paint_color_grid.h similarity index 100% rename from modules/paint/paint_color_grid.h rename to modules/paint/ui/paint_color_grid.h diff --git a/modules/paint/paint_selection_box.cpp b/modules/paint/ui/paint_selection_box.cpp similarity index 100% rename from modules/paint/paint_selection_box.cpp rename to modules/paint/ui/paint_selection_box.cpp diff --git a/modules/paint/paint_selection_box.h b/modules/paint/ui/paint_selection_box.h similarity index 100% rename from modules/paint/paint_selection_box.h rename to modules/paint/ui/paint_selection_box.h diff --git a/modules/paint/paint_visual_grid.cpp b/modules/paint/ui/paint_visual_grid.cpp similarity index 100% rename from modules/paint/paint_visual_grid.cpp rename to modules/paint/ui/paint_visual_grid.cpp diff --git a/modules/paint/paint_visual_grid.h b/modules/paint/ui/paint_visual_grid.h similarity index 100% rename from modules/paint/paint_visual_grid.h rename to modules/paint/ui/paint_visual_grid.h