Merge pull request #111481 from Ivorforce/texture-less-includes

Remove extraneous includes from `texture.h`.

editor/scene/3d/node_3d_editor_plugin.h

@@ -37,6 +37,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/button.h"
 #include "scene/gui/spin_box.h"
+#include "scene/resources/gradient.h"
 #include "scene/resources/immediate_mesh.h"
 
 class AcceptDialog;

editor/scene/gradient_editor_plugin.h

@@ -32,6 +32,7 @@
 
 #include "editor/inspector/editor_inspector.h"
 #include "editor/plugins/editor_plugin.h"
+#include "scene/resources/gradient.h"
 
 class EditorSpinSlider;
 class ColorPicker;

editor/themes/editor_fonts.cpp

@@ -31,6 +31,7 @@
 #include "editor_fonts.h"
 
 #include "core/io/dir_access.h"
+#include "core/os/os.h"
 #include "editor/editor_string_names.h"
 #include "editor/settings/editor_settings.h"
 #include "editor/themes/builtin_fonts.gen.h"

modules/ktx/texture_loader_ktx.cpp

@@ -33,6 +33,7 @@
 #include "core/io/file_access.h"
 #include "core/io/file_access_memory.h"
 #include "scene/resources/image_texture.h"
+#include "servers/rendering/rendering_server.h"
 
 #include <ktx.h>
 #include <vk_format.h>

modules/noise/noise_texture_2d.cpp

@@ -32,6 +32,8 @@
 
 #include "noise.h"
 
+#include "servers/rendering/rendering_server.h"
+
 NoiseTexture2D::NoiseTexture2D() {
 	noise = Ref<Noise>();
 

modules/noise/noise_texture_2d.h

@@ -33,6 +33,7 @@
 #include "noise.h"
 
 #include "core/object/ref_counted.h"
+#include "scene/resources/gradient.h"
 #include "scene/resources/texture.h"
 
 class NoiseTexture2D : public Texture2D {

modules/noise/noise_texture_3d.cpp

@@ -32,6 +32,8 @@
 
 #include "noise.h"
 
+#include "servers/rendering/rendering_server.h"
+
 NoiseTexture3D::NoiseTexture3D() {
 	noise = Ref<Noise>();
 

modules/noise/noise_texture_3d.h

@@ -33,6 +33,7 @@
 #include "noise.h"
 
 #include "core/object/ref_counted.h"
+#include "scene/resources/gradient.h"
 #include "scene/resources/texture.h"
 
 class NoiseTexture3D : public Texture3D {

modules/text_server_adv/text_server_adv.cpp

@@ -53,6 +53,7 @@ using namespace godot;
 #include "core/object/worker_thread_pool.h"
 #include "core/string/translation_server.h"
 #include "scene/resources/image_texture.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 

modules/text_server_fb/text_server_fb.cpp

@@ -54,6 +54,7 @@ using namespace godot;
 #include "core/io/file_access.h"
 #include "core/string/print_string.h"
 #include "core/string/translation_server.h"
+#include "servers/rendering/rendering_server.h"
 
 #include "modules/modules_enabled.gen.h" // For freetype, msdfgen, svg.
 

scene/2d/cpu_particles_2d.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/2d/node_2d.h"
+#include "scene/resources/gradient.h"
 
 class RandomNumberGenerator;
 

scene/2d/line_2d.h

@@ -30,7 +30,8 @@
 
 #pragma once
 
-#include "node_2d.h"
+#include "scene/2d/node_2d.h"
+#include "scene/resources/gradient.h"
 
 class Line2D : public Node2D {
 	GDCLASS(Line2D, Node2D);

scene/3d/cpu_particles_3d.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/3d/visual_instance_3d.h"
+#include "scene/resources/gradient.h"
 
 class RandomNumberGenerator;
 

scene/main/canvas_item.h

@@ -32,6 +32,7 @@
 
 #include "scene/main/node.h"
 #include "scene/resources/font.h"
+#include "servers/rendering/rendering_server.h"
 
 class CanvasLayer;
 class MultiMesh;

scene/resources/animated_texture.cpp

@@ -30,6 +30,9 @@
 
 #include "animated_texture.h"
 
+#include "core/os/os.h"
+#include "servers/rendering/rendering_server.h"
+
 void AnimatedTexture::_update_proxy() {
 	RWLockRead r(rw_lock);
 

scene/resources/bone_map.cpp

@@ -30,6 +30,8 @@
 
 #include "bone_map.h"
 
+#include "core/config/engine.h"
+
 bool BoneMap::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
 	if (path.begins_with("bone_map/")) {

scene/resources/camera_texture.cpp

@@ -31,6 +31,7 @@
 #include "camera_texture.h"
 
 #include "servers/camera/camera_feed.h"
+#include "servers/rendering/rendering_server.h"
 
 void CameraTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_camera_feed_id", "feed_id"), &CameraTexture::set_camera_feed_id);

scene/resources/camera_texture.h

@@ -31,6 +31,7 @@
 #pragma once
 
 #include "scene/resources/texture.h"
+#include "servers/camera/camera_server.h"
 
 class CameraTexture : public Texture2D {
 	GDCLASS(CameraTexture, Texture2D);

scene/resources/compressed_texture.h

@@ -32,6 +32,7 @@
 
 #include "core/io/resource_loader.h"
 #include "scene/resources/texture.h"
+#include "servers/rendering/rendering_server.h"
 
 class BitMap;
 

scene/resources/curve_texture.cpp

@@ -30,6 +30,8 @@
 
 #include "curve_texture.h"
 
+#include "servers/rendering/rendering_server.h"
+
 void CurveTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_width", "width"), &CurveTexture::set_width);
 

scene/resources/external_texture.cpp

@@ -30,6 +30,8 @@
 
 #include "external_texture.h"
 
+#include "servers/rendering/rendering_server.h"
+
 void ExternalTexture::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_size", "size"), &ExternalTexture::set_size);
 	ClassDB::bind_method(D_METHOD("get_external_texture_id"), &ExternalTexture::get_external_texture_id);

scene/resources/font.cpp

@@ -39,6 +39,7 @@
 #include "scene/resources/text_paragraph.h"
 #include "scene/resources/theme.h"
 #include "scene/theme/theme_db.h"
+#include "servers/rendering/rendering_server.h"
 
 /*************************************************************************/
 /*  Font                                                                 */

scene/resources/gradient_texture.cpp

@@ -31,6 +31,7 @@
 #include "gradient_texture.h"
 
 #include "core/math/geometry_2d.h"
+#include "servers/rendering/rendering_server.h"
 
 GradientTexture1D::GradientTexture1D() {
 	_queue_update();

scene/resources/gradient_texture.h

@@ -30,6 +30,7 @@
 
 #pragma once
 
+#include "scene/resources/gradient.h"
 #include "scene/resources/texture.h"
 
 class GradientTexture1D : public Texture2D {

scene/resources/image_texture.cpp

@@ -33,6 +33,7 @@
 #include "core/io/image_loader.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/placeholder_textures.h"
+#include "servers/rendering/rendering_server.h"
 
 void ImageTexture::reload_from_file() {
 	String path = ResourceLoader::path_remap(get_path());

scene/resources/placeholder_textures.cpp

@@ -30,6 +30,8 @@
 
 #include "placeholder_textures.h"
 
+#include "servers/rendering/rendering_server.h"
+
 void PlaceholderTexture2D::set_size(Size2 p_size) {
 	size = p_size;
 	emit_changed();

scene/resources/portable_compressed_texture.cpp

@@ -33,6 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/io/marshalls.h"
 #include "scene/resources/bit_map.h"
+#include "servers/rendering/rendering_server.h"
 
 static const char *compression_mode_names[7] = {
 	"Lossless", "Lossy", "Basis Universal", "S3TC", "ETC2", "BPTC", "ASTC"

scene/resources/skeleton_profile.cpp

@@ -30,6 +30,8 @@
 
 #include "skeleton_profile.h"
 
+#include "core/config/engine.h"
+
 bool SkeletonProfile::_set(const StringName &p_path, const Variant &p_value) {
 	ERR_FAIL_COND_V(is_read_only, false);
 	String path = p_path;

scene/resources/style_box_texture.cpp

@@ -30,6 +30,8 @@
 
 #include "style_box_texture.h"
 
+#include "servers/rendering/rendering_server.h"
+
 float StyleBoxTexture::get_style_margin(Side p_side) const {
 	ERR_FAIL_INDEX_V((int)p_side, 4, 0.0);
 

scene/resources/texture.cpp

@@ -31,6 +31,7 @@
 #include "texture.h"
 
 #include "scene/resources/placeholder_textures.h"
+#include "servers/rendering/rendering_server.h"
 
 int Texture2D::get_width() const {
 	int ret = 0;

scene/resources/texture.h

@@ -30,12 +30,10 @@
 
 #pragma once
 
+#include "core/io/image.h"
 #include "core/io/resource.h"
-#include "core/math/rect2.h"
+#include "core/variant/typed_array.h"
 #include "scene/resources/curve.h"
-#include "scene/resources/gradient.h"
-#include "servers/camera/camera_server.h"
-#include "servers/rendering/rendering_server.h"
 
 class Texture : public Resource {
 	GDCLASS(Texture, Resource);

scene/resources/texture_rd.cpp

@@ -30,6 +30,8 @@
 
 #include "texture_rd.h"
 
+#include "servers/rendering/rendering_server.h"
+
 ////////////////////////////////////////////////////////////////////////////
 // Texture2DRD
 

servers/display/display_server.h

@@ -357,12 +357,12 @@ public:
 	virtual int screen_get_dpi(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
 	virtual float screen_get_scale(int p_screen = SCREEN_OF_MAIN_WINDOW) const;
 	virtual float screen_get_max_scale() const {
-		float scale = 1.f;
+		float max_scale = 1.f;
 		int screen_count = get_screen_count();
 		for (int i = 0; i < screen_count; i++) {
-			scale = std::fmax(scale, screen_get_scale(i));
+			max_scale = std::fmax(max_scale, screen_get_scale(i));
 		}
-		return scale;
+		return max_scale;
 	}
 	virtual float screen_get_refresh_rate(int p_screen = SCREEN_OF_MAIN_WINDOW) const = 0;
 	virtual Color screen_get_pixel(const Point2i &p_position) const { return Color(); }