diff --git a/core/image.h b/core/image.h index 86b40978f..f214c3a49 100644 --- a/core/image.h +++ b/core/image.h @@ -30,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/rect2.h" #include "core/pool_vector.h" #include "core/resource.h" diff --git a/core/color.cpp b/core/math/color.cpp similarity index 99% rename from core/color.cpp rename to core/math/color.cpp index cf03ff303..e35656536 100644 --- a/core/color.cpp +++ b/core/math/color.cpp @@ -30,7 +30,7 @@ #include "color.h" -#include "core/color_names.inc" +#include "core/math/color_names.inc" #include "core/map.h" #include "core/math/math_funcs.h" #include "core/print_string.h" diff --git a/core/color.h b/core/math/color.h similarity index 100% rename from core/color.h rename to core/math/color.h diff --git a/core/color_names.inc b/core/math/color_names.inc similarity index 100% rename from core/color_names.inc rename to core/math/color_names.inc diff --git a/core/ustring.cpp b/core/ustring.cpp index 4fa91a67a..eed0ff562 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -34,7 +34,7 @@ #include "ustring.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/crypto/crypto_core.h" #include "core/math/math_funcs.h" #include "core/os/memory.h" diff --git a/core/variant.h b/core/variant.h index 173bfc5cb..053d4e652 100644 --- a/core/variant.h +++ b/core/variant.h @@ -31,7 +31,7 @@ /*************************************************************************/ #include "core/array.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/io/ip_address.h" #include "core/math/aabb.h" diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 5c1c4d875..50e42cd04 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -30,7 +30,7 @@ #include "variant.h" -#include "core/color_names.inc" +#include "core/math/color_names.inc" #include "core/core_string_names.h" #include "core/crypto/crypto_core.h" #include "core/io/compression.h" diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp index 0e213b406..d01f7f051 100644 --- a/editor/animation_bezier_editor.cpp +++ b/editor/animation_bezier_editor.cpp @@ -34,7 +34,7 @@ #include "editor_scale.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/math/math_defs.h" diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 3cf2eb801..764e37f85 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -33,7 +33,7 @@ #include "animation_track_editor_plugins.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/engine.h" #include "core/error_macros.h" #include "core/math/basis.h" diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index c0a7bd32d..448af3da9 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -38,7 +38,7 @@ #include "scene/animation/animation_player.h" #include "servers/audio/audio_stream.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/io/resource_loader.h" #include "core/list.h" diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index d70c406f3..089e1f720 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -31,7 +31,7 @@ #include "connections_dialog.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/list.h" diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 5c17bd70e..30bed3ced 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -37,7 +37,7 @@ #include "editor_scale.h" #include "editor_settings.h" #include "scene/gui/box_container.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/map.h" #include "core/math/rect2.h" diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index c9b3817ca..a81a59354 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -37,7 +37,7 @@ #include "scene/gui/margin_container.h" #include "core/project_settings.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/math/vector2.h" diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 9c6e3568c..00f20c910 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -35,7 +35,7 @@ #include "core/license.gen.h" #include "core/version.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/os/os.h" diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index b220bafb4..47f22459d 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -37,7 +37,7 @@ #include "scene/gui/line_edit.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/list.h" #include "core/math/vector2.h" #include "core/object.h" diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index a3541da7c..67de73926 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -38,7 +38,7 @@ #include "scene/main/viewport.h" #include "scene/resources/packed_scene.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index 42d18ce59..5e764b4c8 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -31,7 +31,7 @@ #include "editor_file_dialog.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index e7085dad6..0b5a73c61 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -36,7 +36,7 @@ #include "editor/doc/doc_data.h" #include "scene/gui/rich_text_label.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/map.h" #include "core/object.h" diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h index 1cc259161..12f02f508 100644 --- a/editor/editor_help_search.h +++ b/editor/editor_help_search.h @@ -33,7 +33,7 @@ #include "core/reference.h" #include "scene/gui/dialogs.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/map.h" #include "core/object.h" #include "core/ustring.h" diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h index 1ac674559..077c8e593 100644 --- a/editor/editor_inspector.h +++ b/editor/editor_inspector.h @@ -35,7 +35,7 @@ #include "scene/gui/container.h" #include "scene/gui/control.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/list.h" #include "core/map.h" #include "core/math/rect2.h" diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 482b15ce0..15cca2f43 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -31,7 +31,7 @@ #include "editor_log.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/os/keyboard.h" #include "core/os/memory.h" diff --git a/editor/editor_network_profiler.cpp b/editor/editor_network_profiler.cpp index 4a0cf0200..5cbbf1658 100644 --- a/editor/editor_network_profiler.cpp +++ b/editor/editor_network_profiler.cpp @@ -34,7 +34,7 @@ #include "scene/gui/line_edit.h" #include "scene/main/timer.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/typedefs.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index c4339ee8a..1e200fc10 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -34,7 +34,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/engine.h" #include "core/error_macros.h" #include "core/image.h" diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index da6ceffd6..416b1846c 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -43,7 +43,7 @@ #include "scene/gui/popup_menu.h" #include "servers/visual_server.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/image.h" #include "core/io/resource_importer.h" #include "core/math/aabb.h" diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index a268f520e..640035dde 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -32,7 +32,7 @@ #include "scene/gui/box_container.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/map.h" #include "core/object.h" #include "core/pool_vector.h" diff --git a/editor/editor_properties.h b/editor/editor_properties.h index d8f11ac6e..3f4cb4e6a 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -32,7 +32,7 @@ #include "editor/editor_inspector.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" #include "core/math/vector4.h" diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp index 9d06051d6..10a8febd4 100644 --- a/editor/editor_properties_array_dict.cpp +++ b/editor/editor_properties_array_dict.cpp @@ -31,7 +31,7 @@ #include "editor_properties_array_dict.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/io/marshalls.h" #include "core/io/resource_loader.h" diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp index 0b5580367..ad5fa2c2d 100644 --- a/editor/editor_resource_picker.cpp +++ b/editor/editor_resource_picker.cpp @@ -37,7 +37,7 @@ #include "filesystem_dock.h" #include "scene/main/viewport.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 1fdada525..b01727f86 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h index d8b16b088..beab5579a 100644 --- a/editor/editor_spin_slider.h +++ b/editor/editor_spin_slider.h @@ -32,7 +32,7 @@ #include "scene/gui/range.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/object.h" #include "core/reference.h" diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index acf82b290..8f739ea48 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -39,7 +39,7 @@ #include "editor_scale.h" #include "editor_settings.h" #include "modules/modules_enabled.gen.h" // For svg. -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/image.h" #include "core/math/math_defs.h" diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index a6bfcdaf4..2bc675f07 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -46,7 +46,7 @@ #include "scene/resources/packed_scene.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index 29890daa9..416906898 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -46,7 +46,7 @@ #include "scene/gui/tree.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/math/math_defs.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 22cf16066..362a3849e 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -34,7 +34,7 @@ #include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/math/geometry.h" #include "core/math/math_defs.h" diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp index 8a347e7e6..cf4f2f583 100644 --- a/editor/plugins/animation_blend_space_1d_editor.cpp +++ b/editor/plugins/animation_blend_space_1d_editor.cpp @@ -34,7 +34,7 @@ #include "editor/editor_scale.h" #include "scene/animation/animation_blend_tree.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" #include "core/list.h" diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp index 650c220f9..45de672cc 100644 --- a/editor/plugins/animation_blend_space_2d_editor.cpp +++ b/editor/plugins/animation_blend_space_2d_editor.cpp @@ -38,7 +38,7 @@ #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/math/geometry.h" diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp index ef797cf95..f2655349d 100644 --- a/editor/plugins/animation_blend_tree_editor_plugin.cpp +++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/hash_map.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index 265705f24..6cfbe1706 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -45,7 +45,7 @@ #include "servers/visual_server.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/image.h" diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp index d6864d64d..2bcef78ee 100644 --- a/editor/plugins/animation_state_machine_editor.cpp +++ b/editor/plugins/animation_state_machine_editor.cpp @@ -36,7 +36,7 @@ #include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_player.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/math/geometry.h" diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp index a999c8a0d..1d813412f 100644 --- a/editor/plugins/audio_stream_editor_plugin.cpp +++ b/editor/plugins/audio_stream_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/math_funcs.h" #include "core/math/rect2.h" #include "core/math/vector2.h" diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 59e326e2c..b8bca1ef1 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -53,7 +53,7 @@ #include "scene/resources/packed_scene.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/engine.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index c64c4b3da..a789c424d 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -37,7 +37,7 @@ #include "spatial_editor_plugin.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/math/aabb.h" #include "core/math/basis.h" diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp index 995cb713d..78153169d 100644 --- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp +++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp @@ -34,7 +34,7 @@ #include "scene/2d/cpu_particles_2d.h" #include "scene/gui/separator.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/image.h" diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp index 063b81e3b..1a7066d7a 100644 --- a/editor/plugins/curve_editor_plugin.cpp +++ b/editor/plugins/curve_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "core/os/keyboard.h" #include "editor/editor_scale.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/image.h" #include "core/math/math_defs.h" diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index e3bc433e7..9b62851f2 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -41,7 +41,7 @@ #include "core/project_settings.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/image.h" diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index f60a34765..a893e9b91 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -39,7 +39,7 @@ #include "scene/resources/sky.h" #include "scene/resources/world.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/math/basis.h" diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index 550d74d7d..2f42708ea 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -36,7 +36,7 @@ #include "scene/resources/world.h" #include "scene/resources/mesh.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/aabb.h" #include "core/math/basis.h" #include "core/math/math_defs.h" diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index e360cd1a3..292eb8795 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -39,7 +39,7 @@ #include "spatial_editor_plugin.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/math/math_funcs.h" diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index c8899e335..4589b3f9e 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -35,7 +35,7 @@ #include "editor/editor_scale.h" #include "editor/editor_settings.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/math_defs.h" #include "core/math/math_funcs.h" #include "core/math/rect2.h" diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index 3b4913c3a..7ad875077 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "path_editor_plugin.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/basis.h" #include "core/math/geometry.h" #include "core/math/math_defs.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 658c6aad2..969db35ed 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -33,7 +33,7 @@ #include "editor/plugins/abstract_polygon_2d_editor.h" #include "core/array.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/object.h" #include "core/pool_vector.h" diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index f56a40ed8..b2da17b84 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -50,7 +50,7 @@ #include "script_text_editor.h" #include "text_editor.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/io/config_file.h" diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index 492138a6c..9e192755c 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -36,7 +36,7 @@ #include "core/reference.h" #include "core/vector.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/list.h" #include "core/map.h" #include "core/math/vector2.h" diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 1bc142c5c..c0b569368 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index f251af26b..f49998f85 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -39,7 +39,7 @@ #include "scene/3d/skeleton.h" #include "scene/gui/spin_box.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/hash_map.h" diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index b710558e8..279e758c7 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -42,7 +42,7 @@ #include "scene/resources/mesh.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/image.h" #include "core/math/geometry.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index ce48635b3..c91573f48 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -31,7 +31,7 @@ #include "sprite_frames_editor_plugin.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h index bfc90d20e..9c18500d8 100644 --- a/editor/plugins/text_editor.h +++ b/editor/plugins/text_editor.h @@ -32,7 +32,7 @@ #include "script_editor_plugin.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/list.h" #include "core/map.h" #include "core/object.h" diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index e074b8d25..c48131361 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -33,7 +33,7 @@ #include "editor/editor_scale.h" #include "scene/resources/dynamic_font.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/image.h" #include "core/math/vector2.h" #include "core/os/memory.h" diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 9a89a615f..745be0019 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -36,7 +36,7 @@ #include "editor/editor_scale.h" #include "scene/gui/panel.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/math/math_defs.h" #include "core/math/math_funcs.h" diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 3498e85c7..d06e50aed 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" #include "core/math/vector2.h" diff --git a/editor/plugins/theme_editor_preview.h b/editor/plugins/theme_editor_preview.h index 0708f28b3..fb4b34b69 100644 --- a/editor/plugins/theme_editor_preview.h +++ b/editor/plugins/theme_editor_preview.h @@ -32,7 +32,7 @@ #include "scene/gui/box_container.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/object.h" #include "core/reference.h" #include "core/ustring.h" diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 1d326b19f..184abfbde 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -31,7 +31,7 @@ #include "project_manager.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/engine.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 9008a98c0..4b244be1d 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -40,7 +40,7 @@ #include "scene/gui/tab_container.h" #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index e7a2c62b2..2dc53c545 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/error_macros.h" #include "core/io/resource_loader.h" diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 2d006a08f..26a28e3af 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -31,7 +31,7 @@ #include "property_selector.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/map.h" diff --git a/editor/rename_dialog.cpp b/editor/rename_dialog.cpp index 102be2fc8..1c24921fe 100644 --- a/editor/rename_dialog.cpp +++ b/editor/rename_dialog.cpp @@ -33,7 +33,7 @@ #include "modules/modules_enabled.gen.h" // For regex. #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/os/memory.h" #include "core/reference.h" diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index de1dafc9e..8796f7720 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -32,7 +32,7 @@ #include "core/array.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_macros.h" #include "core/hashfuncs.h" diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 11f2e128b..8a1de155c 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -31,7 +31,7 @@ #include "script_create_dialog.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_list.h" #include "core/io/resource_loader.h" #include "core/io/resource_saver.h" diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 0133f2437..25f51284f 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -31,7 +31,7 @@ #include "script_editor_debugger.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/dictionary.h" #include "core/error_list.h" #include "core/error_macros.h" diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 3586ab1b4..4f7cccd66 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -38,7 +38,7 @@ #include "editor_settings.h" #include "script_editor_debugger.h" #include "core/class_db.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/error_macros.h" #include "core/list.h" #include "core/map.h" diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index 6e17c5e97..c22fec965 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -32,7 +32,7 @@ #include "editor/plugins/spatial_editor_plugin.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/basis.h" #include "core/math/math_defs.h" #include "core/math/vector2.h" diff --git a/modules/entity_spell_system/data/items/model_visual_entry.h b/modules/entity_spell_system/data/items/model_visual_entry.h index edce6482e..25600b07a 100644 --- a/modules/entity_spell_system/data/items/model_visual_entry.h +++ b/modules/entity_spell_system/data/items/model_visual_entry.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/ustring.h" diff --git a/modules/entity_spell_system/data/species/species_model_data.h b/modules/entity_spell_system/data/species/species_model_data.h index a27daf0b0..d39c8afd5 100644 --- a/modules/entity_spell_system/data/species/species_model_data.h +++ b/modules/entity_spell_system/data/species/species_model_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/ustring.h" #include "core/vector.h" diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.h b/modules/entity_spell_system/material_cache/ess_material_cache.h index e17b50280..eb192692c 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h index 70951d0c0..5871d6fc4 100644 --- a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h +++ b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "ess_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/material_maker/algos/mm_algos.h b/modules/material_maker/algos/mm_algos.h index aa1ae3365..5698d58d0 100644 --- a/modules/material_maker/algos/mm_algos.h +++ b/modules/material_maker/algos/mm_algos.h @@ -1,7 +1,7 @@ #ifndef MM_ALGOS_H #define MM_ALGOS_H -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" #include "core/pool_vector.h" diff --git a/modules/material_maker/algos/mm_algos_bind.h b/modules/material_maker/algos/mm_algos_bind.h index 88ac53453..0bff3f4a3 100644 --- a/modules/material_maker/algos/mm_algos_bind.h +++ b/modules/material_maker/algos/mm_algos_bind.h @@ -1,7 +1,7 @@ #ifndef MM_ALGOS_BIND_H #define MM_ALGOS_BIND_H -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" #include "core/pool_vector.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h index 895864821..1969b52c0 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_cursor.h @@ -2,7 +2,7 @@ #ifndef GRADIENT_CURSOR_H #define GRADIENT_CURSOR_H -#include "core/color.h" +#include "core/math/color.h" #include "core/os/input_event.h" #include "core/variant.h" diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h index 77bc6e0b4..602a5eb15 100644 --- a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h +++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h @@ -1,7 +1,7 @@ #ifndef MM_GRADIENT_EDITOR_H #define MM_GRADIENT_EDITOR_H -#include "core/color.h" +#include "core/math/color.h" #include "core/os/input_event.h" #include "core/reference.h" #include "core/undo_redo.h" diff --git a/modules/material_maker/nodes/bases/gradient_base.h b/modules/material_maker/nodes/bases/gradient_base.h index 3bc6aa7f6..d154d0a7b 100644 --- a/modules/material_maker/nodes/bases/gradient_base.h +++ b/modules/material_maker/nodes/bases/gradient_base.h @@ -1,7 +1,7 @@ #ifndef GRADIENT_BASE_H #define GRADIENT_BASE_H -#include "core/color.h" +#include "core/math/color.h" #include "core/variant.h" #include "../mm_node.h" diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h index 292da8fbc..7f64a7047 100644 --- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h +++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h @@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/rect2.h" #include "core/pool_vector.h" #include "core/reference.h" diff --git a/modules/mesh_utils/fqms.h b/modules/mesh_utils/fqms.h index e1f35e874..b1d7227f0 100644 --- a/modules/mesh_utils/fqms.h +++ b/modules/mesh_utils/fqms.h @@ -26,7 +26,7 @@ SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/hashfuncs.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/mesh_utils/mesh_merger.h b/modules/mesh_utils/mesh_merger.h index 0df9aaf9f..485271960 100644 --- a/modules/mesh_utils/mesh_merger.h +++ b/modules/mesh_utils/mesh_merger.h @@ -24,7 +24,7 @@ SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/props/lights/prop_light.h b/modules/props/lights/prop_light.h index 1bece0c7c..632bf481d 100644 --- a/modules/props/lights/prop_light.h +++ b/modules/props/lights/prop_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/props/material_cache/prop_material_cache.h b/modules/props/material_cache/prop_material_cache.h index 2c8c0a595..d1298f39e 100644 --- a/modules/props/material_cache/prop_material_cache.h +++ b/modules/props/material_cache/prop_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/props/material_cache/prop_material_cache_pcm.h b/modules/props/material_cache/prop_material_cache_pcm.h index 0a0503303..ff08a9cbf 100644 --- a/modules/props/material_cache/prop_material_cache_pcm.h +++ b/modules/props/material_cache/prop_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "prop_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/props/prop_mesher.h b/modules/props/prop_mesher.h index 3f399aa4f..fa2c84db2 100644 --- a/modules/props/prop_mesher.h +++ b/modules/props/prop_mesher.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/pool_vector.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/props/props/prop_data_light.h b/modules/props/props/prop_data_light.h index 6b3c5ecd3..bc52d39bd 100644 --- a/modules/props/props/prop_data_light.h +++ b/modules/props/props/prop_data_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "prop_data_entry.h" diff --git a/modules/props/singleton/prop_cache.h b/modules/props/singleton/prop_cache.h index ecc9d4730..19b07043e 100644 --- a/modules/props/singleton/prop_cache.h +++ b/modules/props/singleton/prop_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/bind/core_bind.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/hash_map.h" #include "core/object.h" #include "core/reference.h" diff --git a/modules/props_2d/lights/prop_2d_light.h b/modules/props_2d/lights/prop_2d_light.h index 18bc5fda3..6d316eb8a 100644 --- a/modules/props_2d/lights/prop_2d_light.h +++ b/modules/props_2d/lights/prop_2d_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/props_2d/material_cache/prop_2d_material_cache.h b/modules/props_2d/material_cache/prop_2d_material_cache.h index 8d1b4f6a1..db4fadae5 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h index 5748df19c..d4859dcee 100644 --- a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h +++ b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "prop_2d_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/props_2d/prop_2d_mesher.h b/modules/props_2d/prop_2d_mesher.h index 93a8b9942..762f08ae5 100644 --- a/modules/props_2d/prop_2d_mesher.h +++ b/modules/props_2d/prop_2d_mesher.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/pool_vector.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/props_2d/props/prop_2d_data_light.h b/modules/props_2d/props/prop_2d_data_light.h index 219a15374..e160d853c 100644 --- a/modules/props_2d/props/prop_2d_data_light.h +++ b/modules/props_2d/props/prop_2d_data_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "prop_2d_data_entry.h" diff --git a/modules/props_2d/props/prop_2d_data_sprite.h b/modules/props_2d/props/prop_2d_data_sprite.h index 2cdc17784..11bacca7e 100644 --- a/modules/props_2d/props/prop_2d_data_sprite.h +++ b/modules/props_2d/props/prop_2d_data_sprite.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "scene/resources/texture.h" diff --git a/modules/props_2d/singleton/prop_2d_cache.h b/modules/props_2d/singleton/prop_2d_cache.h index a10f3ecde..ef2449591 100644 --- a/modules/props_2d/singleton/prop_2d_cache.h +++ b/modules/props_2d/singleton/prop_2d_cache.h @@ -23,7 +23,7 @@ SOFTWARE. */ #include "core/bind/core_bind.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/hash_map.h" #include "core/object.h" #include "core/reference.h" diff --git a/modules/terraman/data/terrain_light.h b/modules/terraman/data/terrain_light.h index 5876b4efc..61d7d4057 100644 --- a/modules/terraman/data/terrain_light.h +++ b/modules/terraman/data/terrain_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/terraman/library/terrain_material_cache.h b/modules/terraman/library/terrain_material_cache.h index facb05a8b..bf67dfef8 100644 --- a/modules/terraman/library/terrain_material_cache.h +++ b/modules/terraman/library/terrain_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman/library/terrain_material_cache_pcm.h b/modules/terraman/library/terrain_material_cache_pcm.h index cc70041b1..f6212f191 100644 --- a/modules/terraman/library/terrain_material_cache_pcm.h +++ b/modules/terraman/library/terrain_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "terrain_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman/library/terrain_surface.h b/modules/terraman/library/terrain_surface.h index 61efe4e27..8b2a2a159 100644 --- a/modules/terraman/library/terrain_surface.h +++ b/modules/terraman/library/terrain_surface.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman/meshers/blocky/terrain_mesher_blocky.h b/modules/terraman/meshers/blocky/terrain_mesher_blocky.h index afd045e72..a64cfb61e 100644 --- a/modules/terraman/meshers/blocky/terrain_mesher_blocky.h +++ b/modules/terraman/meshers/blocky/terrain_mesher_blocky.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/terraman/meshers/default/terrain_mesher_default.h b/modules/terraman/meshers/default/terrain_mesher_default.h index 4781ee763..076be212f 100644 --- a/modules/terraman/meshers/default/terrain_mesher_default.h +++ b/modules/terraman/meshers/default/terrain_mesher_default.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/terraman/meshers/terrain_mesher.h b/modules/terraman/meshers/terrain_mesher.h index 0f971d969..3a3e97e02 100644 --- a/modules/terraman/meshers/terrain_mesher.h +++ b/modules/terraman/meshers/terrain_mesher.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/terraman/world/terrain_environment_data.h b/modules/terraman/world/terrain_environment_data.h index 470540c51..3ed76bfc0 100644 --- a/modules/terraman/world/terrain_environment_data.h +++ b/modules/terraman/world/terrain_environment_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "../defines.h" diff --git a/modules/terraman_2d/data/terrain_2d_light.h b/modules/terraman_2d/data/terrain_2d_light.h index ec1dff919..4a3407166 100644 --- a/modules/terraman_2d/data/terrain_2d_light.h +++ b/modules/terraman_2d/data/terrain_2d_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache.h b/modules/terraman_2d/library/terrain_2d_material_cache.h index 9c397203d..2945df845 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h index 8c6500ef0..9237d2529 100644 --- a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h +++ b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "terrain_2d_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman_2d/library/terrain_2d_surface.h b/modules/terraman_2d/library/terrain_2d_surface.h index b6d4e8082..bf94096a1 100644 --- a/modules/terraman_2d/library/terrain_2d_surface.h +++ b/modules/terraman_2d/library/terrain_2d_surface.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.h b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.h index 5c54ec95a..322e225de 100644 --- a/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.h +++ b/modules/terraman_2d/meshers/default/terrain_2d_mesher_default.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.h b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.h index 92fa9bdc3..780c11e2c 100644 --- a/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.h +++ b/modules/terraman_2d/meshers/isometric/terrain_2d_mesher_isometric.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/terraman_2d/meshers/simple/terrain_2d_mesher_simple.h b/modules/terraman_2d/meshers/simple/terrain_2d_mesher_simple.h index d31829163..7866ba60f 100644 --- a/modules/terraman_2d/meshers/simple/terrain_2d_mesher_simple.h +++ b/modules/terraman_2d/meshers/simple/terrain_2d_mesher_simple.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h index d252b30f3..21d6dc36e 100644 --- a/modules/terraman_2d/meshers/terrain_2d_mesher.h +++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/terraman_2d/world/terrain_2d_environment_data.h b/modules/terraman_2d/world/terrain_2d_environment_data.h index ff1337a35..8c83f2992 100644 --- a/modules/terraman_2d/world/terrain_2d_environment_data.h +++ b/modules/terraman_2d/world/terrain_2d_environment_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "../defines.h" diff --git a/modules/text_editor/text_editor_vanilla_editor.cpp b/modules/text_editor/text_editor_vanilla_editor.cpp index 2cf5fa0be..7d5306afb 100644 --- a/modules/text_editor/text_editor_vanilla_editor.cpp +++ b/modules/text_editor/text_editor_vanilla_editor.cpp @@ -1,7 +1,7 @@ #include "text_editor_vanilla_editor.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/object.h" #include "text_editor_settings.h" diff --git a/modules/texture_packer/texture_packer.h b/modules/texture_packer/texture_packer.h index 870065b56..cad34e3df 100644 --- a/modules/texture_packer/texture_packer.h +++ b/modules/texture_packer/texture_packer.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/image.h" #include "core/reference.h" #include "core/ustring.h" diff --git a/modules/voxelman/data/voxel_light.h b/modules/voxelman/data/voxel_light.h index 01a59be9e..218d20aa4 100644 --- a/modules/voxelman/data/voxel_light.h +++ b/modules/voxelman/data/voxel_light.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/voxelman/library/voxel_material_cache.h b/modules/voxelman/library/voxel_material_cache.h index 0365c2b9e..5ed1c283b 100644 --- a/modules/voxelman/library/voxel_material_cache.h +++ b/modules/voxelman/library/voxel_material_cache.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/voxelman/library/voxel_material_cache_pcm.h b/modules/voxelman/library/voxel_material_cache_pcm.h index ab4ed3c35..ee389b569 100644 --- a/modules/voxelman/library/voxel_material_cache_pcm.h +++ b/modules/voxelman/library/voxel_material_cache_pcm.h @@ -24,7 +24,7 @@ SOFTWARE. #include "voxel_material_cache.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/voxelman/library/voxel_surface.h b/modules/voxelman/library/voxel_surface.h index 61230634a..47d4456ea 100644 --- a/modules/voxelman/library/voxel_surface.h +++ b/modules/voxelman/library/voxel_surface.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "core/vector.h" diff --git a/modules/voxelman/meshers/blocky/voxel_mesher_blocky.h b/modules/voxelman/meshers/blocky/voxel_mesher_blocky.h index 22b8bd65b..7f0ab567e 100644 --- a/modules/voxelman/meshers/blocky/voxel_mesher_blocky.h +++ b/modules/voxelman/meshers/blocky/voxel_mesher_blocky.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/voxelman/meshers/blocky/voxel_mesher_liquid_blocky.h b/modules/voxelman/meshers/blocky/voxel_mesher_liquid_blocky.h index cd199e16c..07876de84 100644 --- a/modules/voxelman/meshers/blocky/voxel_mesher_liquid_blocky.h +++ b/modules/voxelman/meshers/blocky/voxel_mesher_liquid_blocky.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.h b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.h index 3dda27ac3..cabec574d 100644 --- a/modules/voxelman/meshers/cubic/voxel_mesher_cubic.h +++ b/modules/voxelman/meshers/cubic/voxel_mesher_cubic.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/voxelman/meshers/default/voxel_mesher_default.h b/modules/voxelman/meshers/default/voxel_mesher_default.h index d4e829a6c..e7ce94808 100644 --- a/modules/voxelman/meshers/default/voxel_mesher_default.h +++ b/modules/voxelman/meshers/default/voxel_mesher_default.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "core/math/vector3.h" diff --git a/modules/voxelman/meshers/voxel_mesher.h b/modules/voxelman/meshers/voxel_mesher.h index 82766ed48..d5f6a76ab 100644 --- a/modules/voxelman/meshers/voxel_mesher.h +++ b/modules/voxelman/meshers/voxel_mesher.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/reference.h" #include "core/vector.h" diff --git a/modules/voxelman/world/environment_data.h b/modules/voxelman/world/environment_data.h index ea49b67c1..034fe3e9f 100644 --- a/modules/voxelman/world/environment_data.h +++ b/modules/voxelman/world/environment_data.h @@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include "core/color.h" +#include "core/math/color.h" #include "core/resource.h" #include "../defines.h" diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index 7e2580437..c0713c710 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -30,7 +30,7 @@ #include "line_builder.h" -#include "core/color.h" +#include "core/math/color.h" #include "core/math/vector2.h" #include "scene/resources/gradient.h"