edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3636

Browse source 
3636: Fix scoreboard overlapping r=def- a=Jupeyy

Dunno if its ok, i increased the scoreboard a bit, bcs its already pretty tight and i didnt want to decrease the space for name/clan

old:
![screenshot_2021-02-21_12-35-51](https://user-images.githubusercontent.com/6654924/108623842-71732580-7441-11eb-9167-fb830ed267a1.png)

new:
![screenshot_2021-02-21_12-35-55](https://user-images.githubusercontent.com/6654924/108623844-76d07000-7441-11eb-9f34-8b09d18dcbd2.png)

new with way too long names(clamps them as expected):
![screenshot_2021-02-21_12-37-13](https://user-images.githubusercontent.com/6654924/108623855-89e34000-7441-11eb-8676-91e4cde40691.png)

new with many players, uses full space on 5:4:
![screenshot_2021-02-21_12-36-11](https://user-images.githubusercontent.com/6654924/108623859-8e0f5d80-7441-11eb-8ffd-8217f7635e83.png)

![screenshot_2021-02-21_12-51-50](https://user-images.githubusercontent.com/6654924/108624206-abddc200-7443-11eb-8b3c-ba5e25af9301.png)


vanilla team(saves space by not using timestamp as score), but also uses nearly all space nowon 5:4:
![screenshot_2021-02-21_12-35-10](https://user-images.githubusercontent.com/6654924/108623869-a41d1e00-7441-11eb-9605-9859dd331c1d.png)


## Checklist

- [x] Tested the change ingame (still possible i oversaw a edge case obv.)
- [x] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] 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](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2021-02-21 15:48:18 +00:00 committed by GitHub
parent c48bd41f66 05dfc51770
commit a1fb94c6b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/game/client/components/scoreboard.cpp
View file

@ -172,6 +172,8 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
else if(Team == -8) else if(Team == -8)
upper24 = true; upper24 = true;
bool IsTeamplayTeam = Team > TEAM_SPECTATORS;
if(Team < -1) if(Team < -1)
Team = 0; Team = 0;
@ -254,7 +256,6 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
} }
// calculate measurements // calculate measurements
x += 10.0f;
float LineHeight = 60.0f; float LineHeight = 60.0f;
float TeeSizeMod = 1.0f; float TeeSizeMod = 1.0f;
float Spacing = 16.0f; float Spacing = 16.0f;
@ -291,14 +292,20 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
RoundRadius = 15.0f; RoundRadius = 15.0f;
} }
float ScoreOffset = x + 10.0f, ScoreLength = TextRender()->TextWidth(0, FontSize, "00:00:00", -1, -1.0f); float ScoreOffset = x + 10.0f + 10.0f, ScoreLength = TextRender()->TextWidth(0, FontSize, "00:00:00", -1, -1.0f);
if(IsTeamplayTeam)
ScoreLength = TextRender()->TextWidth(0, FontSize, "99999", -1, -1.0f);
float TeeOffset = ScoreOffset + ScoreLength + 15.0f, TeeLength = 60 * TeeSizeMod; float TeeOffset = ScoreOffset + ScoreLength + 15.0f, TeeLength = 60 * TeeSizeMod;
float NameOffset = TeeOffset + TeeLength, NameLength = 300.0f - TeeLength; float NameOffset = TeeOffset + TeeLength, NameLength = 300.0f - TeeLength;
float PingOffset = x + 610.0f, PingLength = 65.0f; float CountryLength = (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f;
float CountryOffset = PingOffset - (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f, CountryLength = (LineHeight - Spacing - TeeSizeMod * 5.0f) * 2.0f; float PingLength = 65.0f;
float ClanOffset = x + 360.0f, ClanLength = 240.0f - CountryLength; float PingOffset = x + w - PingLength - 10.0f - 10.0f;
float CountryOffset = PingOffset - CountryLength;
float ClanLength = w - ((NameOffset - x) + NameLength) - (w - (CountryOffset - x));
float ClanOffset = CountryOffset - ClanLength;
// render headlines // render headlines
x += 10.0f;
y += 50.0f; y += 50.0f;
float HeadlineFontsize = 22.0f; float HeadlineFontsize = 22.0f;
const char *pScore = (m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard) ? Localize("Time") : Localize("Score"); const char *pScore = (m_pClient->m_GameInfo.m_TimeScore && g_Config.m_ClDDRaceScoreBoard) ? Localize("Time") : Localize("Score");
@ -308,7 +315,7 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
TextRender()->Text(0, NameOffset, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Name"), -1.0f); TextRender()->Text(0, NameOffset, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Name"), -1.0f);
tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Clan"), -1, -1.0f); tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Clan"), -1, -1.0f);
TextRender()->Text(0, ClanOffset + ClanLength / 2 - tw / 2, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Clan"), -1.0f); TextRender()->Text(0, ClanOffset + (ClanLength - tw) / 2, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Clan"), -1.0f);
tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Ping"), -1, -1.0f); tw = TextRender()->TextWidth(0, HeadlineFontsize, Localize("Ping"), -1, -1.0f);
TextRender()->Text(0, PingOffset + PingLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Ping"), -1.0f); TextRender()->Text(0, PingOffset + PingLength - tw, y + (HeadlineFontsize * 2.f - HeadlineFontsize) / 2.f, HeadlineFontsize, Localize("Ping"), -1.0f);
@ -491,8 +498,8 @@ void CScoreboard::RenderScoreboard(float x, float y, float w, int Team, const ch
else else
TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f); TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);
tw = TextRender()->TextWidth(nullptr, FontSize, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1, -1.0f); tw = minimum(TextRender()->TextWidth(nullptr, FontSize, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1, -1.0f), ClanLength);
TextRender()->SetCursor(&Cursor, ClanOffset + ClanLength / 2 - tw / 2, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END); TextRender()->SetCursor(&Cursor, ClanOffset + (ClanLength - tw) / 2, y + (LineHeight - FontSize) / 2.f, FontSize, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
Cursor.m_LineWidth = ClanLength; Cursor.m_LineWidth = ClanLength;
TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1); TextRender()->TextEx(&Cursor, m_pClient->m_aClients[pInfo->m_ClientID].m_aClan, -1);
@ -609,7 +616,8 @@ void CScoreboard::OnRender()
Graphics()->MapScreen(0, 0, Width, Height); Graphics()->MapScreen(0, 0, Width, Height);
float w = 700.0f; float w = 750.0f;
float ExtraWidthSingle = 20.0f;
if(m_pClient->m_Snap.m_pGameInfoObj) if(m_pClient->m_Snap.m_pGameInfoObj)
{ {
@ -632,7 +640,8 @@ void CScoreboard::OnRender()
} }
else else
{ {
RenderScoreboard(Width / 2 - w / 2, 150.0f, w, 0, 0); w += ExtraWidthSingle;
RenderScoreboard(Width / 2 - w / 2, 150.0f, w, -2, 0);
} }
} }
else else
@ -664,6 +673,9 @@ void CScoreboard::OnRender()
TextRender()->Text(0, Width / 2 - w / 2, 39, 86.0f, aText, -1.0f); TextRender()->Text(0, Width / 2 - w / 2, 39, 86.0f, aText, -1.0f);
} }
//decrease width, because team games use additional offsets
w -= 10.0f;
int NumPlayers = maximum(m_pClient->m_Snap.m_aTeamSize[TEAM_RED], m_pClient->m_Snap.m_aTeamSize[TEAM_BLUE]); int NumPlayers = maximum(m_pClient->m_Snap.m_aTeamSize[TEAM_RED], m_pClient->m_Snap.m_aTeamSize[TEAM_BLUE]);
RenderScoreboard(Width / 2 - w - 5.0f, 150.0f, w, TEAM_RED, pRedClanName ? pRedClanName : Localize("Red team"), NumPlayers); RenderScoreboard(Width / 2 - w - 5.0f, 150.0f, w, TEAM_RED, pRedClanName ? pRedClanName : Localize("Red team"), NumPlayers);
RenderScoreboard(Width / 2 + 5.0f, 150.0f, w, TEAM_BLUE, pBlueClanName ? pBlueClanName : Localize("Blue team"), NumPlayers); RenderScoreboard(Width / 2 + 5.0f, 150.0f, w, TEAM_BLUE, pBlueClanName ? pBlueClanName : Localize("Blue team"), NumPlayers);