Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: Fix message queue order and positioning

Browse source
This commit is contained in:
kd-11 2023-02-02 03:12:30 +03:00 • committed by kd-11
parent 34c1e1a9ad
commit 205f8a6479
2 changed files with 44 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

55
rpcs3/Emu/RSX/Overlays/overlay_message.cpp
View file

@ -28,10 +28,15 @@ namespace rsx
m_text.auto_resize(); m_text.auto_resize();
m_text.back_color.a = 0.f; m_text.back_color.a = 0.f;
m_fade_animation.current = color4f(1.f); m_fade_in_animation.current = color4f(0.f);
m_fade_animation.end = color4f(1.0f, 1.0f, 1.0f, 0.f); m_fade_in_animation.end = color4f(1.0f);
m_fade_animation.duration = 2.f; m_fade_in_animation.duration = 1.f;
m_fade_animation.active = true; m_fade_in_animation.active = true;
m_fade_out_animation.current = color4f(1.f);
m_fade_out_animation.end = color4f(0.f);
m_fade_out_animation.duration = 2.f;
m_fade_out_animation.active = true;
back_color.a = 0.15; back_color.a = 0.15;
@ -69,7 +74,11 @@ namespace rsx
compiled_resource& message_item::get_compiled() compiled_resource& message_item::get_compiled()
{ {
if (!m_processed || !m_fade_animation.active) auto& current_animation = m_fade_in_animation.active
? m_fade_in_animation
: m_fade_out_animation;
if (!m_processed || !current_animation.active)
{ {
compiled_resources = {}; compiled_resources = {};
return compiled_resources; return compiled_resources;
@ -84,32 +93,37 @@ namespace rsx
{ {
compiled_resources.add(m_icon->get_compiled()); compiled_resources.add(m_icon->get_compiled());
} }
m_fade_animation.apply(compiled_resources);
current_animation.apply(compiled_resources);
return compiled_resources; return compiled_resources;
} }
void message_item::update(usz index, u64 time, u16 origin, int grow_direction) void message_item::update(usz index, u64 time, u16 y_offset)
{ {
if (m_cur_pos != index) if (m_cur_pos != index)
{ {
m_cur_pos = index; m_cur_pos = index;
set_pos(10, static_cast<u16>(origin + (index * 18 * grow_direction))); set_pos(10, y_offset);
} }
if (!m_processed) if (!m_processed)
{ {
m_expiration_time = get_expiration_time(m_visible_duration); m_expiration_time = get_expiration_time(m_visible_duration);
} }
if (m_fade_in_animation.active)
{
m_fade_in_animation.update(rsx::get_current_renderer()->vblank_count);
}
else if (time + 2'000'000 > m_expiration_time) else if (time + 2'000'000 > m_expiration_time)
{ {
m_fade_animation.update(rsx::get_current_renderer()->vblank_count); m_fade_out_animation.update(rsx::get_current_renderer()->vblank_count);
} }
m_processed = true; m_processed = true;
} }
void message::update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, u16 origin, int grow_direction) void message::update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin)
{ {
const u64 cur_time = rsx::uclock(); const u64 cur_time = rsx::uclock();
@ -129,11 +143,20 @@ namespace rsx
return; return;
} }
usz index = 0; // Render reversed list. Oldest entries are furthest from the border
for (auto& item : vis_set) u16 y_offset = 8, margin = 4, index = 0;
for (auto it = vis_set.rbegin(); it != vis_set.rend(); ++it, ++index)
{ {
item.update(index, cur_time, origin, grow_direction); if (origin == message_pin_location::top) [[ likely ]]
index++; {
it->update(index, cur_time, y_offset);
y_offset += (margin + it->h);
}
else
{
y_offset += (margin + it->h);
it->update(index, cur_time, virtual_height - y_offset);
}
} }
} }
@ -146,8 +169,8 @@ namespace rsx
std::lock_guard lock(m_mutex_queue); std::lock_guard lock(m_mutex_queue);
update_queue(m_vis_items_top, m_ready_queue_top, 10, 1); update_queue(m_vis_items_top, m_ready_queue_top, message_pin_location::top);
update_queue(m_vis_items_bottom, m_ready_queue_bottom, virtual_height - 18, -1); update_queue(m_vis_items_bottom, m_ready_queue_bottom, message_pin_location::bottom);
visible = !m_vis_items_top.empty() || !m_vis_items_bottom.empty(); visible = !m_vis_items_top.empty() || !m_vis_items_bottom.empty();
} }

9
rpcs3/Emu/RSX/Overlays/overlay_message.h
View file

@ -7,7 +7,7 @@ namespace rsx
{ {
namespace overlays namespace overlays
{ {
enum message_pin_location enum class message_pin_location
{ {
top, top,
bottom bottom
@ -18,7 +18,7 @@ namespace rsx
public: public:
template <typename T> template <typename T>
message_item(T msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::unique_ptr<overlay_element> icon = {}); message_item(T msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::unique_ptr<overlay_element> icon = {});
void update(usz index, u64 time, u16 origin, int grow_direction); void update(usz index, u64 time, u16 y_offset);
void set_pos(u16 _x, u16 _y) override; void set_pos(u16 _x, u16 _y) override;
u64 get_expiration() const; u64 get_expiration() const;
@ -27,7 +27,8 @@ namespace rsx
private: private:
label m_text{}; label m_text{};
std::unique_ptr<overlay_element> m_icon{}; std::unique_ptr<overlay_element> m_icon{};
animation_color_interpolate m_fade_animation; animation_color_interpolate m_fade_in_animation;
animation_color_interpolate m_fade_out_animation;
u64 m_expiration_time = 0; u64 m_expiration_time = 0;
u64 m_visible_duration = 0; u64 m_visible_duration = 0;
@ -84,7 +85,7 @@ namespace rsx
std::deque<message_item> m_vis_items_top; std::deque<message_item> m_vis_items_top;
std::deque<message_item> m_vis_items_bottom; std::deque<message_item> m_vis_items_bottom;
void update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, u16 origin, int grow_direction); void update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin);
}; };
template <typename T> template <typename T>