Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trophy pop-up and viewer enhancements #2493

Merged
merged 8 commits into from
Feb 23, 2025

Conversation

rainmakerv3
Copy link
Contributor

Partially addresses #2461

Trophy pop-up

  1. show icon for trophy rarity next to the trophy art
  2. center all elements vertically
  3. minor spacing adjustments

Trophy viewer

  1. show icon for trophy rarity instead of text
  2. remove the hardcoded newlines that were being imported into the viewer from the XML
  3. align left instead of center for trophy descriptions

Images, though patterned after the PS4 trophy icons, are originally modelled by discord user Tlarok. They are packaged inside the AppImage for Linux, inside the app bundle for Mac, and in a separate Resources folder which is packaged in the other builds, and copied by CMake command in the binary folder for locally compiled builds

sample photos:

Trophy pop-up (main):
plat main

Trophy pop-up (PR):
plat PR

Trophy viewer (main):
viewer main

Trophy viewer (PR):
viewer PR

@georgemoralis
Copy link
Collaborator

seems fancy :D

@diegolix29
Copy link
Contributor

Tbh i dont like the two icons one next to the other. Seems odd. Should be one icon then the info and then the other one. If not looks too busy for the eye.

@GHU7924
Copy link

GHU7924 commented Feb 21, 2025

I agree with @diegolix29 about the icons. I suggest options (for example):

Version 1
V1

Version 2
V2
If anyone has any other options, then suggest it.

Or, if possible, do something like a double animation, but so far I do not know if it will look good.

  1. First, a sound is heard and such an icon is displayed for about a second, and then disappears.
    Part1
    or
    Part1v2

  2. Then the achievement is displayed, but without sound.
    Part2

P.S. Although actually, I think we can limit ourselves to just the changes for the Trophy Viewer.

@aminenr-hub
Copy link

aminenr-hub commented Feb 21, 2025

the second version looks better to me . also adding the ability to add custom audio file for the notification sound like rpcs3 would be awesome too

@VeraPhobia
Copy link

VeraPhobia commented Feb 21, 2025

OMG, you are a god.

version 2 looks better imo as well.

thanks a lot

rainmakerv3 and others added 2 commits February 22, 2025 12:29
Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

Update build.yml

test
@rainmakerv3
Copy link
Contributor Author

rainmakerv3 commented Feb 22, 2025

Applied squidbus' review comments regarding formatting of build workflow and Cmake command, adjusted layout as per suggestions to the ff:
new

Sound for trophy pop up will not part be of this PR, have to read up on that first and then will make another PR if its something I can do

@squidbus
Copy link
Collaborator

Only other thing I have to add is, I'm not a big fan of having these extra resources next to the executable file, especially since until now the SDL builds were basically standalone files. I would prefer if we could maybe embed them in and reference as a byte array variable similar to how we do the host_shaders here.

@rainmakerv3
Copy link
Contributor Author

Only other thing I have to add is, I'm not a big fan of having these extra resources next to the executable file, especially since until now the SDL builds were basically standalone files. I would prefer if we could maybe embed them in and reference as a byte array variable similar to how we do the host_shaders here.

This seems to embed each file as a header file in the exe if I'm understanding right. It is a bit beyond my current knowledge, but I'll try my best to apply it

@squidbus
Copy link
Collaborator

This seems to embed each file as a header file in the exe if I'm understanding right. It is a bit beyond my current knowledge, but I'll try my best to apply it

Yes, basically it results in headers with a variable for each file's contents, then if you want to load that file you can just reference that in-memory array instead of reading from file.

@rainmakerv3
Copy link
Contributor Author

I have embedded the files in the exe as asked, using this handy cmake script: https://github.com/vector-of-bool/cmrc

This should address all the comments and suggestions so far.

@squidbus
Copy link
Collaborator

Will let others weigh in on the UI, but looks good to me now as far as my concerns went.

@jardon
Copy link
Contributor

jardon commented Feb 22, 2025

a couple things:

  1. what are those changes in the github actions? theyre just version bumps but are they related to the changes in the PR
  2. where did those trophy icons come from?

@jardon
Copy link
Contributor

jardon commented Feb 22, 2025

whats in your PR looks good. theres also the option to go with a layout more similar to an actual PS4 notification

image

@georgemoralis
Copy link
Collaborator

without the ps logo pls

@VeraPhobia
Copy link

whats in your PR looks good. theres also the option to go with a layout more similar to an actual PS4 notification

call me crazy but i thing the PR looks better than the way PS4 looks

@aminenr-hub
Copy link

aminenr-hub commented Feb 22, 2025

whats in your PR looks good. theres also the option to go with a layout more similar to an actual PS4 notification

call me crazy but i thing the PR looks better than the way PS4 looks

my thought exactly , they could refine it more to look like the ps5 one which looks pretty good ( by also making the notification box a bit longer for trophy names that are a bit longer )
image

@VeraPhobia
Copy link

my thought exactly , they could refine it more to look like the ps5 one which looks pretty good ( by also making the notification box a bit longer for prophy names that are abit longer )

i feel if we continue it might get into subjective preference territory :) but i agree with the idea of making it a little longer just in case since that seems to be the reason why ps4 and ps5 notifications have that much free space

@aminenr-hub
Copy link

aminenr-hub commented Feb 22, 2025

my thought exactly , they could refine it more to look like the ps5 one which looks pretty good ( by also making the notification box a bit longer for prophy names that are abit longer )

i feel if we continue it might get into subjective preference territory :) but i agree with the idea of making it a little longer just in case since that seems to be the reason why ps4 and ps5 notifications have that much free space

true i m just happy we gettihng a trophy makeover for the emulator lol , since i do like to trophy hunt
image
( this is playnite + successstory-plugin that has support for shadps4 )

@rainmakerv3
Copy link
Contributor Author

rainmakerv3 commented Feb 22, 2025

a couple things:

  1. what are those changes in the github actions? theyre just version bumps but are they related to the changes in the PR
  2. where did those trophy icons come from?
  1. It's actually identical to this CI: Use Qt 6.9.0 + Update CMake Cache #2487. When I began the PR I was using the build doc prior to this version bump, then I made certain changes in the original verison of the PR, but I reverted them to address squidbus comments. The easiest way for me to revert was to just grab the build.yml from the repo, which is updated with the version bumps. therefore, this has no effect on main, it just shows up as changes to the PR

  2. As I said in the initial description, though they are patterned after the ps icons, these are originally 3D-modelled by Tlarok, a regular in the shadps4 discord

In response to the comments, some trophy names are really long like this one for grim fandango (It's like I'm not happy unless I'm breathing in the thick, black, nauseating fumes...), so the text box would have to really long to fit everything in one line. Right now, it's at a certain width, but the text will automatically wrap to the next line if the title is too long, so it will always fit

I like the PR a bit better than the PS layout as well though I would admit there could a bit of bias in there :p

@georgemoralis georgemoralis merged commit 22ca57b into shadps4-emu:main Feb 23, 2025
12 checks passed
@aminenr-hub
Copy link

image
just downloaded the latest nightly build which has this pr merged as the change-log mentioned but i m still getting the old trophies list with no trophy icons .

@VeraPhobia
Copy link

same for me on windows

@jardon
Copy link
Contributor

jardon commented Feb 23, 2025

why are those trophy icons not in src/images?

@rainmakerv3 rainmakerv3 deleted the TrophyStuff branch February 23, 2025 13:34
@rainmakerv3
Copy link
Contributor Author

rainmakerv3 commented Feb 23, 2025

Something was wrong with the embedded icons for a lot of people so I need to work on it a bit more.

the icons were put in another folder because of a method I used previously which depended on a function that iterates over a certain directory (which I might have to use again since the method I ended up with is not working). I suppose we can put them in src/images/Resources of something similar but personally, I think it's okay to have them in their own folder since they are not really intended to be used by anything other than the embedding function. Either way should be functionally fine though (once I get it to actually work that is)

diegolix29 added a commit to diegolix29/shadPS4 that referenced this pull request Feb 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants