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

Fix DoLabelStreamed by using offsets, instead of rebuilding when x,y changes

Browse source
This commit is contained in:
Jupeyy 2023-01-07 10:59:32 +01:00
parent 73ce7598fa
commit 7815be7b75
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/game/client/ui.cpp
View file

@ -51,27 +51,28 @@ void CUIElement::SUIElementRect::Reset()
void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int Corners, float Rounding) void CUIElement::SUIElementRect::Draw(const CUIRect *pRect, ColorRGBA Color, int Corners, float Rounding)
{ {
bool NeedsRecreate = false; bool NeedsRecreate = false;
if(m_UIRectQuadContainer == -1 || m_X != pRect->x || m_Y != pRect->y || m_Width != pRect->w || m_Height != pRect->h || mem_comp(&m_QuadColor, &Color, sizeof(Color)) != 0) if(m_UIRectQuadContainer == -1 || m_Width != pRect->w || m_Height != pRect->h || mem_comp(&m_QuadColor, &Color, sizeof(Color)) != 0)
{ {
if(m_UIRectQuadContainer != -1) if(m_UIRectQuadContainer != -1)
m_pParent->UI()->Graphics()->DeleteQuadContainer(m_UIRectQuadContainer); m_pParent->UI()->Graphics()->DeleteQuadContainer(m_UIRectQuadContainer);
NeedsRecreate = true; NeedsRecreate = true;
} }
if(NeedsRecreate)
{
m_X = pRect->x; m_X = pRect->x;
m_Y = pRect->y; m_Y = pRect->y;
if(NeedsRecreate)
{
m_Width = pRect->w; m_Width = pRect->w;
m_Height = pRect->h; m_Height = pRect->h;
m_QuadColor = Color; m_QuadColor = Color;
m_pParent->UI()->Graphics()->SetColor(Color); m_pParent->UI()->Graphics()->SetColor(Color);
m_UIRectQuadContainer = m_pParent->UI()->Graphics()->CreateRectQuadContainer(pRect->x, pRect->y, pRect->w, pRect->h, Rounding, Corners); m_UIRectQuadContainer = m_pParent->UI()->Graphics()->CreateRectQuadContainer(0, 0, pRect->w, pRect->h, Rounding, Corners);
m_pParent->UI()->Graphics()->SetColor(1, 1, 1, 1); m_pParent->UI()->Graphics()->SetColor(1, 1, 1, 1);
} }
m_pParent->UI()->Graphics()->TextureClear(); m_pParent->UI()->Graphics()->TextureClear();
m_pParent->UI()->Graphics()->RenderQuadContainer(m_UIRectQuadContainer, -1); m_pParent->UI()->Graphics()->RenderQuadContainerEx(m_UIRectQuadContainer,
0, -1, m_X, m_Y, 1, 1);
} }
/******************************************************** /********************************************************
@ -593,7 +594,7 @@ void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, float x, float y,
{ {
bool NeedsRecreate = false; bool NeedsRecreate = false;
bool ColorChanged = RectEl.m_TextColor != TextRender()->GetTextColor() || RectEl.m_TextOutlineColor != TextRender()->GetTextOutlineColor(); bool ColorChanged = RectEl.m_TextColor != TextRender()->GetTextColor() || RectEl.m_TextOutlineColor != TextRender()->GetTextOutlineColor();
if(RectEl.m_UITextContainer == -1 || RectEl.m_X != x || RectEl.m_Y != y || RectEl.m_Width != w || RectEl.m_Height != h || ColorChanged) if(RectEl.m_UITextContainer == -1 || RectEl.m_Width != w || RectEl.m_Height != h || ColorChanged)
{ {
NeedsRecreate = true; NeedsRecreate = true;
} }
@ -610,12 +611,12 @@ void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, float x, float y,
NeedsRecreate = true; NeedsRecreate = true;
} }
} }
RectEl.m_X = x;
RectEl.m_Y = y;
if(NeedsRecreate) if(NeedsRecreate)
{ {
TextRender()->DeleteTextContainer(RectEl.m_UITextContainer); TextRender()->DeleteTextContainer(RectEl.m_UITextContainer);
RectEl.m_X = x;
RectEl.m_Y = y;
RectEl.m_Width = w; RectEl.m_Width = w;
RectEl.m_Height = h; RectEl.m_Height = h;
@ -627,8 +628,8 @@ void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, float x, float y,
RectEl.m_Text.clear(); RectEl.m_Text.clear();
CUIRect TmpRect; CUIRect TmpRect;
TmpRect.x = x; TmpRect.x = 0;
TmpRect.y = y; TmpRect.y = 0;
TmpRect.w = w; TmpRect.w = w;
TmpRect.h = h; TmpRect.h = h;
@ -642,7 +643,10 @@ void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, float x, float y,
ColorRGBA ColorText(RectEl.m_TextColor); ColorRGBA ColorText(RectEl.m_TextColor);
ColorRGBA ColorTextOutline(RectEl.m_TextOutlineColor); ColorRGBA ColorTextOutline(RectEl.m_TextOutlineColor);
if(RectEl.m_UITextContainer != -1) if(RectEl.m_UITextContainer != -1)
TextRender()->RenderTextContainer(RectEl.m_UITextContainer, ColorText, ColorTextOutline); {
TextRender()->RenderTextContainer(RectEl.m_UITextContainer,
ColorText, ColorTextOutline, x, y);
}
} }
void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, float MaxWidth, int AlignVertically, bool StopAtEnd, int StrLen, const CTextCursor *pReadCursor) void CUI::DoLabelStreamed(CUIElement::SUIElementRect &RectEl, const CUIRect *pRect, const char *pText, float Size, int Align, float MaxWidth, int AlignVertically, bool StopAtEnd, int StrLen, const CTextCursor *pReadCursor)