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

ACCESS: Add dirty rects when plotting images to the screen

Browse source
This commit is contained in:
Paul Gilbert 2014-12-13 22:33:23 -05:00
parent 9314daa11c
commit 310853a285
6 changed files with 56 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/access/amazon/amazon_logic.cpp
View file

@ -356,7 +356,7 @@ void Opening::doTitle() {
int id = COUNTDOWN[_pCount * 2]; int id = COUNTDOWN[_pCount * 2];
int xp = COUNTDOWN[_pCount * 2 + 1]; int xp = COUNTDOWN[_pCount * 2 + 1];
_vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71)); _vm->_buffer2.plotImage(_vm->_objectsTable[0], id, Common::Point(xp, 71));
screen.copyFrom(_vm->_buffer2); _vm->_buffer2.copyTo(_vm->_screen);
_vm->_sound->playSound(1); _vm->_sound->playSound(1);
_vm->_events->_vbCount = 70; _vm->_events->_vbCount = 70;

6
engines/access/amazon/amazon_scripts.cpp
View file

@ -71,8 +71,8 @@ void AmazonScripts::mWhile1() {
_sequence = 2100; _sequence = 2100;
} while (_vm->_flags[52] == 1); } while (_vm->_flags[52] == 1);
_vm->_screen->copyFrom(_vm->_buffer1); _vm->_buffer1.copyTo(_vm->_screen);
_vm->_buffer1.copyFrom(_vm->_buffer2); _vm->_buffer2.copyTo(&_vm->_buffer1);
_game->establish(-1, 14); _game->establish(-1, 14);
@ -446,7 +446,7 @@ void AmazonScripts::cmdHelp() {
_vm->_screen->clearBuffer(); _vm->_screen->clearBuffer();
} }
_vm->_screen->copyFrom(_vm->_buffer2); _vm->_buffer2.copyTo(_vm->_screen);
_vm->_screen->restorePalette(); _vm->_screen->restorePalette();
_vm->_screen->setPalette(); _vm->_screen->setPalette();
_vm->_events->showCursor(); _vm->_events->showCursor();

43
engines/access/asurface.cpp
View file

@ -203,13 +203,13 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
} }
} }
void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) { void ASurface::copyFrom(ASurface *src, const Common::Point &destPos) {
if (dest->getPixels() == nullptr) if (getPixels() == nullptr)
dest->create(w, h); create(w, h);
for (int yp = 0; yp < h; ++yp) { for (int yp = 0; yp < src->h; ++yp) {
byte *srcP = (byte *)getBasePtr(0, yp); const byte *srcP = (const byte *)src->getBasePtr(0, yp);
byte *destP = (byte *)dest->getBasePtr(destPos.x, destPos.y + yp); byte *destP = (byte *)getBasePtr(destPos.x, destPos.y + yp);
for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) { for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) {
if (*srcP != 0) if (*srcP != 0)
@ -218,13 +218,13 @@ void ASurface::copyTo(ASurface *dest, const Common::Point &destPos) {
} }
} }
void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) { void ASurface::copyFrom(ASurface *src, const Common::Rect &bounds) {
const int SCALE_LIMIT = 0x100; const int SCALE_LIMIT = 0x100;
int scaleX = SCALE_LIMIT * bounds.width() / this->w; int scaleX = SCALE_LIMIT * bounds.width() / src->w;
int scaleY = SCALE_LIMIT * bounds.height() / this->h; int scaleY = SCALE_LIMIT * bounds.height() / src->h;
int scaleXCtr = 0, scaleYCtr = 0; int scaleXCtr = 0, scaleYCtr = 0;
for (int yCtr = 0, destY = bounds.top; yCtr < this->h; ++yCtr) { for (int yCtr = 0, destY = bounds.top; yCtr < src->h; ++yCtr) {
// Handle skipping lines if Y scaling // Handle skipping lines if Y scaling
scaleYCtr += scaleY; scaleYCtr += scaleY;
if (scaleYCtr < SCALE_LIMIT) if (scaleYCtr < SCALE_LIMIT)
@ -232,17 +232,17 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
scaleYCtr -= SCALE_LIMIT; scaleYCtr -= SCALE_LIMIT;
// Handle off-screen lines // Handle off-screen lines
if (destY >= dest->h) if (destY >= this->h)
break; break;
if (destY >= 0) { if (destY >= 0) {
// Handle drawing the line // Handle drawing the line
byte *pSrc = (byte *)getBasePtr(0, yCtr); const byte *pSrc = (const byte *)src->getBasePtr(0, yCtr);
byte *pDest = (byte *)dest->getBasePtr(bounds.left, destY); byte *pDest = (byte *)getBasePtr(bounds.left, destY);
scaleXCtr = 0; scaleXCtr = 0;
int x = bounds.left; int x = bounds.left;
for (int xCtr = 0; xCtr < this->w; ++xCtr, ++pSrc) { for (int xCtr = 0; xCtr < src->w; ++xCtr, ++pSrc) {
// Handle horizontal scaling // Handle horizontal scaling
scaleXCtr += scaleX; scaleXCtr += scaleX;
if (scaleXCtr < SCALE_LIMIT) if (scaleXCtr < SCALE_LIMIT)
@ -250,7 +250,7 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
scaleXCtr -= SCALE_LIMIT; scaleXCtr -= SCALE_LIMIT;
// Only handle on-screen pixels // Only handle on-screen pixels
if (x >= dest->w) if (x >= this->w)
break; break;
if (x >= 0 && *pSrc != 0) if (x >= 0 && *pSrc != 0)
*pDest = *pSrc; *pDest = *pSrc;
@ -264,8 +264,12 @@ void ASurface::copyTo(ASurface *dest, const Common::Rect &bounds) {
} }
} }
void ASurface::copyTo(ASurface *dest) { void ASurface::copyFrom(ASurface &src) {
copyTo(dest, Common::Point()); copyFrom(&src, Common::Point());
}
void ASurface::copyBuffer(Graphics::Surface *src) {
Graphics::Surface::copyFrom(*src);
} }
void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) { void ASurface::plotF(SpriteFrame *frame, const Common::Point &pt) {
@ -277,13 +281,14 @@ void ASurface::plotB(SpriteFrame *frame, const Common::Point &pt) {
} }
void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) { void ASurface::sPlotF(SpriteFrame *frame, const Common::Rect &bounds) {
frame->copyTo(this, bounds); copyFrom(frame, bounds);
} }
void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) { void ASurface::sPlotB(SpriteFrame *frame, const Common::Rect &bounds) {
ASurface flippedFrame; ASurface flippedFrame;
frame->flipHorizontal(flippedFrame); frame->flipHorizontal(flippedFrame);
flippedFrame.copyTo(this, bounds);
copyFrom(&flippedFrame, bounds);
} }
void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) { void ASurface::copyBlock(ASurface *src, const Common::Rect &bounds) {

12
engines/access/asurface.h
View file

@ -65,8 +65,6 @@ public:
void clearBuffer(); void clearBuffer();
void copyBuffer(Graphics::Surface *src) { copyFrom(*src); }
bool clip(Common::Rect &r); bool clip(Common::Rect &r);
void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt); void plotImage(SpriteResource *sprite, int frameNum, const Common::Point &pt);
@ -97,11 +95,15 @@ public:
virtual void drawRect(); virtual void drawRect();
void copyTo(ASurface *dest, const Common::Point &destPos); virtual void copyFrom(ASurface *src, const Common::Point &destPos);
void copyTo(ASurface *dest, const Common::Rect &bounds); virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
void copyTo(ASurface *dest); virtual void copyFrom(ASurface &src);
void copyTo(ASurface *dest) { dest->copyFrom(*this); }
virtual void copyBuffer(Graphics::Surface *src);
void saveBlock(const Common::Rect &bounds); void saveBlock(const Common::Rect &bounds);

15
engines/access/screen.cpp
View file

@ -260,6 +260,21 @@ void Screen::drawRect() {
ASurface::drawRect(); ASurface::drawRect();
} }
void Screen::copyFrom(ASurface *src, const Common::Point &destPos) {
addDirtyRect(Common::Rect(destPos.x, destPos.y, destPos.x + src->w, destPos.y + src->h));
ASurface::copyFrom(src, destPos);
}
void Screen::copyFrom(ASurface *src, const Common::Rect &bounds) {
addDirtyRect(bounds);
ASurface::copyFrom(src, bounds);
}
void Screen::copyBuffer(Graphics::Surface *src) {
addDirtyRect(Common::Rect(0, 0, src->w, src->h));
ASurface::copyBuffer(src);
}
void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) { void Screen::setPaletteCycle(int startCycle, int endCycle, int timer) {
_startCycle = _cycleStart = startCycle; _startCycle = _cycleStart = startCycle;
_endCycle = endCycle; _endCycle = endCycle;

6
engines/access/screen.h
View file

@ -88,6 +88,12 @@ public:
virtual void restoreBlock(); virtual void restoreBlock();
virtual void drawRect(); virtual void drawRect();
virtual void copyFrom(ASurface *src, const Common::Point &destPos);
virtual void copyFrom(ASurface *src, const Common::Rect &bounds);
virtual void copyBuffer(Graphics::Surface *src);
public: public:
Screen(AccessEngine *vm); Screen(AccessEngine *vm);