zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-28 23:11:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed compilation

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-07 02:21:39 +01:00
parent bde3558dc2
commit 3491182ac3
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_statusbar/sbarinfo.cpp
View file

@ -1190,7 +1190,6 @@ public:
{ {
if (forceWidth < 0) dx -= (texture->GetDisplayWidthDouble()/2.0)-texture->GetDisplayLeftOffsetDouble(); if (forceWidth < 0) dx -= (texture->GetDisplayWidthDouble()/2.0)-texture->GetDisplayLeftOffsetDouble();
else dx -= forceWidth*(0.5-(texture->GetDisplayLeftOffsetDouble()/texture->GetDisplayWidthDouble())); else dx -= forceWidth*(0.5-(texture->GetDisplayLeftOffsetDouble()/texture->GetDisplayWidthDouble()));
//Unoptimalized ^^formula is dx -= forceWidth/2.0-(texture->GetScaledLeftOffsetDouble()*forceWidth/texture->GetDisplayWidthDouble());
if (forceHeight < 0) dy -= (texture->GetDisplayHeightDouble()/2.0)-texture->GetDisplayTopOffsetDouble(); if (forceHeight < 0) dy -= (texture->GetDisplayHeightDouble()/2.0)-texture->GetDisplayTopOffsetDouble();
else dy -= forceHeight*(0.5-(texture->GetDisplayTopOffsetDouble()/texture->GetDisplayHeightDouble())); else dy -= forceHeight*(0.5-(texture->GetDisplayTopOffsetDouble()/texture->GetDisplayHeightDouble()));

4
src/swrenderer/textures/warptexture.cpp
View file

@ -57,7 +57,7 @@ bool FWarpTexture::CheckModified (FRenderStyle style)
const uint32_t *FWarpTexture::GetPixelsBgra() const uint32_t *FWarpTexture::GetPixelsBgra()
{ {
auto Pixels = GetPixels(DefaultRenderStyle()); auto Pixels = GetPixels(DefaultRenderStyle());
if (PixelsBgra.empty() || GenTime[0] != GenTimeBgra) if (PixelsBgra.Size() == 0 || GenTime[0] != GenTimeBgra)
{ {
CreatePixelsBgraWithMipmaps(); CreatePixelsBgraWithMipmaps();
for (int i = 0; i < GetWidth() * GetHeight(); i++) for (int i = 0; i < GetWidth() * GetHeight(); i++)
@ -70,7 +70,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra()
GenerateBgraMipmapsFast(); GenerateBgraMipmapsFast();
GenTimeBgra = GenTime[0]; GenTimeBgra = GenTime[0];
} }
return PixelsBgra.data(); return PixelsBgra.Data();
} }