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

SAGA: Make the dirty rect handling here match the one in the GUI code (some more cases of mutually contained rects are deteceted here now, too).

Browse source 
svn-id: r39910
This commit is contained in:
Max Horn 2009-04-09 17:07:53 +00:00
parent 9d4c917f59
commit c473fa849d
1 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

44
engines/saga/render.cpp
View file

@ -207,30 +207,36 @@ void Render::drawScene() {
_fullRefresh = true;
}
void Render::addDirtyRect(Common::Rect rect) {
void Render::addDirtyRect(Common::Rect r) {
if (_fullRefresh)
return;
// Clip rectangle
int x1 = MAX<int>(rect.left, 0);
int y1 = MAX<int>(rect.top, 0);
int x2 = MIN<int>(rect.right, _backGroundSurface.w);
int y2 = MIN<int>(rect.bottom, _backGroundSurface.h);
if (x2 > x1 && y2 > y1) {
Common::Rect rectClipped(x1, y1, x2, y2);
// Check if the new rectangle is contained within another in the list
Common::List<Common::Rect>::iterator it;
for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
if (it->contains(rectClipped))
return;
if (rectClipped.contains(*it)) {
_dirtyRects.erase(it);
break; // we need to break now, as the list is changed
}
}
if (_vm->_interface->getFadeMode() != kFadeOut)
_dirtyRects.push_back(rectClipped);
r.clip(_backGroundSurface.w, _backGroundSurface.h);
// If it is empty after clipping, we are done
if (r.isEmpty())
return;
// Check if the new rectangle is contained within another in the list
Common::List<Common::Rect>::iterator it;
for (it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
// If we find a rectangle which fully contains the new one,
// we can abort the search.
if (it->contains(r))
return;
// Conversely, if we find rectangles which are contained in
// the new one, we can remove them
if (r.contains(*it))
_dirtyRects.erase(it);
else
++it;
}
// If we got here, we can safely add r to the list of dirty rects.
if (_vm->_interface->getFadeMode() != kFadeOut)
_dirtyRects.push_back(r);
}
void Render::restoreChangedRects() {