ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Overlays: Add top right and bottom right messages

This commit is contained in:
NicknineTheEagle 2024-06-22 14:39:53 +03:00
parent bceaf46e2f
commit fb06a7d5d0
2 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rpcs3/Emu/RSX/Overlays/overlay_message.cpp
View File

@ -117,12 +117,12 @@ namespace rsx
return compiled_resources;
}
void message_item::update(usz index, u64 timestamp_us, s16 y_offset)
void message_item::update(usz index, u64 timestamp_us, s16 x_offset, s16 y_offset)
{
if (m_cur_pos != index)
{
m_cur_pos = index;
set_pos(10, y_offset);
set_pos(x_offset, y_offset);
}
if (!m_processed)
@ -198,18 +198,29 @@ namespace rsx
// Render reversed list. Oldest entries are furthest from the border
constexpr u16 spacing = 4;
s16 y_offset = 8;
s16 x_offset = 10;
usz index = 0;
for (auto it = vis_set.rbegin(); it != vis_set.rend(); ++it, ++index)
{
if (origin == message_pin_location::top) [[ likely ]]
{
it->update(index, cur_time, y_offset);
it->update(index, cur_time, x_offset, y_offset);
y_offset += (spacing + it->h);
}
else
else if (origin == message_pin_location::bottom)
{
y_offset += (spacing + it->h);
it->update(index, cur_time, virtual_height - y_offset);
it->update(index, cur_time, x_offset, virtual_height - y_offset);
}
else if (origin == message_pin_location::top_right)
{
it->update(index, cur_time, virtual_width - x_offset - it->w, y_offset);
y_offset += (spacing + it->h);
}
else if (origin == message_pin_location::bottom_right)
{
y_offset += (spacing + it->h);
it->update(index, cur_time, virtual_width - x_offset - it->w, virtual_height - y_offset);
}
}
}
@ -225,8 +236,11 @@ namespace rsx
update_queue(m_visible_items_top, m_ready_queue_top, message_pin_location::top);
update_queue(m_visible_items_bottom, m_ready_queue_bottom, message_pin_location::bottom);
update_queue(m_visible_items_top_right, m_ready_queue_top_right, message_pin_location::top_right);
update_queue(m_visible_items_bottom_right, m_ready_queue_bottom_right, message_pin_location::bottom_right);
visible = !m_visible_items_top.empty() || !m_visible_items_bottom.empty();
visible = !m_visible_items_top.empty() || !m_visible_items_bottom.empty() ||
!m_visible_items_top_right.empty() || !m_visible_items_bottom_right.empty();
}
compiled_resource message::get_compiled()
@ -250,6 +264,16 @@ namespace rsx
cr.add(item.get_compiled());
}
for (auto& item : m_visible_items_top_right)
{
cr.add(item.get_compiled());
}
for (auto& item : m_visible_items_bottom_right)
{
cr.add(item.get_compiled());
}
return cr;
}
@ -287,6 +311,10 @@ namespace rsx
return check_list(m_ready_queue_top) || check_list(m_visible_items_top);
case message_pin_location::bottom:
return check_list(m_ready_queue_bottom) || check_list(m_visible_items_bottom);
case message_pin_location::top_right:
return check_list(m_ready_queue_top_right) || check_list(m_visible_items_top_right);
case message_pin_location::bottom_right:
return check_list(m_ready_queue_bottom_right) || check_list(m_visible_items_bottom_right);
}
return false;

34
rpcs3/Emu/RSX/Overlays/overlay_message.h
View File

@ -12,7 +12,9 @@ namespace rsx
enum class message_pin_location
{
top,
bottom
bottom,
top_right,
bottom_right
};
class message_item : public rounded_rect
@ -20,7 +22,7 @@ namespace rsx
public:
template <typename T>
message_item(T msg_id, u64 expiration, std::shared_ptr<atomic_t<u32>> refs, std::shared_ptr<overlay_element> icon = {});
void update(usz index, u64 timestamp_us, s16 y_offset);
void update(usz index, u64 timestamp_us, s16 x_offset, s16 y_offset);
void set_pos(s16 _x, s16 _y) override;
void reset_expiration();
@ -61,9 +63,23 @@ namespace rsx
{
std::lock_guard lock(m_mutex_queue);
auto& queue = location == message_pin_location::top
? m_ready_queue_top
: m_ready_queue_bottom;
auto* queue = &m_ready_queue_top;
switch (location)
{
case message_pin_location::top:
queue = &m_ready_queue_top;
break;
case message_pin_location::bottom:
queue = &m_ready_queue_bottom;
break;
case message_pin_location::top_right:
queue = &m_ready_queue_top_right;
break;
case message_pin_location::bottom_right:
queue = &m_ready_queue_bottom_right;
break;
}
if constexpr (std::is_same_v<T, std::initializer_list<localized_string_id>>)
{
@ -71,13 +87,13 @@ namespace rsx
{
if (!message_exists(location, id, allow_refresh))
{
queue.emplace_back(id, expiration, refs, icon);
queue->emplace_back(id, expiration, refs, icon);
}
}
}
else if (!message_exists(location, msg_id, allow_refresh))
{
queue.emplace_back(msg_id, expiration, std::move(refs), icon);
queue->emplace_back(msg_id, expiration, std::move(refs), icon);
}
visible = true;
@ -91,10 +107,14 @@ namespace rsx
// Top and bottom enqueued sets
std::deque<message_item> m_ready_queue_top;
std::deque<message_item> m_ready_queue_bottom;
std::deque<message_item> m_ready_queue_top_right;
std::deque<message_item> m_ready_queue_bottom_right;
// Top and bottom visible sets
std::deque<message_item> m_visible_items_top;
std::deque<message_item> m_visible_items_bottom;
std::deque<message_item> m_visible_items_top_right;
std::deque<message_item> m_visible_items_bottom_right;
void update_queue(std::deque<message_item>& vis_set, std::deque<message_item>& ready_set, message_pin_location origin);