[Scummvm-git-logs] scummvm master -> 5fadd94beae31c4045896553e0fd20e6b3cd8db4

[npjg]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0e7da1054d DIRECTOR: Optimize temporary clip rectangle
5fadd94bea DIRECTOR: Properly clip transition rectangle


Commit: 0e7da1054d7aa5d92ce12df37df1969ad7e2b3b6
    https://github.com/scummvm/scummvm/commit/0e7da1054d7aa5d92ce12df37df1969ad7e2b3b6
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-06T23:39:27-04:00

Commit Message:
DIRECTOR: Optimize temporary clip rectangle

Changed paths:
    engines/director/stage.cpp


diff --git a/engines/director/stage.cpp b/engines/director/stage.cpp
index d45014ad97..6c135af3f4 100644
--- a/engines/director/stage.cpp
+++ b/engines/director/stage.cpp
@@ -111,9 +111,7 @@ void Stage::reset() {
 
 void Stage::addDirtyRect(const Common::Rect &r) {
 	Common::Rect bounds = r;
-	Common::Rect clip = _innerDims;
-	clip.moveTo(0, 0);
-	bounds.clip(clip);
+	bounds.clip(Common::Rect(_innerDims.width(), _innerDims.height()));
 
 	if (bounds.width() > 0 && bounds.height() > 0)
 		_dirtyRects.push_back(bounds);


Commit: 5fadd94beae31c4045896553e0fd20e6b3cd8db4
    https://github.com/scummvm/scummvm/commit/5fadd94beae31c4045896553e0fd20e6b3cd8db4
Author: Nathanael Gentry (nathanael.gentrydb8 at gmail.com)
Date: 2020-07-06T23:40:09-04:00

Commit Message:
DIRECTOR: Properly clip transition rectangle

Changed paths:
    engines/director/transitions.cpp


diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index de2329c803..3408ee7ada 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -180,6 +180,7 @@ void Stage::playTransition(uint16 transDuration, uint8 transArea, uint8 transChu
 		if (clipRect.height() % 2 == 1)
 			clipRect.bottom += 1;
 
+		clipRect.clip(Common::Rect(_innerDims.width(), _innerDims.height()));
 		_dirtyRects.push_back(clipRect);
 
 		render(false, nextFrame);