Make DPITexture::_update_texture gets called only once each frame.

Co-authored-by: Clay John <[email protected]>

Author: WhalesState

editor/import/resource_importer_svg.cpp

@@ -73,21 +73,14 @@ void ResourceImporterSVG::get_import_options(const String &p_path, List<ImportOp
 }
 
 Error ResourceImporterSVG::import(ResourceUID::ID p_source_id, const String &p_source_file, const String &p_save_path, const HashMap<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files, Variant *r_metadata) {
-	Ref<DPITexture> dpi_tex;
-	dpi_tex.instantiate();
-
 	String source = FileAccess::get_file_as_string(p_source_file);
 	ERR_FAIL_COND_V_MSG(source.is_empty(), ERR_CANT_OPEN, vformat("Cannot open file from path \"%s\".", p_source_file));
 
 	double base_scale = p_options["base_scale"];
 	double saturation = p_options["saturation"];
 	Dictionary color_map = p_options["color_map"];
 
-	dpi_tex->set_base_scale(base_scale);
-	dpi_tex->set_saturation(saturation);
-	dpi_tex->set_color_map(color_map);
-	dpi_tex->set_source(source);
-
+	Ref<DPITexture> dpi_tex = DPITexture::create_from_string(source, base_scale, saturation, color_map);
 	ERR_FAIL_COND_V_MSG(dpi_tex->get_rid().is_null(), ERR_CANT_OPEN, vformat("Failed loading SVG, unsupported or invalid SVG data in \"%s\".", p_source_file));
 
 	int flg = 0;

scene/resources/dpi_texture.cpp

@@ -97,34 +97,35 @@ void DPITexture::set_source(const String &p_source) {
 		return;
 	}
 	source = p_source;
-	_update_texture();
+	_request_update();
 }
 
 String DPITexture::get_source() const {
 	return source;
 }
 
 void DPITexture::set_base_scale(float p_scale) {
+	p_scale = MAX(0.01, p_scale);
 	if (base_scale == p_scale) {
 		return;
 	}
-	ERR_FAIL_COND(p_scale <= 0.0);
 
 	base_scale = p_scale;
-	_update_texture();
+	_request_update();
 }
 
 float DPITexture::get_base_scale() const {
 	return base_scale;
 }
 
 void DPITexture::set_saturation(float p_saturation) {
+	p_saturation = CLAMP(p_saturation, 0.0, 1.0);
 	if (saturation == p_saturation) {
 		return;
 	}
 
 	saturation = p_saturation;
-	_update_texture();
+	_request_update();
 }
 
 float DPITexture::get_saturation() const {
@@ -140,7 +141,7 @@ void DPITexture::set_color_map(const Dictionary &p_color_map) {
 	for (const Variant *E = color_map.next(); E; E = color_map.next(E)) {
 		cmap[*E] = color_map[*E];
 	}
-	_update_texture();
+	_request_update();
 }
 
 Dictionary DPITexture::get_color_map() const {
@@ -196,12 +197,13 @@ RID DPITexture::_load_at_scale(double p_scale, bool p_set_size) const {
 	if (err != OK) {
 		return RID();
 	}
-#else
-	img = Image::create_empty(Math::round(16 * p_scale * base_scale), Math::round(16 * p_scale * base_scale), false, Image::FORMAT_RGBA8);
-#endif
 	if (saturation != 1.0) {
 		img->adjust_bcs(1.0, 1.0, saturation);
 	}
+	img->fix_alpha_edges();
+#else
+	img = Image::create_empty(Math::round(16 * p_scale * base_scale), Math::round(16 * p_scale * base_scale), false, Image::FORMAT_RGBA8);
+#endif
 
 	Size2 current_size = size;
 	if (p_set_size) {
@@ -244,6 +246,15 @@ void DPITexture::_clear() {
 void DPITexture::_update_texture() {
 	_clear();
 	emit_changed();
+	update_requested = false;
+}
+
+void DPITexture::_request_update() {
+	if (update_requested) {
+		return;
+	}
+	update_requested = true;
+	callable_mp(this, &DPITexture::_update_texture).call_deferred();
 }
 
 Ref<Image> DPITexture::get_image() const {

scene/resources/dpi_texture.h

@@ -44,6 +44,7 @@ class DPITexture : public Texture2D {
 	float saturation = 1.0;
 	Dictionary color_map;
 	Size2 size_override;
+	bool update_requested = false;
 
 	struct ScalingLevel {
 		HashSet<DPITexture *> textures;
@@ -62,6 +63,7 @@ class DPITexture : public Texture2D {
 	void _remove_scale(double p_scale);
 	RID _ensure_scale(double p_scale) const;
 	RID _load_at_scale(double p_scale, bool p_set_size) const;
+	void _request_update();
 	void _update_texture();
 	void _clear();