overlays: add trophy list dialog

Author: Megamouse

rpcs3/Emu/CMakeLists.txt

@@ -528,6 +528,7 @@ target_sources(rpcs3_emu PRIVATE
     RSX/Overlays/HomeMenu/overlay_home_menu_savestate.cpp
     RSX/Overlays/Network/overlay_recvmessage_dialog.cpp
     RSX/Overlays/Network/overlay_sendmessage_dialog.cpp
+    RSX/Overlays/Trophies/overlay_trophy_list_dialog.cpp
     RSX/Overlays/overlays.cpp
     RSX/Overlays/overlay_animated_icon.cpp
     RSX/Overlays/overlay_animation.cpp

rpcs3/Emu/Cell/Modules/sceNp.cpp

@@ -5214,7 +5214,7 @@ error_code sceNpProfileCallGui(vm::cptr<SceNpId> npid, vm::ptr<SceNpProfileResul
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		return SCE_NP_PROFILE_ERROR_NOT_INITIALIZED;
 	}
 
 	// TODO: SCE_NP_PROFILE_ERROR_BUSY
@@ -5240,7 +5240,7 @@ error_code sceNpProfileAbortGui()
 
 	if (!nph.is_NP_init)
 	{
-		return SCE_NP_ERROR_NOT_INITIALIZED;
+		return SCE_NP_FRIENDLIST_ERROR_NOT_INITIALIZED; // Not SCE_NP_PROFILE_ERROR_NOT_INITIALIZED !
 	}
 
 	return CELL_OK;

rpcs3/Emu/Cell/Modules/sceNpTrophy.cpp

@@ -504,10 +504,17 @@ error_code sceNpTrophyCreateContext(vm::ptr<u32> context, vm::cptr<SceNpCommunic
 	}
 
 	// set trophy context parameters (could be passed to constructor through make_ptr call)
-	ctxt->trp_name = std::move(name);
+	ctxt->trp_name = name;
 	ctxt->read_only = !!(options & SCE_NP_TROPHY_OPTIONS_CREATE_CONTEXT_READ_ONLY);
 	*context = idm::last_id();
 
+	// set current trophy name for trophy list overlay
+	{
+		current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
+		std::lock_guard lock(current_id.mtx);
+		current_id.name = std::move(name);
+	}
+
 	return CELL_OK;
 }
 

rpcs3/Emu/Cell/Modules/sceNpTrophy.h

@@ -168,3 +168,9 @@ class TrophyNotificationBase
 
 	virtual s32 ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophyIconBfr) = 0;
 };
+
+struct current_trophy_name
+{
+	std::mutex mtx;
+	std::string name;
+};

rpcs3/Emu/RSX/GL/GLOverlays.cpp

@@ -217,7 +217,7 @@ namespace gl
 	gl::texture_view* ui_overlay_renderer::load_simple_image(rsx::overlays::image_info* desc, bool temp_resource, u32 owner_uid)
 	{
 		auto tex = std::make_unique<gl::texture>(GL_TEXTURE_2D, desc->w, desc->h, 1, 1, GL_RGBA8);
-		tex->copy_from(desc->data, gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
+		tex->copy_from(desc->get_data(), gl::texture::format::rgba, gl::texture::type::uint_8_8_8_8, {});
 
 		GLenum remap[] = { GL_RED, GL_ALPHA, GL_BLUE, GL_GREEN };
 		auto view = std::make_unique<gl::texture_view>(tex.get(), remap);

rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp

@@ -4,9 +4,11 @@
 #include "overlay_home_menu_settings.h"
 #include "overlay_home_menu_savestate.h"
 #include "Emu/RSX/Overlays/FriendsList/overlay_friends_list_dialog.h"
+#include "Emu/RSX/Overlays/Trophies/overlay_trophy_list_dialog.h"
 #include "Emu/RSX/Overlays/overlay_manager.h"
 #include "Emu/System.h"
 #include "Emu/system_config.h"
+#include "Emu/Cell/Modules/sceNpTrophy.h"
 
 extern atomic_t<bool> g_user_asked_for_recording;
 extern atomic_t<bool> g_user_asked_for_screenshot;
@@ -55,6 +57,32 @@ namespace rsx
 				return page_navigation::stay;
 			});
 
+			// get current trophy name for trophy list overlay
+			std::string trop_name;
+			{
+				current_trophy_name& current_id = g_fxo->get<current_trophy_name>();
+				std::lock_guard lock(current_id.mtx);
+				trop_name = current_id.name;
+			}
+			if (!trop_name.empty())
+			{
+				std::unique_ptr<overlay_element> trophies = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_TROPHIES));
+				add_item(trophies, [trop_name = std::move(trop_name)](pad_button btn) -> page_navigation
+				{
+					if (btn != pad_button::cross) return page_navigation::stay;
+
+					rsx_log.notice("User selected trophies in home menu");
+					Emu.CallFromMainThread([trop_name = std::move(trop_name)]()
+					{
+						if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+						{
+							manager->create<rsx::overlays::trophy_list_dialog>()->show(trop_name);
+						}
+					});
+					return page_navigation::stay;
+				});
+			}
+
 			std::unique_ptr<overlay_element> screenshot = std::make_unique<home_menu_entry>(get_localized_string(localized_string_id::HOME_MENU_SCREENSHOT));
 			add_item(screenshot, [](pad_button btn) -> page_navigation
 			{