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

- fixed: texture upscaling was disabled by default.

Browse source 
It should only be disabled if the scale of a texture is greater than 2.
This commit is contained in:
Christoph Oelckers 2020-05-25 20:41:47 +02:00
parent 3e8f53e98c
commit 29344006a0
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/textures/gametexture.cpp
View file

@ -430,7 +430,7 @@ CUSTOM_CVAR(Int, r_spriteadjust, 2, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
float FTexCoordInfo::RowOffset(float rowoffset) const float FTexCoordInfo::RowOffset(float rowoffset) const
{ {
float scale = fabs(mScale.Y); float scale = fabsf(mScale.Y);
if (scale == 1.f || mWorldPanning) return rowoffset; if (scale == 1.f || mWorldPanning) return rowoffset;
else return rowoffset / scale; else return rowoffset / scale;
} }

12
src/common/textures/gametexture.h
View file

@ -84,7 +84,7 @@ class FGameTexture
float DisplayWidth, DisplayHeight; float DisplayWidth, DisplayHeight;
float ScaleX, ScaleY; float ScaleX, ScaleY;
int8_t shouldUpscaleFlag = 0; // Without explicit setup, scaling is disabled for a texture. int8_t shouldUpscaleFlag = 1;
ETextureType UseType = ETextureType::Wall; // This texture's primary purpose ETextureType UseType = ETextureType::Wall; // This texture's primary purpose
SpritePositioningInfo* spi = nullptr; SpritePositioningInfo* spi = nullptr;
@ -131,7 +131,7 @@ public:
ETextureType GetUseType() const { return UseType; } ETextureType GetUseType() const { return UseType; }
void SetUpscaleFlag(int what) { shouldUpscaleFlag = what; } void SetUpscaleFlag(int what) { shouldUpscaleFlag = what; }
int GetUpscaleFlag() { return shouldUpscaleFlag; } int GetUpscaleFlag() { return shouldUpscaleFlag == 1; }
FTexture* GetTexture() { return Base.get(); } FTexture* GetTexture() { return Base.get(); }
int GetSourceLump() const { return Base->GetSourceLump(); } int GetSourceLump() const { return Base->GetSourceLump(); }
@ -234,6 +234,10 @@ public:
DisplayHeight = h; DisplayHeight = h;
ScaleX = TexelWidth / w; ScaleX = TexelWidth / w;
ScaleY = TexelHeight / h; ScaleY = TexelHeight / h;
if (shouldUpscaleFlag < 2)
{
shouldUpscaleFlag = ScaleX < 2 && ScaleY < 2;
}
// compensate for roundoff errors // compensate for roundoff errors
if (int(ScaleX * w) != TexelWidth) ScaleX += (1 / 65536.); if (int(ScaleX * w) != TexelWidth) ScaleX += (1 / 65536.);
@ -253,6 +257,10 @@ public:
{ {
ScaleX = x; ScaleX = x;
ScaleY = y; ScaleY = y;
if (shouldUpscaleFlag < 2)
{
shouldUpscaleFlag = ScaleX < 2 && ScaleY < 2;
}
DisplayWidth = TexelWidth / x; DisplayWidth = TexelWidth / x;
DisplayHeight = TexelHeight / y; DisplayHeight = TexelHeight / y;
} }