1 files changed, 44 insertions, 42 deletions

diff --git a/modules/text_server_adv/bitmap_font_adv.cpp b/modules/text_server_adv/bitmap_font_adv.cpp
index df771301e6..e33556b232 100644
--- a/modules/text_server_adv/bitmap_font_adv.cpp
+++ b/modules/text_server_adv/bitmap_font_adv.cpp
@@ -367,61 +367,63 @@ Error BitmapFontDataAdvanced::load_from_file(const String &p_filename, int p_bas
 	return OK;
 }
 
-Error BitmapFontDataAdvanced::load_from_memory(const uint8_t *p_data, size_t p_size, int p_base_size) {
-	_THREAD_SAFE_METHOD_
-	ERR_FAIL_COND_V(p_data == nullptr, ERR_CANT_CREATE);
-	ERR_FAIL_COND_V(p_size != sizeof(TextServer::BitmapFontData), ERR_CANT_CREATE);
+Error BitmapFontDataAdvanced::bitmap_new(float p_height, float p_ascent, int p_base_size) {
+	height = p_height;
+	ascent = p_ascent;
 
-	const TextServer::BitmapFontData *data = (const TextServer::BitmapFontData *)p_data;
+	base_size = p_base_size;
+	if (base_size == 0) {
+		base_size = height;
+	}
 
-	if (RenderingServer::get_singleton() != nullptr) {
-		Ref<Image> image = memnew(Image(data->img));
-		Ref<ImageTexture> tex = memnew(ImageTexture);
-		tex->create_from_image(image);
+	char_map.clear();
+	textures.clear();
+	kerning_map.clear();
 
-		textures.push_back(tex);
+	for (Map<float, hb_font_t *>::Element *E = cache.front(); E; E = E->next()) {
+		hb_font_destroy(E->get());
 	}
+	cache.clear();
 
-	for (int i = 0; i < data->charcount; i++) {
-		const int *c = &data->char_rects[i * 8];
+	valid = true;
 
-		Character chr;
-		chr.rect.position.x = c[1];
-		chr.rect.position.y = c[2];
-		chr.rect.size.x = c[3];
-		chr.rect.size.y = c[4];
-		if (c[7] < 0) {
-			chr.advance.x = c[3];
-		} else {
-			chr.advance.x = c[7];
-		}
-		chr.align = Vector2(c[6], c[5]);
-		char_map[c[0]] = chr;
-	}
+	return OK;
+}
 
-	for (int i = 0; i < data->kerning_count; i++) {
-		KerningPairKey kpk;
-		kpk.A = data->kernings[i * 3 + 0];
-		kpk.B = data->kernings[i * 3 + 1];
+void BitmapFontDataAdvanced::bitmap_add_texture(const Ref<Texture> &p_texture) {
+	ERR_FAIL_COND(!valid);
+	ERR_FAIL_COND_MSG(p_texture.is_null(), "It's not a reference to a valid Texture object.");
 
-		if (data->kernings[i * 3 + 2] == 0 && kerning_map.has(kpk)) {
-			kerning_map.erase(kpk);
-		} else {
-			kerning_map[kpk] = data->kernings[i * 3 + 2];
-		}
-	}
+	textures.push_back(p_texture);
+}
 
-	height = data->height;
-	ascent = data->ascent;
+void BitmapFontDataAdvanced::bitmap_add_char(char32_t p_char, int p_texture_idx, const Rect2 &p_rect, const Size2 &p_align, float p_advance) {
+	ERR_FAIL_COND(!valid);
 
-	base_size = p_base_size;
-	if (base_size == 0) {
-		base_size = height;
+	Character chr;
+	chr.rect = p_rect;
+	chr.texture_idx = p_texture_idx;
+	if (p_advance < 0) {
+		chr.advance.x = chr.rect.size.x;
+	} else {
+		chr.advance.x = p_advance;
 	}
+	chr.align = p_align;
+	char_map[p_char] = chr;
+}
 
-	valid = true;
+void BitmapFontDataAdvanced::bitmap_add_kerning_pair(char32_t p_A, char32_t p_B, int p_kerning) {
+	ERR_FAIL_COND(!valid);
 
-	return OK;
+	KerningPairKey kpk;
+	kpk.A = p_A;
+	kpk.B = p_B;
+
+	if (p_kerning == 0 && kerning_map.has(kpk)) {
+		kerning_map.erase(kpk);
+	} else {
+		kerning_map[kpk] = p_kerning;
+	}
 }
 
 float BitmapFontDataAdvanced::get_height(int p_size) const {