zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 04:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed status bar drawer to pass the texture offsets to the low level code instead of adding them itself.

Browse source 
This is needed for rotating around the pivot point, if the offset is applied here the low level code cannot do the rotation properly anymore.
This commit is contained in:
Christoph Oelckers 2020-07-24 21:08:33 +02:00
parent a4ef7596e7
commit e2de6d9dc3
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/core/statusbar.cpp
View file

@ -465,18 +465,19 @@ void DBaseStatusBar::DrawGraphic(FGameTexture* tex, double x, double y, int flag
x += drawOffset.X;
y += drawOffset.Y;
double xo = 0, yo = 0;
switch (flags & DI_ITEM_HMASK)
{
case DI_ITEM_HCENTER: x -= boxwidth / 2; break;
case DI_ITEM_RIGHT: x -= boxwidth; break;
case DI_ITEM_HOFFSET: x -= tex->GetDisplayLeftOffset() * boxwidth / texwidth; break;
case DI_ITEM_HCENTER: xo = texwidth / 2; break;
case DI_ITEM_RIGHT: xo = texwidth; break;
case DI_ITEM_HOFFSET: xo = tex->GetDisplayLeftOffset(); break;
}
switch (flags & DI_ITEM_VMASK)
{
case DI_ITEM_VCENTER: y -= boxheight / 2; break;
case DI_ITEM_BOTTOM: y -= boxheight; break;
case DI_ITEM_VOFFSET: y -= tex->GetDisplayTopOffset() * boxheight / texheight; break;
case DI_ITEM_VCENTER: yo = texheight / 2; break;
case DI_ITEM_BOTTOM: yo = texheight; break;
case DI_ITEM_VOFFSET: yo = tex->GetDisplayTopOffset(); break;
}
if (!fullscreenOffsets)
@ -513,9 +514,10 @@ void DBaseStatusBar::DrawGraphic(FGameTexture* tex, double x, double y, int flag
x += orgx;
y += orgy;
}
// Now reapply the texture offsets. We will need them
DrawTexture(twod, tex, x, y,
DTA_TopOffset, 0,
DTA_LeftOffset, 0,
DTA_TopOffsetF, yo,
DTA_LeftOffsetF, xo,
DTA_DestWidthF, boxwidth,
DTA_DestHeightF, boxheight,
DTA_Color, color,