1 files changed, 42 insertions, 33 deletions

diff --git a/scene/gui/rich_text_effect.h b/scene/gui/rich_text_effect.h
index 77c82aa780..f5506542bb 100644
--- a/scene/gui/rich_text_effect.h
+++ b/scene/gui/rich_text_effect.h
@@ -5,8 +5,8 @@
 /*                           GODOT ENGINE                                */
 /*                      https://godotengine.org                          */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md).   */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -31,57 +31,66 @@
 #ifndef RICH_TEXT_EFFECT_H
 #define RICH_TEXT_EFFECT_H
 
-#include "core/resource.h"
+#include "core/io/resource.h"
+#include "core/object/gdvirtual.gen.inc"
+#include "core/object/script_language.h"
 
-class RichTextEffect : public Resource {
-	GDCLASS(RichTextEffect, Resource);
-	OBJ_SAVE_TYPE(RichTextEffect);
-
-protected:
-	static void _bind_methods();
-
-public:
-	Variant get_bbcode() const;
-	bool _process_effect_impl(Ref<class CharFXTransform> p_cfx);
-
-	RichTextEffect();
-};
-
-class CharFXTransform : public Reference {
-	GDCLASS(CharFXTransform, Reference);
+class CharFXTransform : public RefCounted {
+	GDCLASS(CharFXTransform, RefCounted);
 
 protected:
 	static void _bind_methods();
 
 public:
-	uint64_t relative_index;
-	uint64_t absolute_index;
-	bool visibility;
+	Vector2i range;
+	bool visibility = true;
+	bool outline = false;
 	Point2 offset;
 	Color color;
-	CharType character;
-	float elapsed_time;
+	double elapsed_time = 0.0f;
 	Dictionary environment;
+	uint32_t glyph_index = 0;
+	RID font;
 
 	CharFXTransform();
 	~CharFXTransform();
 
-	uint64_t get_relative_index() { return relative_index; }
-	void set_relative_index(uint64_t p_index) { relative_index = p_index; }
-	uint64_t get_absolute_index() { return absolute_index; }
-	void set_absolute_index(uint64_t p_index) { absolute_index = p_index; }
-	float get_elapsed_time() { return elapsed_time; }
-	void set_elapsed_time(float p_elapsed_time) { elapsed_time = p_elapsed_time; }
+	Vector2i get_range() { return range; }
+	void set_range(const Vector2i &p_range) { range = p_range; }
+	double get_elapsed_time() { return elapsed_time; }
+	void set_elapsed_time(double p_elapsed_time) { elapsed_time = p_elapsed_time; }
 	bool is_visible() { return visibility; }
-	void set_visibility(bool p_vis) { visibility = p_vis; }
+	void set_visibility(bool p_visibility) { visibility = p_visibility; }
+	bool is_outline() { return outline; }
+	void set_outline(bool p_outline) { outline = p_outline; }
 	Point2 get_offset() { return offset; }
 	void set_offset(Point2 p_offset) { offset = p_offset; }
 	Color get_color() { return color; }
 	void set_color(Color p_color) { color = p_color; }
-	int get_character() { return (int)character; }
-	void set_character(int p_char) { character = (CharType)p_char; }
+
+	uint32_t get_glyph_index() const { return glyph_index; };
+	void set_glyph_index(uint32_t p_glyph_index) { glyph_index = p_glyph_index; };
+	RID get_font() const { return font; };
+	void set_font(RID p_font) { font = p_font; };
+
 	Dictionary get_environment() { return environment; }
 	void set_environment(Dictionary p_environment) { environment = p_environment; }
 };
 
+class RichTextEffect : public Resource {
+	GDCLASS(RichTextEffect, Resource);
+	OBJ_SAVE_TYPE(RichTextEffect);
+
+protected:
+	static void _bind_methods();
+
+	GDVIRTUAL1RC(bool, _process_custom_fx, Ref<CharFXTransform>)
+
+public:
+	Variant get_bbcode() const;
+	bool _process_effect_impl(Ref<class CharFXTransform> p_cfx);
+
+	RichTextEffect();
+};
+
 #endif // RICH_TEXT_EFFECT_H