mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Merge #5334
5334: fix pixel porridge in freeze and ninja bar r=Jupeyy a=C0D3D3V fixes #5319 ## Checklist - [x] Tested the change ingame - [ ] 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 - [x] Considered possible null pointers and out of bounds array indexing - [x] Changed no physics that affect existing maps - [x] 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: c0d3d3v <c0d3d3v@mag-keinen-spam.de>
This commit is contained in:
bors[bot]
GitHub
commit
36d0c0dcb4
|
|
@ -50,13 +50,6 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
const float EndProgressProportion = EndProgressWidth / ProgressBarWidth;
|
||||
const float MiddleProgressProportion = MiddleBarWidth / ProgressBarWidth;
|
||||
|
||||
// we cut 2% of all sides of all sprites so we don't get edge bleeding
|
||||
const float CutL = 0.02f;
|
||||
const float CutR = 0.98f;
|
||||
const float CutT = 0.02f;
|
||||
const float CutB = 0.98f;
|
||||
const float Slice = 0.02f;
|
||||
|
||||
// beginning piece
|
||||
float BeginningPieceProgress = 1;
|
||||
if(Progress <= EndProgressProportion)
|
||||
|
|
@ -65,11 +58,12 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
}
|
||||
|
||||
// full
|
||||
Graphics()->WrapClamp();
|
||||
Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudFreezeBarFullLeft);
|
||||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: top_l, top_m, btm_m, btm_l
|
||||
Graphics()->QuadsSetSubsetFree(CutL, CutT, RestPct + (ProgPct - CutL) * BeginningPieceProgress, CutT, RestPct + (ProgPct - CutL) * BeginningPieceProgress, CutB, CutL, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(0, 0, RestPct + ProgPct * BeginningPieceProgress, 0, RestPct + ProgPct * BeginningPieceProgress, 1, 0, 1);
|
||||
IGraphics::CQuadItem QuadFullBeginning(x, y, EndRestWidth + EndProgressWidth * BeginningPieceProgress, BarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadFullBeginning, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -81,7 +75,7 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: top_m, top_l, btm_l, btm_m | it is mirrored on the horizontal axe and rotated 180 degrees
|
||||
Graphics()->QuadsSetSubsetFree(ProgPct - (ProgPct - CutL) * BeginningPieceProgress, CutT, CutL, CutT, CutL, CutB, ProgPct - (ProgPct - CutL) * BeginningPieceProgress, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(ProgPct - ProgPct * BeginningPieceProgress, 0, 0, 0, 0, 1, ProgPct - ProgPct * BeginningPieceProgress, 1);
|
||||
IGraphics::CQuadItem QuadEmptyBeginning(x + EndRestWidth + EndProgressWidth * BeginningPieceProgress, y, EndProgressWidth * (1.0f - BeginningPieceProgress), BarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadEmptyBeginning, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -115,12 +109,12 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
{
|
||||
// prevent pixel puree, select only a small slice
|
||||
// Subset: top_l, top_m, btm_m, btm_l
|
||||
Graphics()->QuadsSetSubsetFree(CutL, CutT, CutL + Slice, CutT, CutL + Slice, CutB, CutL, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(0, 0, FullMiddleBarWidth / EndWidth, 0, FullMiddleBarWidth / EndWidth, 1, 0, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Subset: top_l, top_r, btm_r, btm_l
|
||||
Graphics()->QuadsSetSubsetFree(CutL, CutT, CutR, CutT, CutR, CutB, CutL, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(0, 0, 1, 0, 1, 1, 0, 1);
|
||||
}
|
||||
IGraphics::CQuadItem QuadFull(x, y, FullMiddleBarWidth, BarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadFull, 1);
|
||||
|
|
@ -135,12 +129,12 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
{
|
||||
// prevent pixel puree, select only a small slice
|
||||
// Subset: top_m, top_l, btm_l, btm_m | it is mirrored on the horizontal axe and rotated 180 degrees
|
||||
Graphics()->QuadsSetSubsetFree(CutL + Slice, CutT, CutL, CutT, CutL, CutB, CutL + Slice, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(EmptyMiddleBarWidth / EndWidth, 0, 0, 0, 0, 1, EmptyMiddleBarWidth / EndWidth, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Subset: top_r, top_l, btm_l, btm_r | it is mirrored on the horizontal axe and rotated 180 degrees
|
||||
Graphics()->QuadsSetSubsetFree(CutR, CutT, CutL, CutT, CutL, CutB, CutR, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1, 0, 0, 0, 0, 1, 1, 1);
|
||||
}
|
||||
|
||||
IGraphics::CQuadItem QuadEmpty(x + FullMiddleBarWidth, y, EmptyMiddleBarWidth, BarHeight);
|
||||
|
|
@ -168,7 +162,7 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: top_r, top_m, btm_m, btm_r | it is mirrored on the horizontal axe and rotated 180 degrees
|
||||
Graphics()->QuadsSetSubsetFree(CutR, CutT, CutR - (ProgPct - CutL) * EndingPieceProgress, CutT, CutR - (ProgPct - CutL) * EndingPieceProgress, CutB, CutR, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1, 0, 1.0f - ProgPct * EndingPieceProgress, 0, 1.0f - ProgPct * EndingPieceProgress, 1, 1, 1);
|
||||
IGraphics::CQuadItem QuadFullEnding(x, y, EndProgressWidth * EndingPieceProgress, BarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadFullEnding, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -178,13 +172,14 @@ void CFreezeBars::RenderFreezeBarPos(float x, const float y, const float width,
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: top_m, top_r, btm_r, btm_m
|
||||
Graphics()->QuadsSetSubsetFree(ProgPct - (ProgPct - CutL) * (1.0f - EndingPieceProgress), CutT, CutR, CutT, CutR, CutB, ProgPct - (ProgPct - CutL) * (1.0f - EndingPieceProgress), CutB);
|
||||
Graphics()->QuadsSetSubsetFree(ProgPct - ProgPct * (1.0f - EndingPieceProgress), 0, 1, 0, 1, 1, ProgPct - ProgPct * (1.0f - EndingPieceProgress), 1);
|
||||
IGraphics::CQuadItem QuadEmptyEnding(x + EndProgressWidth * EndingPieceProgress, y, EndProgressWidth * (1.0f - EndingPieceProgress) + EndRestWidth, BarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadEmptyEnding, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
||||
Graphics()->QuadsSetSubset(0, 0, 1, 1);
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
|
||||
Graphics()->WrapNormal();
|
||||
}
|
||||
|
||||
inline bool CFreezeBars::IsPlayerInfoAvailable(int ClientID) const
|
||||
|
|
|
|||
|
|
@ -1127,13 +1127,6 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
const float EndProgressProportion = EndProgressHeight / ProgressBarHeight;
|
||||
const float MiddleProgressProportion = MiddleBarHeight / ProgressBarHeight;
|
||||
|
||||
// we cut 2% of all sides of all sprites so we don't get edge bleeding
|
||||
const float CutL = 0.02f;
|
||||
const float CutR = 0.98f;
|
||||
const float CutT = 0.02f;
|
||||
const float CutB = 0.98f;
|
||||
const float Slice = 0.02f;
|
||||
|
||||
// beginning piece
|
||||
float BeginningPieceProgress = 1;
|
||||
if(Progress <= 1)
|
||||
|
|
@ -1148,11 +1141,12 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
}
|
||||
}
|
||||
// empty
|
||||
Graphics()->WrapClamp();
|
||||
Graphics()->TextureSet(m_pClient->m_HudSkin.m_SpriteHudNinjaBarEmptyRight);
|
||||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: btm_r, top_r, top_m, btm_m | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutR, CutB, CutR, CutT, ProgPct - (ProgPct - CutL) * (1.0f - BeginningPieceProgress), CutT, ProgPct - (ProgPct - CutL) * (1.0f - BeginningPieceProgress), CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, ProgPct - ProgPct * (1.0f - BeginningPieceProgress), 0, ProgPct - ProgPct * (1.0f - BeginningPieceProgress), 1);
|
||||
IGraphics::CQuadItem QuadEmptyBeginning(x, y, BarWidth, EndRestHeight + EndProgressHeight * (1.0f - BeginningPieceProgress));
|
||||
Graphics()->QuadsDrawTL(&QuadEmptyBeginning, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -1163,7 +1157,7 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: btm_m, top_m, top_r, btm_r | it is rotated 90 degrees clockwise
|
||||
Graphics()->QuadsSetSubsetFree(RestPct + (ProgPct - CutL) * (1.0f - BeginningPieceProgress), CutB, RestPct + (ProgPct - CutL) * (1.0f - BeginningPieceProgress), CutT, CutR, CutT, CutR, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(RestPct + ProgPct * (1.0f - BeginningPieceProgress), 1, RestPct + ProgPct * (1.0f - BeginningPieceProgress), 0, 1, 0, 1, 1);
|
||||
IGraphics::CQuadItem QuadFullBeginning(x, y + (EndRestHeight + EndProgressHeight * (1.0f - BeginningPieceProgress)), BarWidth, EndProgressHeight * BeginningPieceProgress);
|
||||
Graphics()->QuadsDrawTL(&QuadFullBeginning, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -1199,12 +1193,12 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
{
|
||||
// prevent pixel puree, select only a small slice
|
||||
// Subset: btm_r, top_r, top_m, btm_m | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutR, CutB, CutR, CutT, CutR - Slice, CutT, CutR - Slice, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, 1.0f - (EmptyMiddleBarHeight / EndHeight), 0, 1.0f - (EmptyMiddleBarHeight / EndHeight), 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Subset: btm_r, top_r, top_l, btm_l | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutR, CutB, CutR, CutT, CutL, CutT, CutL, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1, 1, 1, 0, 0, 0, 0, 1);
|
||||
}
|
||||
IGraphics::CQuadItem QuadEmpty(x, y, BarWidth, EmptyMiddleBarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadEmpty, 1);
|
||||
|
|
@ -1220,12 +1214,12 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
{
|
||||
// prevent pixel puree, select only a small slice
|
||||
// Subset: btm_m, top_m, top_r, btm_r | it is rotated 90 degrees clockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutR - Slice, CutB, CutR - Slice, CutT, CutR, CutT, CutR, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(1.0f - (FullMiddleBarHeight / EndHeight), 1, 1.0f - (FullMiddleBarHeight / EndHeight), 0, 1, 0, 1, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Subset: btm_l, top_l, top_r, btm_r | it is rotated 90 degrees clockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutL, CutB, CutL, CutT, CutR, CutT, CutR, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(0, 1, 0, 0, 1, 0, 1, 1);
|
||||
}
|
||||
IGraphics::CQuadItem QuadFull(x, y + EmptyMiddleBarHeight, BarWidth, FullMiddleBarHeight);
|
||||
Graphics()->QuadsDrawTL(&QuadFull, 1);
|
||||
|
|
@ -1245,7 +1239,7 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: btm_l, top_l, top_m, btm_m | it is rotated 90 degrees clockwise
|
||||
Graphics()->QuadsSetSubsetFree(CutL, CutB, CutL, CutT, ProgPct - (ProgPct - CutL) * EndingPieceProgress, CutT, ProgPct - (ProgPct - CutL) * EndingPieceProgress, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(0, 1, 0, 0, ProgPct - ProgPct * EndingPieceProgress, 0, ProgPct - ProgPct * EndingPieceProgress, 1);
|
||||
IGraphics::CQuadItem QuadEmptyEnding(x, y, BarWidth, EndProgressHeight * (1.0f - EndingPieceProgress));
|
||||
Graphics()->QuadsDrawTL(&QuadEmptyEnding, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
|
@ -1255,13 +1249,14 @@ void CHud::RenderNinjaBarPos(const float x, float y, const float width, const fl
|
|||
Graphics()->QuadsBegin();
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, Alpha);
|
||||
// Subset: btm_m, top_m, top_l, btm_l | it is mirrored on the horizontal axe and rotated 90 degrees counterclockwise
|
||||
Graphics()->QuadsSetSubsetFree(RestPct + (ProgPct - CutL) * EndingPieceProgress, CutB, RestPct + (ProgPct - CutL) * EndingPieceProgress, CutT, CutL, CutT, CutL, CutB);
|
||||
Graphics()->QuadsSetSubsetFree(RestPct + ProgPct * EndingPieceProgress, 1, RestPct + ProgPct * EndingPieceProgress, 0, 0, 0, 0, 1);
|
||||
IGraphics::CQuadItem QuadFullEnding(x, y + (EndProgressHeight * (1.0f - EndingPieceProgress)), BarWidth, EndRestHeight + EndProgressHeight * EndingPieceProgress);
|
||||
Graphics()->QuadsDrawTL(&QuadFullEnding, 1);
|
||||
Graphics()->QuadsEnd();
|
||||
|
||||
Graphics()->QuadsSetSubset(0, 0, 1, 1);
|
||||
Graphics()->SetColor(1.f, 1.f, 1.f, 1.f);
|
||||
Graphics()->WrapNormal();
|
||||
}
|
||||
|
||||
void CHud::RenderDummyActions()
|
||||
|
|
|
|||
Loading…
Reference in a new issue