Clean up nameplates #9284

SollyBunny · 2024-11-26T16:50:55Z

Checklist

Tested the change ingame
Provided screenshots if it is a visual change
Tested in combination with possibly related configuration options
Written a unit test (especially base/) or added coverage to integration test
Considered possible null pointers and out of bounds array indexing
Changed no physics that affect existing maps
Tested the change with ASan+UBSan or valgrind's memcheck (optional)

Stuff changed

Combine friend icon, id and name onto single line
Combine hook strength icon and id onto single line
Allow nameplate sizes to go to -50 (0 is too big)
Moved scoreboard config from nameplates to HUD
Added headers for strength indicator and directions, they now show regardless of nameplate on/off
Seperated nameplate options unaffected by "Show nameplates" into other headers

Screenshots

SollyBunny · 2024-11-26T16:52:05Z

~~Holdon, don't look yet~~
~~I can't fix the transparency not being set correctly on outlines for TextRender()->Text()~~

src/base/system.cpp

furo321

Combine hook strength icon and id onto single line, now uses clan size

This should not be scaled by the clan size, that's just confusing.

Allow nameplate size to go to -50 (0 is too big)

This feels really niche, I don't think that 0 is too big. I tried -50 and the nameplates are microscopic.

src/engine/shared/config_variables.h

datasrc/content.py

furo321 · 2024-11-27T11:09:00Z

src/game/client/components/nameplates.h

@@ -35,6 +35,8 @@ struct SPlayerNamePlate
 	char m_aClan[MAX_CLAN_LENGTH];
 	STextContainerIndex m_ClanTextContainerIndex;
 	float m_ClanTextFontSize;
+
+	float m_Zoom, m_ZoomClan;


If I understand correctly, the goal is that the text is supposed to look "high quality" while zoomed in? I tried zooming a bit in game and the text quality is changing back and forth while doing it, which looks super weird and leads to lag spikes on low zooms.

It will also become desynced if you use zoom.

It was laggy when I made it scale by the zoom level, but when I changed it to the target zoom it stopped being laggy. I think this should be a thing, but the current implementation must, from your experience, be wrong

I've removed this and now everything is rendered at the same zoom level. I don't like it but atleast its consistent.

Thanks, that looks a lot better.

SollyBunny · 2024-11-27T12:46:06Z

@furo321

[Hook strength] should not be scaled by the clan size, that's just confusing.

Other than making a new variable to control it, I didn't know what else to use. Since it appears above the clan using the name size looked off, and I wanted it to scale rather than it being as big as it was

[0 to -50 nameplate sizes] feels really niche, I don't think that 0 is too small. I tried -50 and the nameplates are microscopic.

Me and someone in the TClient server wanted to have smaller nameplates, I thought why not let it be microscopic since 1. it's still visible 2. why not let the user do it, its kinda funny 3. the change is visible in the preview

furo321 · 2024-11-27T13:14:54Z

Other than making a new variable to control it, I didn't know what else to use. Since it appears above the clan using the name size looked off, and I wanted it to scale rather than it being as big as it was

Then make a new variable. Using the clan size variable is confusing due to the name of it, and clan visibility is also optional.

src/game/client/components/menus_settings.cpp

src/game/client/components/nameplates.cpp

src/game/client/components/nameplates.h

src/game/client/components/nameplates.cpp

src/game/client/components/menus_settings.cpp

furo321

Currently name plates are always rendered for yourself, which should only be the case if cl_nameplates_own is enabled.

furo321 · 2024-11-28T10:57:46Z

src/engine/shared/config_variables.h

 MACRO_CONFIG_INT(ClNameplatesOwn, cl_nameplates_own, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show own name plate (useful for demo recording)")
 MACRO_CONFIG_INT(ClNameplatesFriendMark, cl_nameplates_friendmark, 0, 0, 1, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show friend mark (♥) in name plates")
 MACRO_CONFIG_INT(ClNameplatesStrong, cl_nameplates_strong, 0, 0, 2, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Show strong/weak in name plates (0 - off, 1 - icons, 2 - icons + numbers)")
+MACRO_CONFIG_INT(ClNameplatesStrongSize, cl_nameplates_strong_size, 30, -50, 100, CFGFLAG_CLIENT | CFGFLAG_SAVE, "Size of strong/weak state icons and numbers")


Default value should be 50, to match the old default size.

I think the default size is too large since normally you are only looking at if it's green or red

src/engine/client/client.cpp

src/game/client/components/controls.cpp

src/game/client/components/menus_settings.cpp

src/game/client/components/nameplates.h

src/game/client/components/nameplates.cpp

Robyt3 · 2024-11-28T20:07:05Z

src/game/client/components/nameplates.cpp

+		if(OtherTeam)
+			Data.Alpha *= (float)g_Config.m_ClShowOthersAlpha / 100.0f;
+	}
+	// if (Data.Alpha <= 0.05f) return;


Remove dead code

Oops I meant to uncomment that and then also ask you about this.
It will attempt to render nameplates which are fully transparent which is a waste of time. I didn't know if I should just do == 0.0f or have a threshold

The textrender already skips rendering transparent quads so I think this is unnecessary optimization.

But it does alot of work other than rendering

Compile in release mode and do some benchmarks if you think it matters.

src/game/client/components/nameplates.cpp

Robyt3 · 2024-11-28T20:09:27Z

src/game/client/components/nameplates.cpp

+
+void CNameplates::RenderNameplate(SNameplate &NamePlate, SRenderNameplatedata Data)
+{
+	// if (Data.Alpha <= 0.05f) return;


Remove dead code

src/engine/shared/config_variables.h

Robyt3

Can we render the preview nameplates at the same size as the ingame nameplates? Looks like the preview nameplates are larger than the ingame nameplates, probably because the ingame screen size is different than the UI screen size.

github-advanced-security bot found potential problems Nov 26, 2024

View reviewed changes

src/base/system.cpp Fixed Show resolved Hide resolved

SollyBunny force-pushed the nameplate_fixes branch 3 times, most recently from ff9c74c to 27129e9 Compare November 26, 2024 20:09

github-advanced-security bot found potential problems Nov 26, 2024

View reviewed changes

src/base/system.cpp Fixed Show resolved Hide resolved

Jupeyy reviewed Nov 27, 2024

View reviewed changes

src/base/system.cpp Outdated Show resolved Hide resolved

furo321 reviewed Nov 27, 2024

View reviewed changes

Robyt3 requested changes Nov 27, 2024

View reviewed changes

SollyBunny force-pushed the nameplate_fixes branch 2 times, most recently from 070d0bf to c3ca2b4 Compare November 27, 2024 23:31

SollyBunny requested review from Robyt3 and furo321 November 28, 2024 08:00

furo321 reviewed Nov 28, 2024

View reviewed changes

Robyt3 requested changes Nov 28, 2024

View reviewed changes

Robyt3 reviewed Nov 28, 2024

View reviewed changes

src/engine/shared/config_variables.h Show resolved Hide resolved

SollyBunny force-pushed the nameplate_fixes branch 8 times, most recently from 1c3f5de to b7cb166 Compare November 30, 2024 13:51

SollyBunny requested a review from Robyt3 November 30, 2024 15:31

Nameplate rework

faada04

SollyBunny force-pushed the nameplate_fixes branch from b7cb166 to faada04 Compare November 30, 2024 17:37

Robyt3 reviewed Nov 30, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up nameplates #9284

Clean up nameplates #9284

SollyBunny commented Nov 26, 2024 •

edited

Loading

SollyBunny commented Nov 26, 2024 •

edited

Loading

furo321 left a comment •

edited

Loading

furo321 Nov 27, 2024

SollyBunny Nov 27, 2024

SollyBunny Nov 28, 2024

furo321 Nov 28, 2024

SollyBunny commented Nov 27, 2024

furo321 commented Nov 27, 2024

furo321 left a comment

furo321 Nov 28, 2024

SollyBunny Nov 29, 2024

Robyt3 Nov 28, 2024

SollyBunny Nov 29, 2024

Robyt3 Nov 30, 2024

SollyBunny Nov 30, 2024

Robyt3 Nov 30, 2024

Robyt3 Nov 28, 2024

Robyt3 left a comment

Clean up nameplates #9284

Are you sure you want to change the base?

Clean up nameplates #9284

Conversation

SollyBunny commented Nov 26, 2024 • edited Loading

Checklist

Stuff changed

Screenshots

SollyBunny commented Nov 26, 2024 • edited Loading

furo321 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SollyBunny commented Nov 27, 2024

furo321 commented Nov 27, 2024

furo321 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Robyt3 left a comment

Choose a reason for hiding this comment

SollyBunny commented Nov 26, 2024 •

edited

Loading

SollyBunny commented Nov 26, 2024 •

edited

Loading

furo321 left a comment •

edited

Loading