From a9617cbe2888be357d6dbee9899f34827d159b26 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Mon, 29 Nov 2010 20:57:54 +0000 Subject: MOHAWK: Added dirty rects support for Myst svn-id: r54625 --- engines/mohawk/graphics.cpp | 19 ++++++++++++------- engines/mohawk/graphics.h | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) (limited to 'engines') diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index 5732c96d0d..dc637e8cc1 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -141,7 +141,6 @@ MystGraphics::MystGraphics(MohawkEngine_Myst* vm) : GraphicsManager(), _vm(vm) { // Initialize our buffer _mainScreen = new Graphics::Surface(); _mainScreen->create(_vm->_system->getWidth(), _vm->_system->getHeight(), _pixelFormat.bytesPerPixel); - _dirtyScreen = false; } MystGraphics::~MystGraphics() { @@ -277,8 +276,8 @@ void MystGraphics::copyImageSectionToScreen(uint16 image, Common::Rect src, Comm for (uint16 i = 0; i < height; i++) memcpy(_mainScreen->getBasePtr(dest.left, i + dest.top), surface->getBasePtr(src.left, top + i), width * surface->bytesPerPixel); - // Mark the screen as dirty - _dirtyScreen = true; + // Add to the list of dirty rects + _dirtyRects.push_back(dest); } void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) { @@ -286,11 +285,17 @@ void MystGraphics::copyImageToScreen(uint16 image, Common::Rect dest) { } void MystGraphics::updateScreen() { - if (_dirtyScreen) { - // Only copy the buffer to the screen if it's dirty - _vm->_system->copyRectToScreen((byte *)_mainScreen->pixels, _mainScreen->pitch, 0, 0, _mainScreen->w, _mainScreen->h); + // Only update the screen if there have been changes since last frame + if (!_dirtyRects.empty()) { + + // Copy any modified area + for (uint i = 0; i < _dirtyRects.size(); i++) { + Common::Rect &r = _dirtyRects[i]; + _vm->_system->copyRectToScreen((byte *)_mainScreen->getBasePtr(r.left, r.top), _mainScreen->pitch, r.left, r.top, r.width(), r.height()); + } + _vm->_system->updateScreen(); - _dirtyScreen = false; + _dirtyRects.clear(); } } diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h index 6942aba4f4..ec5c01af75 100644 --- a/engines/mohawk/graphics.h +++ b/engines/mohawk/graphics.h @@ -131,7 +131,7 @@ private: } _pictureFile; Graphics::Surface *_mainScreen; - bool _dirtyScreen; + Common::Array _dirtyRects; Graphics::PixelFormat _pixelFormat; }; -- cgit v1.2.3