mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-05 21:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix RichTextLabel bbcode rainbow play reversed and paused

Browse Source
This commit is contained in:
havi05 2024-12-16 23:52:17 +01:00
parent 4364ed6ccd
commit b905014128
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scene/gui/rich_text_label.cpp
View File

@ -1248,7 +1248,7 @@ int RichTextLabel::_draw_line(ItemFrame *p_frame, int p_line, const Vector2 &p_o
} else if (item_fx->type == ITEM_RAINBOW) {
ItemRainbow *item_rainbow = static_cast<ItemRainbow *>(item_fx);
font_color = font_color.from_hsv(item_rainbow->frequency * (item_rainbow->elapsed_time + ((p_ofs.x + off_step.x) / 50)), item_rainbow->saturation, item_rainbow->value, font_color.a);
font_color = font_color.from_hsv(MAX(item_rainbow->frequency, 0) * ABS(item_rainbow->elapsed_time * item_rainbow->speed + ((p_ofs.x + off_step.x) / 50)), item_rainbow->saturation, item_rainbow->value, font_color.a);
} else if (item_fx->type == ITEM_PULSE) {
ItemPulse *item_pulse = static_cast<ItemPulse *>(item_fx);
@ -3906,7 +3906,7 @@ void RichTextLabel::push_tornado(float p_frequency = 1.0f, float p_radius = 10.0
_add_item(item, true);
}
void RichTextLabel::push_rainbow(float p_saturation, float p_value, float p_frequency) {
void RichTextLabel::push_rainbow(float p_saturation, float p_value, float p_frequency, float p_speed) {
_stop_thread();
MutexLock data_lock(data_mutex);
@ -3914,6 +3914,7 @@ void RichTextLabel::push_rainbow(float p_saturation, float p_value, float p_freq
ItemRainbow *item = memnew(ItemRainbow);
item->owner = get_instance_id();
item->rid = items.make_rid(item);
item->speed = p_speed;
item->frequency = p_frequency;
item->saturation = p_saturation;
item->value = p_value;
@ -5379,7 +5380,13 @@ void RichTextLabel::append_text(const String &p_bbcode) {
frequency = frequency_option->value.to_float();
}
push_rainbow(saturation, value, frequency);
float speed = 1.0f;
OptionMap::Iterator speed_option = bbcode_options.find("speed");
if (speed_option) {
speed = speed_option->value.to_float();
}
push_rainbow(saturation, value, frequency, speed);
pos = brk_end + 1;
tag_stack.push_front("rainbow");
set_process_internal(true);

3
scene/gui/rich_text_label.h
View File

@ -413,6 +413,7 @@ private:
float saturation = 0.8f;
float value = 0.8f;
float frequency = 1.0f;
float speed = 1.0f;
ItemRainbow() { type = ITEM_RAINBOW; }
};
@ -716,7 +717,7 @@ public:
void push_shake(int p_strength, float p_rate, bool p_connected);
void push_wave(float p_frequency, float p_amplitude, bool p_connected);
void push_tornado(float p_frequency, float p_radius, bool p_connected);
void push_rainbow(float p_saturation, float p_value, float p_frequency);
void push_rainbow(float p_saturation, float p_value, float p_frequency, float p_speed);
void push_pulse(const Color &p_color, float p_frequency, float p_ease);
void push_bgcolor(const Color &p_color);
void push_fgcolor(const Color &p_color);