thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: ManagedSurface transBlitFrom ignore alpha matching transColor

Browse source
This commit is contained in:
Paul Gilbert 2021-01-29 20:56:39 -08:00
parent 420cee48a5
commit 81d891ebb0
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
graphics/managed_surface.cpp
View file

@ -513,11 +513,19 @@ void transBlit(const Surface &src, const Common::Rect &srcRect, Surface &dest, c
const uint32 *dstPalette, const Surface *mask, bool maskOnly) { const uint32 *dstPalette, const Surface *mask, bool maskOnly) {
int scaleX = SCALE_THRESHOLD * srcRect.width() / destRect.width(); int scaleX = SCALE_THRESHOLD * srcRect.width() / destRect.width();
int scaleY = SCALE_THRESHOLD * srcRect.height() / destRect.height(); int scaleY = SCALE_THRESHOLD * srcRect.height() / destRect.height();
byte rt1 = 0, gt1 = 0, bt1 = 0, rt2 = 0, gt2 = 0, bt2 = 0;
byte *lookup = nullptr; byte *lookup = nullptr;
if (srcPalette && dstPalette) if (srcPalette && dstPalette)
lookup = createPaletteLookup(srcPalette, dstPalette); lookup = createPaletteLookup(srcPalette, dstPalette);
// If we're dealing with a 32-bit source surface, we need to split up the RGB,
// since we'll want to find matching RGB pixels irrespective of the alpha
bool isTrans32 = src.format.bytesPerPixel == 4 && transColor != (uint32)-1;
if (isTrans32) {
src.format.colorToRGB(transColor, rt1, gt1, bt1);
}
// Loop through drawing output lines // Loop through drawing output lines
for (int destY = destRect.top, scaleYCtr = 0; destY < destRect.bottom; ++destY, scaleYCtr += scaleY) { for (int destY = destRect.top, scaleYCtr = 0; destY < destRect.bottom; ++destY, scaleYCtr += scaleY) {
if (destY < 0 || destY >= dest.h) if (destY < 0 || destY >= dest.h)
@ -536,7 +544,12 @@ void transBlit(const Surface &src, const Common::Rect &srcRect, Surface &dest, c
continue; continue;
TSRC srcVal = srcLine[flipped ? src.w - scaleXCtr / SCALE_THRESHOLD - 1 : scaleXCtr / SCALE_THRESHOLD]; TSRC srcVal = srcLine[flipped ? src.w - scaleXCtr / SCALE_THRESHOLD - 1 : scaleXCtr / SCALE_THRESHOLD];
if (srcVal == transColor && !maskOnly) if (isTrans32 && !maskOnly) {
src.format.colorToRGB(srcVal, rt2, gt2, bt2);
if (rt1 == rt2 && gt1 == gt2 && bt1 == bt2)
continue;
} else if (srcVal == transColor && !maskOnly)
continue; continue;
if (mask) { if (mask) {