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

Merge pull request #7890 from Robyt3/Voting-Hud-Improvement

Browse source 
Improve voting HUD, refactoring
This commit is contained in:
Dennis Felsing 2024-02-01 08:41:58 +00:00 committed by GitHub
parent 3133676abb 1955905a19
commit 2ed899a259
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 121 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/game/client/components/hud.cpp
View file

@ -562,57 +562,6 @@ void CHud::RenderTeambalanceWarning()
}
}
void CHud::RenderVoting()
{
if((!g_Config.m_ClShowVotesAfterVoting && !m_pClient->m_Scoreboard.Active() && m_pClient->m_Voting.TakenChoice()) || !m_pClient->m_Voting.IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
return;
Graphics()->DrawRect(-10, 60 - 2, 100 + 10 + 4 + 5, 46, ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_ALL, 5.0f);
TextRender()->TextColor(TextRender()->DefaultTextColor());
CTextCursor Cursor;
char aBuf[512];
str_format(aBuf, sizeof(aBuf), Localize("%ds left"), m_pClient->m_Voting.SecondsLeft());
float tw = TextRender()->TextWidth(6, aBuf, -1, -1.0f);
TextRender()->SetCursor(&Cursor, 5.0f + 100.0f - tw, 60.0f, 6.0f, TEXTFLAG_RENDER);
TextRender()->TextEx(&Cursor, aBuf, -1);
TextRender()->SetCursor(&Cursor, 5.0f, 60.0f, 6.0f, TEXTFLAG_RENDER);
Cursor.m_LineWidth = 100.0f - tw;
Cursor.m_MaxLines = 3;
TextRender()->TextEx(&Cursor, m_pClient->m_Voting.VoteDescription(), -1);
// reason
str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), m_pClient->m_Voting.VoteReason());
TextRender()->SetCursor(&Cursor, 5.0f, 79.0f, 6.0f, TEXTFLAG_RENDER | TEXTFLAG_STOP_AT_END);
Cursor.m_LineWidth = 100.0f;
TextRender()->TextEx(&Cursor, aBuf, -1);
CUIRect Base = {5, 88, 100, 4};
m_pClient->m_Voting.RenderBars(Base, false);
char aKey[64];
m_pClient->m_Binds.GetKey("vote yes", aKey, sizeof(aKey));
str_format(aBuf, sizeof(aBuf), "%s - %s", aKey, Localize("Vote yes"));
Base.y += Base.h;
Base.h = 12.0f;
if(m_pClient->m_Voting.TakenChoice() == 1)
TextRender()->TextColor(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f));
UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_ML);
TextRender()->TextColor(TextRender()->DefaultTextColor());
m_pClient->m_Binds.GetKey("vote no", aKey, sizeof(aKey));
str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), aKey);
if(m_pClient->m_Voting.TakenChoice() == -1)
TextRender()->TextColor(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f));
UI()->DoLabel(&Base, aBuf, 6.0f, TEXTALIGN_MR);
TextRender()->TextColor(TextRender()->DefaultTextColor());
}
void CHud::RenderCursor()
{
if(!m_pClient->m_Snap.m_pLocalCharacter || Client()->State() == IClient::STATE_DEMOPLAYBACK)
@ -1497,7 +1446,7 @@ void CHud::OnRender()
if(Client()->State() != IClient::STATE_DEMOPLAYBACK)
RenderConnectionWarning();
RenderTeambalanceWarning();
RenderVoting();
m_pClient->m_Voting.Render();
if(g_Config.m_ClShowRecord)
RenderRecord();
}

196
src/game/client/components/voting.cpp
View file

@ -1,13 +1,16 @@
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
#include <engine/shared/config.h>
#include "voting.h"
#include <engine/shared/config.h>
#include <engine/textrender.h>
#include <game/client/components/scoreboard.h>
#include <game/client/components/sounds.h>
#include <game/client/gameclient.h>
#include <game/client/render.h>
#include <game/generated/protocol.h>
#include <game/client/gameclient.h>
#include <game/localization.h>
void CVoting::ConCallvote(IConsole::IResult *pResult, void *pUserData)
{
@ -139,12 +142,7 @@ void CVoting::Vote(int v)
CVoting::CVoting()
{
ClearOptions();
m_Closetime = 0;
m_aDescription[0] = 0;
m_aReason[0] = 0;
m_Yes = m_No = m_Pass = m_Total = 0;
m_Voted = 0;
OnReset();
}
void CVoting::AddOption(const char *pDescription)
@ -177,6 +175,37 @@ void CVoting::AddOption(const char *pDescription)
++m_NumVoteOptions;
}
void CVoting::RemoveOption(const char *pDescription)
{
for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
{
if(str_comp(pOption->m_aDescription, pDescription) == 0)
{
// remove it from the list
if(m_pFirst == pOption)
m_pFirst = m_pFirst->m_pNext;
if(m_pLast == pOption)
m_pLast = m_pLast->m_pPrev;
if(pOption->m_pPrev)
pOption->m_pPrev->m_pNext = pOption->m_pNext;
if(pOption->m_pNext)
pOption->m_pNext->m_pPrev = pOption->m_pPrev;
--m_NumVoteOptions;
// add it to recycle list
pOption->m_pNext = 0;
pOption->m_pPrev = m_pRecycleLast;
if(pOption->m_pPrev)
pOption->m_pPrev->m_pNext = pOption;
m_pRecycleLast = pOption;
if(!m_pRecycleFirst)
m_pRecycleLast = pOption;
break;
}
}
}
void CVoting::ClearOptions()
{
m_Heap.Reset();
@ -191,7 +220,7 @@ void CVoting::ClearOptions()
void CVoting::OnReset()
{
m_Closetime = 0;
m_Opentime = m_Closetime = 0;
m_aDescription[0] = 0;
m_aReason[0] = 0;
m_Yes = m_No = m_Pass = m_Total = 0;
@ -214,6 +243,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
{
str_copy(m_aDescription, pMsg->m_pDescription);
str_copy(m_aReason, pMsg->m_pReason);
m_Opentime = time();
m_Closetime = time() + time_freq() * pMsg->m_Timeout;
if(Client()->RconAuthed())
@ -271,34 +301,7 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
else if(MsgType == NETMSGTYPE_SV_VOTEOPTIONREMOVE)
{
CNetMsg_Sv_VoteOptionRemove *pMsg = (CNetMsg_Sv_VoteOptionRemove *)pRawMsg;
for(CVoteOptionClient *pOption = m_pFirst; pOption; pOption = pOption->m_pNext)
{
if(str_comp(pOption->m_aDescription, pMsg->m_pDescription) == 0)
{
// remove it from the list
if(m_pFirst == pOption)
m_pFirst = m_pFirst->m_pNext;
if(m_pLast == pOption)
m_pLast = m_pLast->m_pPrev;
if(pOption->m_pPrev)
pOption->m_pPrev->m_pNext = pOption->m_pNext;
if(pOption->m_pNext)
pOption->m_pNext->m_pPrev = pOption->m_pPrev;
--m_NumVoteOptions;
// add it to recycle list
pOption->m_pNext = 0;
pOption->m_pPrev = m_pRecycleLast;
if(pOption->m_pPrev)
pOption->m_pPrev->m_pNext = pOption;
m_pRecycleLast = pOption;
if(!m_pRecycleFirst)
m_pRecycleLast = pOption;
break;
}
}
RemoveOption(pMsg->m_pDescription);
}
else if(MsgType == NETMSGTYPE_SV_YOURVOTE)
{
@ -307,62 +310,93 @@ void CVoting::OnMessage(int MsgType, void *pRawMsg)
}
}
void CVoting::OnRender()
void CVoting::Render()
{
if((!g_Config.m_ClShowVotesAfterVoting && !m_pClient->m_Scoreboard.Active() && TakenChoice()) || !IsVoting() || Client()->State() == IClient::STATE_DEMOPLAYBACK)
return;
const int Seconds = SecondsLeft();
if(Seconds < 0)
{
OnReset();
return;
}
CUIRect View = {0.0f, 60.0f, 120.0f, 38.0f};
View.Draw(ColorRGBA(0.0f, 0.0f, 0.0f, 0.4f), IGraphics::CORNER_R, 3.0f);
View.Margin(3.0f, &View);
SLabelProperties Props;
Props.m_EllipsisAtEnd = true;
char aBuf[256];
str_format(aBuf, sizeof(aBuf), Localize("%ds left"), Seconds);
CUIRect Row, LeftColumn, RightColumn, ProgressSpinner;
View.HSplitTop(6.0f, &Row, &View);
Row.VSplitRight(TextRender()->TextWidth(6.0f, aBuf), &LeftColumn, &RightColumn);
LeftColumn.VSplitRight(2.0f, &LeftColumn, nullptr);
LeftColumn.VSplitRight(6.0f, &LeftColumn, &ProgressSpinner);
LeftColumn.VSplitRight(2.0f, &LeftColumn, nullptr);
SProgressSpinnerProperties ProgressProps;
ProgressProps.m_Progress = clamp((time() - m_Opentime) / (float)(m_Closetime - m_Opentime), 0.0f, 1.0f);
UI()->RenderProgressSpinner(ProgressSpinner.Center(), ProgressSpinner.h / 2.0f, ProgressProps);
UI()->DoLabel(&RightColumn, aBuf, 6.0f, TEXTALIGN_MR);
Props.m_MaxWidth = LeftColumn.w;
UI()->DoLabel(&LeftColumn, VoteDescription(), 6.0f, TEXTALIGN_ML, Props);
View.HSplitTop(3.0f, nullptr, &View);
View.HSplitTop(6.0f, &Row, &View);
str_format(aBuf, sizeof(aBuf), "%s %s", Localize("Reason:"), VoteReason());
Props.m_MaxWidth = Row.w;
UI()->DoLabel(&Row, aBuf, 6.0f, TEXTALIGN_ML, Props);
View.HSplitTop(3.0f, nullptr, &View);
View.HSplitTop(4.0f, &Row, &View);
RenderBars(Row);
View.HSplitTop(3.0f, nullptr, &View);
View.HSplitTop(6.0f, &Row, &View);
Row.VSplitMid(&LeftColumn, &RightColumn, 4.0f);
char aKey[64];
m_pClient->m_Binds.GetKey("vote yes", aKey, sizeof(aKey));
str_format(aBuf, sizeof(aBuf), "%s - %s", aKey, Localize("Vote yes"));
TextRender()->TextColor(TakenChoice() == 1 ? ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f) : TextRender()->DefaultTextColor());
UI()->DoLabel(&LeftColumn, aBuf, 6.0f, TEXTALIGN_ML);
m_pClient->m_Binds.GetKey("vote no", aKey, sizeof(aKey));
str_format(aBuf, sizeof(aBuf), "%s - %s", Localize("Vote no"), aKey);
TextRender()->TextColor(TakenChoice() == -1 ? ColorRGBA(0.95f, 0.25f, 0.25f, 0.85f) : TextRender()->DefaultTextColor());
UI()->DoLabel(&RightColumn, aBuf, 6.0f, TEXTALIGN_MR);
TextRender()->TextColor(TextRender()->DefaultTextColor());
}
void CVoting::RenderBars(CUIRect Bars, bool Text)
void CVoting::RenderBars(CUIRect Bars) const
{
Bars.Draw(ColorRGBA(0.8f, 0.8f, 0.8f, 0.5f), IGraphics::CORNER_ALL, Bars.h / 3);
Bars.Draw(ColorRGBA(0.8f, 0.8f, 0.8f, 0.5f), IGraphics::CORNER_ALL, Bars.h / 2.0f);
CUIRect Splitter = Bars;
Splitter.x = Splitter.x + Splitter.w / 2;
Splitter.w = Splitter.h / 2.0f;
Splitter.x -= Splitter.w / 2;
Splitter.Draw(ColorRGBA(0.4f, 0.4f, 0.4f, 0.5f), IGraphics::CORNER_ALL, Splitter.h / 4);
CUIRect Splitter;
Bars.VMargin((Bars.w - 2.0f) / 2.0f, &Splitter);
Splitter.Draw(ColorRGBA(0.4f, 0.4f, 0.4f, 0.5f), IGraphics::CORNER_NONE, 0.0f);
if(m_Total)
{
CUIRect PassArea = Bars;
if(m_Yes)
{
CUIRect YesArea = Bars;
YesArea.w *= m_Yes / (float)m_Total;
YesArea.Draw(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
if(Text)
{
char aBuf[256];
str_from_int(m_Yes, aBuf);
UI()->DoLabel(&YesArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
}
PassArea.x += YesArea.w;
PassArea.w -= YesArea.w;
CUIRect YesArea;
Bars.VSplitLeft(Bars.w * m_Yes / m_Total, &YesArea, nullptr);
YesArea.Draw(ColorRGBA(0.2f, 0.9f, 0.2f, 0.85f), IGraphics::CORNER_ALL, YesArea.h / 2.0f);
}
if(m_No)
{
CUIRect NoArea = Bars;
NoArea.w *= m_No / (float)m_Total;
NoArea.x = (Bars.x + Bars.w) - NoArea.w;
NoArea.Draw(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f), IGraphics::CORNER_ALL, Bars.h / 3);
if(Text)
{
char aBuf[256];
str_from_int(m_No, aBuf);
UI()->DoLabel(&NoArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
}
PassArea.w -= NoArea.w;
}
if(Text && m_Pass)
{
char aBuf[256];
str_from_int(m_Pass, aBuf);
UI()->DoLabel(&PassArea, aBuf, Bars.h * 0.75f, TEXTALIGN_MC);
CUIRect NoArea;
Bars.VSplitRight(Bars.w * m_No / m_Total, nullptr, &NoArea);
NoArea.Draw(ColorRGBA(0.9f, 0.2f, 0.2f, 0.85f), IGraphics::CORNER_ALL, NoArea.h / 2.0f);
}
}
}

7
src/game/client/components/voting.h
View file

@ -18,6 +18,7 @@ class CVoting : public CComponent
static void ConCallvote(IConsole::IResult *pResult, void *pUserData);
static void ConVote(IConsole::IResult *pResult, void *pUserData);
int64_t m_Opentime;
int64_t m_Closetime;
char m_aDescription[VOTE_DESC_LENGTH];
char m_aReason[VOTE_REASON_LENGTH];
@ -25,9 +26,12 @@ class CVoting : public CComponent
int m_Yes, m_No, m_Pass, m_Total;
void AddOption(const char *pDescription);
void RemoveOption(const char *pDescription);
void ClearOptions();
void Callvote(const char *pType, const char *pValue, const char *pReason);
void RenderBars(CUIRect Bars) const;
public:
int m_NumVoteOptions;
CVoteOptionClient *m_pFirst;
@ -41,9 +45,8 @@ public:
virtual void OnReset() override;
virtual void OnConsoleInit() override;
virtual void OnMessage(int Msgtype, void *pRawMsg) override;
virtual void OnRender() override;
void RenderBars(CUIRect Bars, bool Text);
void Render();
void CallvoteSpectate(int ClientID, const char *pReason, bool ForceVote = false);
void CallvoteKick(int ClientID, const char *pReason, bool ForceVote = false);