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

make pixel alignment numerical more robust

Browse source
This commit is contained in:
Jupeyy 2021-05-02 10:32:05 +02:00
parent 3becd45ea6
commit fc1b87785f
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/engine/client/text.cpp
View file

@ -877,8 +877,8 @@ public:
FakeToScreenX = (Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0));
FakeToScreenY = (Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
int ActualX = (int)(pCursor->m_X * FakeToScreenX);
int ActualY = (int)(pCursor->m_Y * FakeToScreenY);
int ActualX = (int)((pCursor->m_X * FakeToScreenX) + 0.5f);
int ActualY = (int)((pCursor->m_Y * FakeToScreenY) + 0.5f);
CursorX = ActualX / FakeToScreenX;
CursorY = ActualY / FakeToScreenY;
@ -1004,8 +1004,8 @@ public:
DrawY += Size;
if((m_RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
++LineCount;
if(pCursor->m_MaxLines > 0 && LineCount > pCursor->m_MaxLines)
@ -1082,8 +1082,8 @@ public:
DrawY += Size;
if((m_RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
GotNewLine = 1;
GotNewLineLast = 1;
@ -1149,8 +1149,8 @@ public:
FakeToScreenX = (Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0));
FakeToScreenY = (Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
int ActualX = (int)(pCursor->m_X * FakeToScreenX);
int ActualY = (int)(pCursor->m_Y * FakeToScreenY);
int ActualX = (int)((pCursor->m_X * FakeToScreenX) + 0.5f);
int ActualY = (int)((pCursor->m_Y * FakeToScreenY) + 0.5f);
TextContainer.m_AlignedStartX = ActualX / FakeToScreenX;
TextContainer.m_AlignedStartY = ActualY / FakeToScreenY;
@ -1228,8 +1228,8 @@ public:
FakeToScreenX = (Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0));
FakeToScreenY = (Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
int ActualX = (int)(pCursor->m_X * FakeToScreenX);
int ActualY = (int)(pCursor->m_Y * FakeToScreenY);
int ActualX = (int)((pCursor->m_X * FakeToScreenX) + 0.5f);
int ActualY = (int)((pCursor->m_Y * FakeToScreenY) + 0.5f);
CursorX = ActualX / FakeToScreenX;
CursorY = ActualY / FakeToScreenY;
@ -1329,8 +1329,8 @@ public:
DrawY += Size;
if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
++LineCount;
if(pCursor->m_MaxLines > 0 && LineCount > pCursor->m_MaxLines)
@ -1438,8 +1438,8 @@ public:
DrawY += Size;
if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
GotNewLine = 1;
GotNewLineLast = 1;
@ -1627,8 +1627,8 @@ public:
DrawY += Size;
if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
++LineCount;
if(TextContainer.m_MaxLines > 0 && LineCount > TextContainer.m_MaxLines)
@ -1686,8 +1686,8 @@ public:
DrawY += Size;
if((RenderFlags & TEXT_RENDER_FLAG_NO_PIXEL_ALIGMENT) == 0)
{
DrawX = (int)(DrawX * FakeToScreenX) / FakeToScreenX; // realign
DrawY = (int)(DrawY * FakeToScreenY) / FakeToScreenY;
DrawX = (int)((DrawX * FakeToScreenX) + 0.5f) / FakeToScreenX; // realign
DrawY = (int)((DrawY * FakeToScreenY) + 0.5f) / FakeToScreenY;
}
++LineCount;
}
@ -1818,8 +1818,8 @@ public:
{
float FakeToScreenX = (Graphics()->ScreenWidth() / (ScreenX1 - ScreenX0));
float FakeToScreenY = (Graphics()->ScreenHeight() / (ScreenY1 - ScreenY0));
int ActualX = (int)((TextContainer.m_X + X) * FakeToScreenX);
int ActualY = (int)((TextContainer.m_Y + Y) * FakeToScreenY);
int ActualX = (int)(((TextContainer.m_X + X) * FakeToScreenX) + 0.5f);
int ActualY = (int)(((TextContainer.m_Y + Y) * FakeToScreenY) + 0.5f);
float AlignedX = ActualX / FakeToScreenX;
float AlignedY = ActualY / FakeToScreenY;
X = AlignedX - TextContainer.m_AlignedStartX;