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

SCUMM/FM-TOWNS: improve merging of graphics layers

Browse source 
svn-id: r52995
This commit is contained in:
Florian Kagerer 2010-10-03 17:25:38 +00:00
parent 718fe1d18f
commit c9713bef7c
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engines/scumm/gfx.h
View file

@ -468,6 +468,7 @@ private:
uint16 *bltInternX;
uint8 **bltInternY;
uint16 *bltTmpPal;
} _layers[2];
uint8 *_outBuffer;

12
engines/scumm/gfx_towns.cpp
View file

@ -215,6 +215,8 @@ TownsScreen::~TownsScreen() {
delete[] _layers[1].bltInternX;
delete[] _layers[0].bltInternY;
delete[] _layers[1].bltInternY;
delete[] _layers[0].bltTmpPal;
delete[] _layers[1].bltTmpPal;
delete[] _outBuffer;
_dirtyRects.clear();
}
@ -265,6 +267,9 @@ void TownsScreen::setupLayer(int layer, int width, int height, int numCol, void
for (int i = 0; i < _height; ++i)
l->bltInternY[i] = l->pixels + (i / l->scaleH) * l->pitch;
delete[] l->bltTmpPal;
l->bltTmpPal = (l->bpp == 1 && _bpp == 2) ? new uint16[l->numCol] : 0;
l->enabled = true;
l->onBottom = (!layer || !_layers[0].enabled);
l->ready = true;
@ -448,6 +453,11 @@ void TownsScreen::updateOutputBuffer() {
uint8 *dst = _outBuffer + r->top * _pitch + r->left * _bpp;
int ptch = _pitch - (r->right - r->left + 1) * _bpp;
if (_bpp == 2 && l->bpp == 1) {
for (int ic = 0; ic < l->numCol; ic++)
l->bltTmpPal[ic] = calc16BitColor(&l->palette[ic * 3]);
}
for (int y = r->top; y <= r->bottom; ++y) {
if (l->bpp == _bpp && l->scaleW == 1 && l->onBottom) {
memcpy(dst, l->bltInternY[y] + l->bltInternX[r->left], (r->right + 1 - r->left) * _bpp);
@ -461,7 +471,7 @@ void TownsScreen::updateOutputBuffer() {
if (col || l->onBottom) {
if (l->numCol == 16)
col = (col >> 4) & (col & 0x0f);
WRITE_LE_UINT16(dst, calc16BitColor(&l->palette[col * 3]));
WRITE_LE_UINT16(dst, l->bltTmpPal[col]);
}
} else {
WRITE_LE_UINT16(dst, READ_LE_UINT16(src));