From 07d14f5bb8e8a2cb3b2137d1ef4fb6c3b46c0873 Mon Sep 17 00:00:00 2001
From: bruvzg <7645683+bruvzg@users.noreply.github.com>
Date: Wed, 12 Aug 2020 14:07:49 +0300
Subject: [Complex Text Layouts] Implement GDNative interface for TextServer.

---
 modules/text_server_adv/SCsub                |  3 ---
 modules/text_server_adv/bitmap_font_adv.cpp  | 14 +++++++-------
 modules/text_server_adv/dynamic_font_adv.cpp |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'modules/text_server_adv')

diff --git a/modules/text_server_adv/SCsub b/modules/text_server_adv/SCsub
index b4a8450f94..7403b01a4c 100644
--- a/modules/text_server_adv/SCsub
+++ b/modules/text_server_adv/SCsub
@@ -457,9 +457,6 @@ if env["builtin_icu"]:
         ]
     )
 
-    if env_icu.msvc:
-        env_icu.AppendUnique(CCFLAGS=["/utf-8"])
-
     env_icu.disable_warnings()
     env_thirdparty = env_icu.Clone()
     env_thirdparty.disable_warnings()
diff --git a/modules/text_server_adv/bitmap_font_adv.cpp b/modules/text_server_adv/bitmap_font_adv.cpp
index b29bcabbff..10c3732fd7 100644
--- a/modules/text_server_adv/bitmap_font_adv.cpp
+++ b/modules/text_server_adv/bitmap_font_adv.cpp
@@ -539,13 +539,13 @@ Vector2 BitmapFontDataAdvanced::draw_glyph(RID p_canvas, int p_size, const Vecto
 		cpos += c->align * (float(p_size) / float(base_size));
 		cpos.y -= ascent * (float(p_size) / float(base_size));
 		if (RenderingServer::get_singleton() != nullptr) {
-			if (distance_field_hint) {
-				RenderingServer::get_singleton()->canvas_item_set_distance_field_mode(p_canvas, true);
-			}
-			RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, c->rect.size * (float(p_size) / float(base_size))), textures[c->texture_idx]->get_rid(), c->rect, p_color, false, RID(), RID(), Color(1, 1, 1, 1), false);
-			if (distance_field_hint) {
-				RenderingServer::get_singleton()->canvas_item_set_distance_field_mode(p_canvas, false);
-			}
+			//if (distance_field_hint) { // Not implemented.
+			//	RenderingServer::get_singleton()->canvas_item_set_distance_field_mode(p_canvas, true);
+			//}
+			RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, c->rect.size * (float(p_size) / float(base_size))), textures[c->texture_idx]->get_rid(), c->rect, p_color, false, false);
+			//if (distance_field_hint) {
+			//	RenderingServer::get_singleton()->canvas_item_set_distance_field_mode(p_canvas, false);
+			//}
 		}
 	}
 
diff --git a/modules/text_server_adv/dynamic_font_adv.cpp b/modules/text_server_adv/dynamic_font_adv.cpp
index 6593da7f2b..90e5cc8831 100644
--- a/modules/text_server_adv/dynamic_font_adv.cpp
+++ b/modules/text_server_adv/dynamic_font_adv.cpp
@@ -924,7 +924,7 @@ Vector2 DynamicFontDataAdvanced::draw_glyph(RID p_canvas, int p_size, const Vect
 			}
 			if (RenderingServer::get_singleton() != nullptr) {
 				RID texture = fds->textures[ch.texture_idx].texture->get_rid();
-				RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, ch.rect.size), texture, ch.rect_uv, modulate, false, RID(), RID(), Color(1, 1, 1, 1), false);
+				RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, ch.rect.size), texture, ch.rect_uv, modulate, false, false);
 			}
 		}
 
@@ -955,7 +955,7 @@ Vector2 DynamicFontDataAdvanced::draw_glyph_outline(RID p_canvas, int p_size, in
 			}
 			if (RenderingServer::get_singleton() != nullptr) {
 				RID texture = fds->textures[ch.texture_idx].texture->get_rid();
-				RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, ch.rect.size), texture, ch.rect_uv, modulate, false, RID(), RID(), Color(1, 1, 1, 1), false);
+				RenderingServer::get_singleton()->canvas_item_add_texture_rect_region(p_canvas, Rect2(cpos, ch.rect.size), texture, ch.rect_uv, modulate, false, false);
 			}
 		}
 
-- 
cgit v1.2.3