mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-07-01 14:15:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #182 from Splendide-Imaginarius/mkxp-z-lanczos-sprite-alpha-log

Browse source 
Refactor smooth sprite scaling
This commit is contained in:
Splendide Imaginarius 2024-04-30 03:06:26 +00:00 • committed by GitHub
commit 8fcd6dd605
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 49 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
src/display/sprite.cpp
View file

@ -627,8 +627,51 @@ void Sprite::draw()
int scalingMethod = NearestNeighbor; int scalingMethod = NearestNeighbor;
int sourceWidthHires = p->bitmap->hasHires() ? p->bitmap->getHires()->width() : p->bitmap->width();
int sourceHeightHires = p->bitmap->hasHires() ? p->bitmap->getHires()->height() : p->bitmap->height();
double framebufferScalingFactor = shState->config().enableHires ? shState->config().framebufferScalingFactor : 1.0;
int targetWidthHires = (int)lround(framebufferScalingFactor * p->bitmap->width() * p->trans.getScale().x);
int targetHeightHires = (int)lround(framebufferScalingFactor * p->bitmap->height() * p->trans.getScale().y);
int scaleIsSpecial = UpScale;
if (targetWidthHires == sourceWidthHires && targetHeightHires == sourceHeightHires)
{
scaleIsSpecial = SameScale;
}
if (targetWidthHires < sourceWidthHires && targetHeightHires < sourceHeightHires)
{
scaleIsSpecial = DownScale;
}
switch (scaleIsSpecial)
{
case SameScale:
scalingMethod = NearestNeighbor;
break;
case DownScale:
scalingMethod = shState->config().bitmapSmoothScalingDown;
break;
default:
scalingMethod = shState->config().bitmapSmoothScaling;
}
if (p->trans.getRotation() != 0.0)
{
scalingMethod = shState->config().bitmapSmoothScaling;
}
if (renderEffect) if (renderEffect)
{ {
if (scalingMethod != NearestNeighbor)
{
Debug() << "BUG: Smooth SpriteShader not implemented:" << scalingMethod;
scalingMethod = NearestNeighbor;
}
SpriteShader &shader = shState->shaders().sprite; SpriteShader &shader = shState->shaders().sprite;
shader.bind(); shader.bind();
@ -670,6 +713,12 @@ void Sprite::draw()
} }
else if (p->opacity != 255) else if (p->opacity != 255)
{ {
if (scalingMethod != NearestNeighbor)
{
Debug() << "BUG: Smooth AlphaSpriteShader not implemented:" << scalingMethod;
scalingMethod = NearestNeighbor;
}
AlphaSpriteShader &shader = shState->shaders().alphaSprite; AlphaSpriteShader &shader = shState->shaders().alphaSprite;
shader.bind(); shader.bind();
@ -680,43 +729,6 @@ void Sprite::draw()
} }
else else
{ {
int sourceWidthHires = p->bitmap->hasHires() ? p->bitmap->getHires()->width() : p->bitmap->width();
int sourceHeightHires = p->bitmap->hasHires() ? p->bitmap->getHires()->height() : p->bitmap->height();
double framebufferScalingFactor = shState->config().enableHires ? shState->config().framebufferScalingFactor : 1.0;
int targetWidthHires = (int)lround(framebufferScalingFactor * p->bitmap->width() * p->trans.getScale().x);
int targetHeightHires = (int)lround(framebufferScalingFactor * p->bitmap->height() * p->trans.getScale().y);
int scaleIsSpecial = UpScale;
if (targetWidthHires == sourceWidthHires && targetHeightHires == sourceHeightHires)
{
scaleIsSpecial = SameScale;
}
if (targetWidthHires < sourceWidthHires && targetHeightHires < sourceHeightHires)
{
scaleIsSpecial = DownScale;
}
switch (scaleIsSpecial)
{
case SameScale:
scalingMethod = NearestNeighbor;
break;
case DownScale:
scalingMethod = shState->config().bitmapSmoothScalingDown;
break;
default:
scalingMethod = shState->config().bitmapSmoothScaling;
}
if (p->trans.getRotation() != 0.0)
{
scalingMethod = shState->config().bitmapSmoothScaling;
}
switch (scalingMethod) switch (scalingMethod)
{ {
case Bicubic: case Bicubic: