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

GRAPHICS: Allow nearest neighbor scaling of 1Bpp and 2Bpp TransparentSurfaces

Browse source 
This is one small step toward allowing more shared usage of
existing scaling code.
This commit is contained in:
Colin Snover 2017-07-02 22:37:41 -05:00
parent 1fbee2f51e
commit 7ce2e4cf08
2 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
graphics/transparent_surface.cpp
View file

@ -793,21 +793,17 @@ TransparentSurface *TransparentSurface::rotoscaleT(const TransformStruct &transf
template <TFilteringMode filteringMode> template <TFilteringMode filteringMode>
TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight) const { TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight) const {
Common::Rect srcRect(0, 0, (int16)w, (int16)h);
Common::Rect dstRect(0, 0, (int16)newWidth, (int16)newHeight);
TransparentSurface *target = new TransparentSurface(); TransparentSurface *target = new TransparentSurface();
assert(format.bytesPerPixel == 4); int srcW = w;
int srcH = h;
int dstW = newWidth;
int dstH = newHeight;
int srcW = srcRect.width(); target->create((uint16)dstW, (uint16)dstH, format);
int srcH = srcRect.height();
int dstW = dstRect.width();
int dstH = dstRect.height();
target->create((uint16)dstW, (uint16)dstH, this->format);
if (filteringMode == FILTER_BILINEAR) { if (filteringMode == FILTER_BILINEAR) {
assert(format.bytesPerPixel == 4);
bool flipx = false, flipy = false; // TODO: See mirroring comment in RenderTicket ctor bool flipx = false, flipy = false; // TODO: See mirroring comment in RenderTicket ctor
@ -954,25 +950,29 @@ TransparentSurface *TransparentSurface::scaleT(uint16 newWidth, uint16 newHeight
delete[] say; delete[] say;
} else { } else {
int *scaleCacheX = new int[dstW]; int *scaleCacheX = new int[dstW];
for (int x = 0; x < dstW; x++) { for (int x = 0; x < dstW; x++) {
scaleCacheX[x] = (x * srcW) / dstW; scaleCacheX[x] = (x * srcW) / dstW;
} }
for (int y = 0; y < dstH; y++) { switch (format.bytesPerPixel) {
uint32 *destP = (uint32 *)target->getBasePtr(0, y); case 1:
const uint32 *srcP = (const uint32 *)getBasePtr(0, (y * srcH) / dstH); scaleNN<uint8>(scaleCacheX, target);
for (int x = 0; x < dstW; x++) { break;
*destP++ = srcP[scaleCacheX[x]]; case 2:
scaleNN<uint16>(scaleCacheX, target);
break;
case 4:
scaleNN<uint32>(scaleCacheX, target);
break;
default:
error("Can only scale 8bpp, 16bpp, and 32bpp");
} }
}
delete[] scaleCacheX;
delete[] scaleCacheX;
} }
return target; return target;
} }
TransparentSurface *TransparentSurface::convertTo(const PixelFormat &dstFormat, const byte *palette) const { TransparentSurface *TransparentSurface::convertTo(const PixelFormat &dstFormat, const byte *palette) const {
@ -1053,12 +1053,26 @@ TransparentSurface *TransparentSurface::convertTo(const PixelFormat &dstFormat,
return surface; return surface;
} }
template <typename Size>
void TransparentSurface::scaleNN(int *scaleCacheX, TransparentSurface *target) const {
for (int y = 0; y < target->h; y++) {
Size *destP = (Size *)target->getBasePtr(0, y);
const Size *srcP = (const Size *)getBasePtr(0, (y * h) / target->h);
for (int x = 0; x < target->w; x++) {
*destP++ = srcP[scaleCacheX[x]];
}
}
}
template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_NEAREST>(const TransformStruct &transform) const; template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_NEAREST>(const TransformStruct &transform) const;
template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_BILINEAR>(const TransformStruct &transform) const; template TransparentSurface *TransparentSurface::rotoscaleT<FILTER_BILINEAR>(const TransformStruct &transform) const;
template TransparentSurface *TransparentSurface::scaleT<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const; template TransparentSurface *TransparentSurface::scaleT<FILTER_NEAREST>(uint16 newWidth, uint16 newHeight) const;
template TransparentSurface *TransparentSurface::scaleT<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const; template TransparentSurface *TransparentSurface::scaleT<FILTER_BILINEAR>(uint16 newWidth, uint16 newHeight) const;
template void TransparentSurface::scaleNN<uint8>(int *scaleCacheX, TransparentSurface *target) const;
template void TransparentSurface::scaleNN<uint16>(int *scaleCacheX, TransparentSurface *target) const;
template void TransparentSurface::scaleNN<uint32>(int *scaleCacheX, TransparentSurface *target) const;
TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const { TransparentSurface *TransparentSurface::rotoscale(const TransformStruct &transform) const {
return rotoscaleT<FILTER_BILINEAR>(transform); return rotoscaleT<FILTER_BILINEAR>(transform);
} }

3
graphics/transparent_surface.h
View file

@ -150,6 +150,7 @@ struct TransparentSurface : public Graphics::Surface {
TransparentSurface *scaleT(uint16 newWidth, uint16 newHeight) const; TransparentSurface *scaleT(uint16 newWidth, uint16 newHeight) const;
TransparentSurface *scale(uint16 newWidth, uint16 newHeight) const; TransparentSurface *scale(uint16 newWidth, uint16 newHeight) const;
/** /**
* @brief Rotoscale function; this returns a transformed version of this surface after rotation and * @brief Rotoscale function; this returns a transformed version of this surface after rotation and
* scaling. Please do not use this if angle == 0, use plain old scaling function. * scaling. Please do not use this if angle == 0, use plain old scaling function.
@ -176,6 +177,8 @@ struct TransparentSurface : public Graphics::Surface {
private: private:
AlphaType _alphaMode; AlphaType _alphaMode;
template <typename Size>
void scaleNN(int *scaleCacheX, TransparentSurface *target) const;
}; };
/** /**