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

Merge pull request #1890 from Dune-jr/fix-uid-blend

Browse source 
Properly blend UID in chat
This commit is contained in:
oy 2018-12-17 15:47:08 +01:00 committed by GitHub
parent b1a6d9e3f0 171f1c39d3
commit db03a488da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/client/components/chat.cpp
View file

@ -909,9 +909,10 @@ void CChat::OnRender()
if(Line.m_Mode == CHAT_WHISPER && Line.m_ClientID == m_pClient->m_LocalClientID && Line.m_TargetID >= 0) if(Line.m_Mode == CHAT_WHISPER && Line.m_ClientID == m_pClient->m_LocalClientID && Line.m_TargetID >= 0)
NameCID = Line.m_TargetID; NameCID = Line.m_TargetID;
vec4 IdTextColor = vec4(0.1f*Blend, 0.1f*Blend, 0.1f*Blend, 1.0f*Blend);
vec4 BgIdColor = TextColor; vec4 BgIdColor = TextColor;
BgIdColor.a = 0.5f; BgIdColor.a = 0.5f*Blend;
RenderTools()->DrawClientID(TextRender(), &Cursor, NameCID, BgIdColor); RenderTools()->DrawClientID(TextRender(), &Cursor, NameCID, BgIdColor, IdTextColor);
str_format(aBuf, sizeof(aBuf), "%s: ", Line.m_aName); str_format(aBuf, sizeof(aBuf), "%s: ", Line.m_aName);
TextRender()->TextShadowed(&Cursor, aBuf, -1, ShadowOffset, ShadowColor, TextColor); TextRender()->TextShadowed(&Cursor, aBuf, -1, ShadowOffset, ShadowColor, TextColor);
} }

3
src/game/client/render.cpp
View file

@ -621,8 +621,7 @@ void CRenderTools::DrawClientID(ITextRender* pTextRender, CTextCursor* pCursor,
pCursor->m_X += (ID < 10 ? 0.04f: 0.0f) * FontSize; pCursor->m_X += (ID < 10 ? 0.04f: 0.0f) * FontSize;
// TODO: make a simple text one (no shadow) // TODO: make a simple text one (no shadow)
pTextRender->TextShadowed(pCursor, aBuff, -1, vec2(0,0), vec4(0,0,0,0), pTextRender->TextShadowed(pCursor, aBuff, -1, vec2(0,0), vec4(0,0,0,0), TextColor);
vec4(0.1f, 0.1f, 0.1f, 1.0f));
pCursor->m_X = PrevX + Rect.w + 0.2f * FontSize; pCursor->m_X = PrevX + Rect.w + 0.2f * FontSize;
} }