mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-23 04:22:34 +00:00
- fixed compilation
This commit is contained in:
parent
bde3558dc2
commit
3491182ac3
2 changed files with 2 additions and 3 deletions
|
@ -1190,7 +1190,6 @@ public:
|
|||
{
|
||||
if (forceWidth < 0) dx -= (texture->GetDisplayWidthDouble()/2.0)-texture->GetDisplayLeftOffsetDouble();
|
||||
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();
|
||||
else dy -= forceHeight*(0.5-(texture->GetDisplayTopOffsetDouble()/texture->GetDisplayHeightDouble()));
|
||||
|
|
|
@ -57,7 +57,7 @@ bool FWarpTexture::CheckModified (FRenderStyle style)
|
|||
const uint32_t *FWarpTexture::GetPixelsBgra()
|
||||
{
|
||||
auto Pixels = GetPixels(DefaultRenderStyle());
|
||||
if (PixelsBgra.empty() || GenTime[0] != GenTimeBgra)
|
||||
if (PixelsBgra.Size() == 0 || GenTime[0] != GenTimeBgra)
|
||||
{
|
||||
CreatePixelsBgraWithMipmaps();
|
||||
for (int i = 0; i < GetWidth() * GetHeight(); i++)
|
||||
|
@ -70,7 +70,7 @@ const uint32_t *FWarpTexture::GetPixelsBgra()
|
|||
GenerateBgraMipmapsFast();
|
||||
GenTimeBgra = GenTime[0];
|
||||
}
|
||||
return PixelsBgra.data();
|
||||
return PixelsBgra.Data();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue