Makes FontData importable resource.

Adds multi-channel SDF font texture generation and rendering support.
Adds per-font oversampling support.
Adds FontData import plugins (for dynamic fonts, BMFonts and monospaced image fonts), font texture cache pre-generation and loading.
Adds BMFont binary format and outline support.

1 files changed, 296 insertions, 64 deletions

diff --git a/modules/text_server_adv/text_server_adv.h b/modules/text_server_adv/text_server_adv.h
index d19ba41a1a..5989035800 100644
--- a/modules/text_server_adv/text_server_adv.h
+++ b/modules/text_server_adv/text_server_adv.h
@@ -39,6 +39,7 @@
 #include "servers/text_server.h"
 
 #include "core/templates/rid_owner.h"
+#include "core/templates/thread_work_pool.h"
 #include "scene/resources/texture.h"
 #include "script_iterator.h"
 
@@ -53,11 +54,24 @@
 #include <unicode/ustring.h>
 #include <unicode/utypes.h>
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_FREETYPE_ENABLED
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_TRUETYPE_TABLES_H
+#include FT_STROKER_H
+#include FT_ADVANCES_H
+#include FT_MULTIPLE_MASTERS_H
+#include FT_BBOX_H
+
+#include <hb-ft.h>
+#include <hb-ot.h>
+#endif
+
 #include <hb-icu.h>
 #include <hb.h>
 
-#include "font_adv.h"
-
 class TextServerAdvanced : public TextServer {
 	GDCLASS(TextServerAdvanced, TextServer);
 	_THREAD_SAFE_CLASS_
@@ -65,8 +79,149 @@ class TextServerAdvanced : public TextServer {
 	static String interface_name;
 	static uint32_t interface_features;
 
+	// ICU support data.
+
 	uint8_t *icu_data = nullptr;
 
+	// Font cache data.
+
+#ifdef MODULE_FREETYPE_ENABLED
+	mutable FT_Library library = nullptr;
+#endif
+
+	const int rect_range = 2;
+
+	struct FontTexture {
+		Image::Format format;
+		PackedByteArray imgdata;
+		int texture_w = 0;
+		int texture_h = 0;
+		PackedInt32Array offsets;
+		Ref<ImageTexture> texture;
+	};
+
+	struct FontTexturePosition {
+		int index = 0;
+		int x = 0;
+		int y = 0;
+	};
+
+	struct FontGlyph {
+		bool found = false;
+		int texture_idx = -1;
+		Rect2 rect;
+		Rect2 uv_rect;
+		Vector2 advance;
+	};
+
+	struct FontDataForSizeAdvanced {
+		real_t ascent = 0.f;
+		real_t descent = 0.f;
+		real_t underline_position = 0.f;
+		real_t underline_thickness = 0.f;
+		real_t scale = 1.f;
+		real_t oversampling = 1.f;
+
+		int spacing_glyph = 0;
+		int spacing_space = 0;
+
+		Vector2i size;
+
+		Vector<FontTexture> textures;
+		HashMap<int32_t, FontGlyph> glyph_map;
+		Map<Vector2i, Vector2> kerning_map;
+
+		hb_font_t *hb_handle = nullptr;
+
+#ifdef MODULE_FREETYPE_ENABLED
+		FT_Face face = nullptr;
+		FT_StreamRec stream;
+#endif
+
+		~FontDataForSizeAdvanced() {
+			if (hb_handle != nullptr) {
+				hb_font_destroy(hb_handle);
+			}
+#ifdef MODULE_FREETYPE_ENABLED
+			if (face != nullptr) {
+				FT_Done_Face(face);
+			}
+#endif
+		}
+	};
+
+	struct FontDataAdvanced {
+		Mutex mutex;
+
+		bool antialiased = true;
+		bool msdf = false;
+		int msdf_range = 14;
+		int msdf_source_size = 48;
+		int fixed_size = 0;
+		bool force_autohinter = false;
+		TextServer::Hinting hinting = TextServer::HINTING_LIGHT;
+		Dictionary variation_coordinates;
+		real_t oversampling = 0.f;
+
+		Map<Vector2i, FontDataForSizeAdvanced *> cache;
+
+		bool face_init = false;
+		Set<uint32_t> supported_scripts;
+		Dictionary supported_features;
+		Dictionary supported_varaitions;
+
+		// Language/script support override.
+		Map<String, bool> language_support_overrides;
+		Map<String, bool> script_support_overrides;
+
+		PackedByteArray data;
+		const uint8_t *data_ptr;
+		size_t data_size;
+		mutable ThreadWorkPool work_pool;
+
+		~FontDataAdvanced() {
+			work_pool.finish();
+			for (const Map<Vector2i, FontDataForSizeAdvanced *>::Element *E = cache.front(); E; E = E->next()) {
+				memdelete(E->get());
+			}
+			cache.clear();
+		}
+	};
+
+	_FORCE_INLINE_ FontTexturePosition find_texture_pos_for_glyph(FontDataForSizeAdvanced *p_data, int p_color_size, Image::Format p_image_format, int p_width, int p_height) const;
+#ifdef MODULE_MSDFGEN_ENABLED
+	_FORCE_INLINE_ FontGlyph rasterize_msdf(FontDataAdvanced *p_font_data, FontDataForSizeAdvanced *p_data, int p_pixel_range, int p_rect_margin, FT_Outline *outline, const Vector2 &advance) const;
+#endif
+#ifdef MODULE_FREETYPE_ENABLED
+	_FORCE_INLINE_ FontGlyph rasterize_bitmap(FontDataForSizeAdvanced *p_data, int p_rect_margin, FT_Bitmap bitmap, int yofs, int xofs, const Vector2 &advance) const;
+#endif
+	_FORCE_INLINE_ bool _ensure_glyph(FontDataAdvanced *p_font_data, const Vector2i &p_size, int32_t p_glyph) const;
+	_FORCE_INLINE_ bool _ensure_cache_for_size(FontDataAdvanced *p_font_data, const Vector2i &p_size) const;
+	_FORCE_INLINE_ void _font_clear_cache(FontDataAdvanced *p_font_data);
+	void _generateMTSDF_threaded(uint32_t y, void *p_td) const;
+
+	_FORCE_INLINE_ Vector2i _get_size(const FontDataAdvanced *p_font_data, int p_size) const {
+		if (p_font_data->msdf) {
+			return Vector2i(p_font_data->msdf_source_size, 0);
+		} else if (p_font_data->fixed_size > 0) {
+			return Vector2i(p_font_data->fixed_size, 0);
+		} else {
+			return Vector2i(p_size, 0);
+		}
+	}
+
+	_FORCE_INLINE_ Vector2i _get_size_outline(const FontDataAdvanced *p_font_data, const Vector2i &p_size) const {
+		if (p_font_data->msdf) {
+			return Vector2i(p_font_data->msdf_source_size, 0);
+		} else if (p_font_data->fixed_size > 0) {
+			return Vector2i(p_font_data->fixed_size, MIN(p_size.y, 1));
+		} else {
+			return p_size;
+		}
+	}
+
+	// Shaped text cache data.
+
 	struct ShapedTextDataAdvanced : public ShapedTextData {
 		/* Intermediate data */
 		Char16String utf16;
@@ -88,7 +243,9 @@ class TextServerAdvanced : public TextServer {
 		}
 	};
 
-	float oversampling = 1.f;
+	// Common data.
+
+	real_t oversampling = 1.f;
 	mutable RID_PtrOwner<FontDataAdvanced> font_owner;
 	mutable RID_PtrOwner<ShapedTextDataAdvanced> shaped_owner;
 
@@ -97,6 +254,30 @@ class TextServerAdvanced : public TextServer {
 	void _shape_run(ShapedTextDataAdvanced *p_sd, int32_t p_start, int32_t p_end, hb_script_t p_script, hb_direction_t p_direction, Vector<RID> p_fonts, int p_span, int p_fb_index);
 	TextServer::Glyph _shape_single_glyph(ShapedTextDataAdvanced *p_sd, char32_t p_char, hb_script_t p_script, hb_direction_t p_direction, RID p_font, int p_font_size);
 
+	// HarfBuzz bitmap font interface.
+
+	static hb_font_funcs_t *funcs;
+
+	struct hb_bmp_font_t {
+		TextServerAdvanced::FontDataForSizeAdvanced *face = nullptr;
+		bool unref = false; /* Whether to destroy bm_face when done. */
+	};
+
+	static hb_bmp_font_t *_hb_bmp_font_create(TextServerAdvanced::FontDataForSizeAdvanced *p_face, bool p_unref);
+	static void _hb_bmp_font_destroy(void *p_data);
+	static hb_bool_t hb_bmp_get_nominal_glyph(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_unicode, hb_codepoint_t *r_glyph, void *p_user_data);
+	static hb_position_t hb_bmp_get_glyph_h_advance(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_glyph, void *p_user_data);
+	static hb_position_t hb_bmp_get_glyph_v_advance(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_glyph, void *p_user_data);
+	static hb_position_t hb_bmp_get_glyph_h_kerning(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_left_glyph, hb_codepoint_t p_right_glyph, void *p_user_data);
+	static hb_position_t hb_bmp_get_glyph_v_kerning(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_left_glyph, hb_codepoint_t p_right_glyph, void *p_user_data);
+	static hb_bool_t hb_bmp_get_glyph_v_origin(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_glyph, hb_position_t *r_x, hb_position_t *r_y, void *p_user_data);
+	static hb_bool_t hb_bmp_get_glyph_extents(hb_font_t *p_font, void *p_font_data, hb_codepoint_t p_glyph, hb_glyph_extents_t *r_extents, void *p_user_data);
+	static hb_bool_t hb_bmp_get_font_h_extents(hb_font_t *p_font, void *p_font_data, hb_font_extents_t *r_metrics, void *p_user_data);
+	static void hb_bmp_create_font_funcs();
+	static void hb_bmp_free_font_funcs();
+	static void _hb_bmp_font_set_funcs(hb_font_t *p_font, TextServerAdvanced::FontDataForSizeAdvanced *p_face, bool p_unref);
+	static hb_font_t *hb_bmp_font_create(TextServerAdvanced::FontDataForSizeAdvanced *p_face, hb_destroy_func_t p_destroy);
+
 protected:
 	static void _bind_methods(){};
 
@@ -119,81 +300,132 @@ public:
 
 	virtual bool is_locale_right_to_left(const String &p_locale) override;
 
-	virtual int32_t name_to_tag(const String &p_name) override;
-	virtual String tag_to_name(int32_t p_tag) override;
+	virtual int32_t name_to_tag(const String &p_name) const override;
+	virtual String tag_to_name(int32_t p_tag) const override;
 
 	/* Font interface */
-	virtual RID create_font_system(const String &p_name, int p_base_size = 16) override;
-	virtual RID create_font_resource(const String &p_filename, int p_base_size = 16) override;
-	virtual RID create_font_memory(const uint8_t *p_data, size_t p_size, const String &p_type, int p_base_size = 16) override;
-	virtual RID create_font_bitmap(float p_height, float p_ascent, int p_base_size = 16) override;
+	virtual RID create_font() override;
+
+	virtual void font_set_data(RID p_font_rid, const PackedByteArray &p_data) override;
+	virtual void font_set_data_ptr(RID p_font_rid, const uint8_t *p_data_ptr, size_t p_data_size) override;
+
+	virtual void font_set_antialiased(RID p_font_rid, bool p_antialiased) override;
+	virtual bool font_is_antialiased(RID p_font_rid) const override;
+
+	virtual void font_set_multichannel_signed_distance_field(RID p_font_rid, bool p_msdf) override;
+	virtual bool font_is_multichannel_signed_distance_field(RID p_font_rid) const override;
+
+	virtual void font_set_msdf_pixel_range(RID p_font_rid, int p_msdf_pixel_range) override;
+	virtual int font_get_msdf_pixel_range(RID p_font_rid) const override;
+
+	virtual void font_set_msdf_size(RID p_font_rid, int p_msdf_size) override;
+	virtual int font_get_msdf_size(RID p_font_rid) const override;
+
+	virtual void font_set_fixed_size(RID p_font_rid, int p_fixed_size) override;
+	virtual int font_get_fixed_size(RID p_font_rid) const override;
+
+	virtual void font_set_force_autohinter(RID p_font_rid, bool p_force_autohinter) override;
+	virtual bool font_is_force_autohinter(RID p_font_rid) const override;
+
+	virtual void font_set_hinting(RID p_font_rid, TextServer::Hinting p_hinting) override;
+	virtual TextServer::Hinting font_get_hinting(RID p_font_rid) const override;
+
+	virtual void font_set_variation_coordinates(RID p_font_rid, const Dictionary &p_variation_coordinates) override;
+	virtual Dictionary font_get_variation_coordinates(RID p_font_rid) const override;
+
+	virtual void font_set_oversampling(RID p_font_rid, real_t p_oversampling) override;
+	virtual real_t font_get_oversampling(RID p_font_rid) const override;
+
+	virtual Array font_get_size_cache_list(RID p_font_rid) const override;
+	virtual void font_clear_size_cache(RID p_font_rid) override;
+	virtual void font_remove_size_cache(RID p_font_rid, const Vector2i &p_size) override;
+
+	hb_font_t *_font_get_hb_handle(RID p_font, int p_font_size) const;
+
+	virtual void font_set_ascent(RID p_font_rid, int p_size, real_t p_ascent) override;
+	virtual real_t font_get_ascent(RID p_font_rid, int p_size) const override;
+
+	virtual void font_set_descent(RID p_font_rid, int p_size, real_t p_descent) override;
+	virtual real_t font_get_descent(RID p_font_rid, int p_size) const override;
+
+	virtual void font_set_underline_position(RID p_font_rid, int p_size, real_t p_underline_position) override;
+	virtual real_t font_get_underline_position(RID p_font_rid, int p_size) const override;
+
+	virtual void font_set_underline_thickness(RID p_font_rid, int p_size, real_t p_underline_thickness) override;
+	virtual real_t font_get_underline_thickness(RID p_font_rid, int p_size) const override;
+
+	virtual void font_set_scale(RID p_font_rid, int p_size, real_t p_scale) override;
+	virtual real_t font_get_scale(RID p_font_rid, int p_size) const override;
+
+	virtual void font_set_spacing(RID p_font_rid, int p_size, SpacingType p_spacing, int p_value) override;
+	virtual int font_get_spacing(RID p_font_rid, int p_size, SpacingType p_spacing) const override;
 
-	virtual void font_bitmap_add_texture(RID p_font, const Ref<Texture> &p_texture) override;
-	virtual void font_bitmap_add_char(RID p_font, char32_t p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance) override;
-	virtual void font_bitmap_add_kerning_pair(RID p_font, char32_t p_A, char32_t p_B, int p_kerning) override;
+	virtual int font_get_texture_count(RID p_font_rid, const Vector2i &p_size) const override;
+	virtual void font_clear_textures(RID p_font_rid, const Vector2i &p_size) override;
+	virtual void font_remove_texture(RID p_font_rid, const Vector2i &p_size, int p_texture_index) override;
 
-	virtual float font_get_height(RID p_font, int p_size) const override;
-	virtual float font_get_ascent(RID p_font, int p_size) const override;
-	virtual float font_get_descent(RID p_font, int p_size) const override;
+	virtual void font_set_texture_image(RID p_font_rid, const Vector2i &p_size, int p_texture_index, const Ref<Image> &p_image) override;
+	virtual Ref<Image> font_get_texture_image(RID p_font_rid, const Vector2i &p_size, int p_texture_index) const override;
 
-	virtual float font_get_underline_position(RID p_font, int p_size) const override;
-	virtual float font_get_underline_thickness(RID p_font, int p_size) const override;
+	virtual void font_set_texture_offsets(RID p_font_rid, const Vector2i &p_size, int p_texture_index, const PackedInt32Array &p_offset) override;
+	virtual PackedInt32Array font_get_texture_offsets(RID p_font_rid, const Vector2i &p_size, int p_texture_index) const override;
 
-	virtual int font_get_spacing_space(RID p_font) const override;
-	virtual void font_set_spacing_space(RID p_font, int p_value) override;
+	virtual Array font_get_glyph_list(RID p_font_rid, const Vector2i &p_size) const override;
+	virtual void font_clear_glyphs(RID p_font_rid, const Vector2i &p_size) override;
+	virtual void font_remove_glyph(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) override;
 
-	virtual int font_get_spacing_glyph(RID p_font) const override;
-	virtual void font_set_spacing_glyph(RID p_font, int p_value) override;
+	virtual Vector2 font_get_glyph_advance(RID p_font_rid, int p_size, int32_t p_glyph) const override;
+	virtual void font_set_glyph_advance(RID p_font_rid, int p_size, int32_t p_glyph, const Vector2 &p_advance) override;
 
-	virtual void font_set_antialiased(RID p_font, bool p_antialiased) override;
-	virtual bool font_get_antialiased(RID p_font) const override;
+	virtual Vector2 font_get_glyph_offset(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) const override;
+	virtual void font_set_glyph_offset(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_offset) override;
 
-	virtual Dictionary font_get_feature_list(RID p_font) const override;
-	virtual Dictionary font_get_variation_list(RID p_font) const override;
+	virtual Vector2 font_get_glyph_size(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) const override;
+	virtual void font_set_glyph_size(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph, const Vector2 &p_gl_size) override;
 
-	virtual void font_set_variation(RID p_font, const String &p_name, double p_value) override;
-	virtual double font_get_variation(RID p_font, const String &p_name) const override;
+	virtual Rect2 font_get_glyph_uv_rect(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) const override;
+	virtual void font_set_glyph_uv_rect(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph, const Rect2 &p_uv_rect) override;
 
-	virtual void font_set_hinting(RID p_font, Hinting p_hinting) override;
-	virtual Hinting font_get_hinting(RID p_font) const override;
+	virtual int font_get_glyph_texture_idx(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph) const override;
+	virtual void font_set_glyph_texture_idx(RID p_font_rid, const Vector2i &p_size, int32_t p_glyph, int p_texture_idx) override;
 
-	virtual void font_set_distance_field_hint(RID p_font, bool p_distance_field) override;
-	virtual bool font_get_distance_field_hint(RID p_font) const override;
+	virtual bool font_get_glyph_contours(RID p_font, int p_size, int32_t p_index, Vector<Vector3> &r_points, Vector<int32_t> &r_contours, bool &r_orientation) const override;
 
-	virtual void font_set_force_autohinter(RID p_font, bool p_enabeld) override;
-	virtual bool font_get_force_autohinter(RID p_font) const override;
+	virtual Array font_get_kerning_list(RID p_font_rid, int p_size) const override;
+	virtual void font_clear_kerning_map(RID p_font_rid, int p_size) override;
+	virtual void font_remove_kerning(RID p_font_rid, int p_size, const Vector2i &p_glyph_pair) override;
 
-	virtual bool font_has_char(RID p_font, char32_t p_char) const override;
-	virtual String font_get_supported_chars(RID p_font) const override;
+	virtual void font_set_kerning(RID p_font_rid, int p_size, const Vector2i &p_glyph_pair, const Vector2 &p_kerning) override;
+	virtual Vector2 font_get_kerning(RID p_font_rid, int p_size, const Vector2i &p_glyph_pair) const override;
 
-	virtual bool font_has_outline(RID p_font) const override;
-	virtual float font_get_base_size(RID p_font) const override;
+	virtual int32_t font_get_glyph_index(RID p_font_rid, int p_size, char32_t p_char, char32_t p_variation_selector = 0) const override;
 
-	virtual bool font_is_language_supported(RID p_font, const String &p_language) const override;
-	virtual void font_set_language_support_override(RID p_font, const String &p_language, bool p_supported) override;
-	virtual bool font_get_language_support_override(RID p_font, const String &p_language) override;
-	virtual void font_remove_language_support_override(RID p_font, const String &p_language) override;
-	Vector<String> font_get_language_support_overrides(RID p_font) override;
+	virtual bool font_has_char(RID p_font_rid, char32_t p_char) const override;
+	virtual String font_get_supported_chars(RID p_font_rid) const override;
 
-	virtual bool font_is_script_supported(RID p_font, const String &p_script) const override;
-	virtual void font_set_script_support_override(RID p_font, const String &p_script, bool p_supported) override;
-	virtual bool font_get_script_support_override(RID p_font, const String &p_script) override;
-	virtual void font_remove_script_support_override(RID p_font, const String &p_script) override;
-	Vector<String> font_get_script_support_overrides(RID p_font) override;
+	virtual void font_render_range(RID p_font, const Vector2i &p_size, char32_t p_start, char32_t p_end) override;
+	virtual void font_render_glyph(RID p_font_rid, const Vector2i &p_size, int32_t p_index) override;
 
-	virtual uint32_t font_get_glyph_index(RID p_font, char32_t p_char, char32_t p_variation_selector = 0x0000) const override;
-	virtual Vector2 font_get_glyph_advance(RID p_font, uint32_t p_index, int p_size) const override;
-	virtual Vector2 font_get_glyph_kerning(RID p_font, uint32_t p_index_a, uint32_t p_index_b, int p_size) const override;
+	virtual void font_draw_glyph(RID p_font, RID p_canvas, int p_size, const Vector2 &p_pos, int32_t p_index, const Color &p_color = Color(1, 1, 1)) const override;
+	virtual void font_draw_glyph_outline(RID p_font, RID p_canvas, int p_size, int p_outline_size, const Vector2 &p_pos, int32_t p_index, const Color &p_color = Color(1, 1, 1)) const override;
 
-	virtual Vector2 font_draw_glyph(RID p_font, RID p_canvas, int p_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color = Color(1, 1, 1)) const override;
-	virtual Vector2 font_draw_glyph_outline(RID p_font, RID p_canvas, int p_size, int p_outline_size, const Vector2 &p_pos, uint32_t p_index, const Color &p_color = Color(1, 1, 1)) const override;
+	virtual bool font_is_language_supported(RID p_font_rid, const String &p_language) const override;
+	virtual void font_set_language_support_override(RID p_font_rid, const String &p_language, bool p_supported) override;
+	virtual bool font_get_language_support_override(RID p_font_rid, const String &p_language) override;
+	virtual void font_remove_language_support_override(RID p_font_rid, const String &p_language) override;
+	virtual Vector<String> font_get_language_support_overrides(RID p_font_rid) override;
 
-	virtual bool font_get_glyph_contours(RID p_font, int p_size, uint32_t p_index, Vector<Vector3> &r_points, Vector<int32_t> &r_contours, bool &r_orientation) const override;
+	virtual bool font_is_script_supported(RID p_font_rid, const String &p_script) const override;
+	virtual void font_set_script_support_override(RID p_font_rid, const String &p_script, bool p_supported) override;
+	virtual bool font_get_script_support_override(RID p_font_rid, const String &p_script) override;
+	virtual void font_remove_script_support_override(RID p_font_rid, const String &p_script) override;
+	virtual Vector<String> font_get_script_support_overrides(RID p_font_rid) override;
 
-	virtual float font_get_oversampling() const override;
-	virtual void font_set_oversampling(float p_oversampling) override;
+	virtual Dictionary font_supported_feature_list(RID p_font_rid) const override;
+	virtual Dictionary font_supported_variation_list(RID p_font_rid) const override;
 
-	virtual Vector<String> get_system_fonts() const override;
+	virtual real_t font_get_global_oversampling() const override;
+	virtual void font_set_global_oversampling(real_t p_oversampling) override;
 
 	/* Shaped text buffer interface */
 
@@ -222,14 +454,14 @@ public:
 	virtual RID shaped_text_substr(RID p_shaped, int p_start, int p_length) const override;
 	virtual RID shaped_text_get_parent(RID p_shaped) const override;
 
-	virtual float shaped_text_fit_to_width(RID p_shaped, float p_width, uint8_t /*JustificationFlag*/ p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) override;
-	virtual float shaped_text_tab_align(RID p_shaped, const Vector<float> &p_tab_stops) override;
+	virtual real_t shaped_text_fit_to_width(RID p_shaped, real_t p_width, uint8_t /*JustificationFlag*/ p_jst_flags = JUSTIFICATION_WORD_BOUND | JUSTIFICATION_KASHIDA) override;
+	virtual real_t shaped_text_tab_align(RID p_shaped, const Vector<real_t> &p_tab_stops) override;
 
 	virtual bool shaped_text_shape(RID p_shaped) override;
 	virtual bool shaped_text_update_breaks(RID p_shaped) override;
 	virtual bool shaped_text_update_justification_ops(RID p_shaped) override;
 
-	virtual void shaped_text_overrun_trim_to_width(RID p_shaped, float p_width, uint8_t p_trim_flags) override;
+	virtual void shaped_text_overrun_trim_to_width(RID p_shaped, real_t p_width, uint8_t p_trim_flags) override;
 	virtual TrimData shaped_text_get_trim_data(RID p_shaped) const override;
 
 	virtual bool shaped_text_is_ready(RID p_shaped) const override;
@@ -244,11 +476,11 @@ public:
 	virtual Rect2 shaped_text_get_object_rect(RID p_shaped, Variant p_key) const override;
 
 	virtual Size2 shaped_text_get_size(RID p_shaped) const override;
-	virtual float shaped_text_get_ascent(RID p_shaped) const override;
-	virtual float shaped_text_get_descent(RID p_shaped) const override;
-	virtual float shaped_text_get_width(RID p_shaped) const override;
-	virtual float shaped_text_get_underline_position(RID p_shaped) const override;
-	virtual float shaped_text_get_underline_thickness(RID p_shaped) const override;
+	virtual real_t shaped_text_get_ascent(RID p_shaped) const override;
+	virtual real_t shaped_text_get_descent(RID p_shaped) const override;
+	virtual real_t shaped_text_get_width(RID p_shaped) const override;
+	virtual real_t shaped_text_get_underline_position(RID p_shaped) const override;
+	virtual real_t shaped_text_get_underline_thickness(RID p_shaped) const override;
 
 	virtual String format_number(const String &p_string, const String &p_language = "") const override;
 	virtual String parse_number(const String &p_string, const String &p_language = "") const override;