Skip to content

WebGL: show status icons closer above names again and emoji on top #3983

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.

Sign up for GitHub

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

Merged
evanpelle merged 1 commit into from
May 22, 2026
Merged

WebGL: show status icons closer above names again and emoji on top #3983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/render/gl/passes/name-pass/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,8 +546,8 @@ export class NamePass {
this.maxPlayers,
ambient,
);
this.iconProgram.draw(cameraMatrix, this.settings, this.vao);
this.statusIconProgram.draw(cameraMatrix, this.settings, this.vao);
this.iconProgram.draw(cameraMatrix, this.settings, this.vao);

if (this.settings.passEnabled.nameDebug) {
this.debugProgram.draw(cameraMatrix, this.settings, this.vao);
Expand Down
2 changes: 1 addition & 1 deletion src/client/render/gl/render-settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"outlineUsePlayerColor": false,
"fillUsePlayerColor": true,
"emojiRowOffset": 1.4,
"statusRowOffset": 2.5
"statusRowOffset": 1.4
},
"fx": {
"shockwaveRingWidth": 0.04,
Expand Down
5 changes: 3 additions & 2 deletions src/client/render/gl/shaders/name/status-icon.vert.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,11 @@ void main() {
// Read player data
vec4 pd0 = texelFetch(uPlayerData, ivec2(0, playerIdx), 0); // srcX, srcY, srcScale, startTime
vec4 pd1 = texelFetch(uPlayerData, ivec2(1, playerIdx), 0); // tgtX, tgtY, tgtScale, alive
vec4 pd4 = texelFetch(uPlayerData, ivec2(4, playerIdx), 0); // flagIdx, emojiIdx, [free], [free]
vec4 pd7 = texelFetch(uPlayerData, ivec2(7, playerIdx), 0); // nukeTargetsMe, traitorRemainingTicks, allianceFraction, [free]

// Early out: dead player
if (pd1.w <= 0.0) {
// Early out: dead player OR emoji is active
if (pd1.w <= 0.0 || pd4.y >= 0.0) {
gl_Position = vec4(0.0);
vUV = vec2(0.0);
vLocalUV = vec2(0.0);
Expand Down
Loading