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

Minor refactoring of emoticon selector rendering

Browse source 
- Extract variable `ScreenCenter`.
- Rename variables `i` to `Emote`.
- Move variable declarations closer to their usages.
This commit is contained in:
Robert Müller 2024-08-22 21:40:10 +02:00
parent 3bda76ff1f
commit ed9720f1be
1 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/game/client/components/emoticon.cpp
View file

@ -137,6 +137,8 @@ void CEmoticon::OnRender()
else if(length(m_SelectorMouse) > 40.0f) else if(length(m_SelectorMouse) > 40.0f)
m_SelectedEyeEmote = (int)(SelectedAngle / (2 * pi) * NUM_EMOTES); m_SelectedEyeEmote = (int)(SelectedAngle / (2 * pi) * NUM_EMOTES);
const vec2 ScreenCenter = Screen.Center();
Ui()->MapScreen(); Ui()->MapScreen();
Graphics()->BlendNormal(); Graphics()->BlendNormal();
@ -144,26 +146,22 @@ void CEmoticon::OnRender()
Graphics()->TextureClear(); Graphics()->TextureClear();
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(0, 0, 0, 0.3f); Graphics()->SetColor(0, 0, 0, 0.3f);
Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 190.0f, 64); Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 190.0f, 64);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
Graphics()->WrapClamp(); Graphics()->WrapClamp();
for(int i = 0; i < NUM_EMOTICONS; i++) for(int Emote = 0; Emote < NUM_EMOTICONS; Emote++)
{ {
float Angle = 2 * pi * i / NUM_EMOTICONS; float Angle = 2 * pi * Emote / NUM_EMOTICONS;
if(Angle > pi) if(Angle > pi)
Angle -= 2 * pi; Angle -= 2 * pi;
bool Selected = m_SelectedEmote == i; Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[Emote]);
float Size = Selected ? 80.0f : 50.0f;
Graphics()->TextureSet(GameClient()->m_EmoticonsSkin.m_aSpriteEmoticons[i]);
Graphics()->QuadsSetSubset(0, 0, 1, 1); Graphics()->QuadsSetSubset(0, 0, 1, 1);
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
const vec2 Nudge = direction(Angle) * 150.0f; const vec2 Nudge = direction(Angle) * 150.0f;
IGraphics::CQuadItem QuadItem(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y, Size, Size); const float Size = m_SelectedEmote == Emote ? 80.0f : 50.0f;
IGraphics::CQuadItem QuadItem(ScreenCenter.x + Nudge.x, ScreenCenter.y + Nudge.y, Size, Size);
Graphics()->QuadsDraw(&QuadItem, 1); Graphics()->QuadsDraw(&QuadItem, 1);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
} }
@ -174,34 +172,32 @@ void CEmoticon::OnRender()
Graphics()->TextureClear(); Graphics()->TextureClear();
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(1.0, 1.0, 1.0, 0.3f); Graphics()->SetColor(1.0, 1.0, 1.0, 0.3f);
Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 100.0f, 64); Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 100.0f, 64);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_aLocalIds[g_Config.m_ClDummy]].m_RenderInfo; CTeeRenderInfo TeeInfo = m_pClient->m_aClients[m_pClient->m_aLocalIds[g_Config.m_ClDummy]].m_RenderInfo;
for(int i = 0; i < NUM_EMOTES; i++) for(int Emote = 0; Emote < NUM_EMOTES; Emote++)
{ {
float Angle = 2 * pi * i / NUM_EMOTES; float Angle = 2 * pi * Emote / NUM_EMOTES;
if(Angle > pi) if(Angle > pi)
Angle -= 2 * pi; Angle -= 2 * pi;
const bool Selected = m_SelectedEyeEmote == i;
const vec2 Nudge = direction(Angle) * 70.0f; const vec2 Nudge = direction(Angle) * 70.0f;
TeeInfo.m_Size = Selected ? 64.0f : 48.0f; TeeInfo.m_Size = m_SelectedEyeEmote == Emote ? 64.0f : 48.0f;
RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, i, vec2(-1, 0), vec2(Screen.w / 2 + Nudge.x, Screen.h / 2 + Nudge.y)); RenderTools()->RenderTee(CAnimState::GetIdle(), &TeeInfo, Emote, vec2(-1, 0), ScreenCenter + Nudge);
} }
Graphics()->TextureClear(); Graphics()->TextureClear();
Graphics()->QuadsBegin(); Graphics()->QuadsBegin();
Graphics()->SetColor(0, 0, 0, 0.3f); Graphics()->SetColor(0, 0, 0, 0.3f);
Graphics()->DrawCircle(Screen.w / 2, Screen.h / 2, 30.0f, 64); Graphics()->DrawCircle(ScreenCenter.x, ScreenCenter.y, 30.0f, 64);
Graphics()->QuadsEnd(); Graphics()->QuadsEnd();
} }
else else
m_SelectedEyeEmote = -1; m_SelectedEyeEmote = -1;
RenderTools()->RenderCursor(m_SelectorMouse + vec2(Screen.w, Screen.h) / 2, 24.0f); RenderTools()->RenderCursor(ScreenCenter + m_SelectorMouse, 24.0f);
} }
void CEmoticon::Emote(int Emoticon) void CEmoticon::Emote(int Emoticon)