[Scummvm-git-logs] scummvm master -> 81a38bac793d2ca49d6953fbe1b69e73f2d8d16e

[antoniou79]

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

Summary:
81a38bac79 BLADERUNNER: Remove blue tint from ESPER zoom-ins


Commit: 81a38bac793d2ca49d6953fbe1b69e73f2d8d16e
    https://github.com/scummvm/scummvm/commit/81a38bac793d2ca49d6953fbe1b69e73f2d8d16e
Author: Thanasis Antoniou (a.antoniou79 at gmail.com)
Date: 2019-03-31T22:12:07+03:00

Commit Message:
BLADERUNNER: Remove blue tint from ESPER zoom-ins

This applies only to hotspot zoom-ins and zoom-outs

Last frame of zoomed in hotspot (video zoom) had a persistent blue tint. And zooming out from the hotspot also had a long lasting blue tint. These were removed.

Changed paths:
    engines/bladerunner/ui/esper.cpp


diff --git a/engines/bladerunner/ui/esper.cpp b/engines/bladerunner/ui/esper.cpp
index 3ccede6..af6150f 100644
--- a/engines/bladerunner/ui/esper.cpp
+++ b/engines/bladerunner/ui/esper.cpp
@@ -890,11 +890,12 @@ void ESPER::drawVideoZooming(Graphics::Surface &surface) {
 	if (frame == _vqaPlayerPhoto->getFrameCount() - 1) {
 		_vqaLastFrame = frame;
 		setStatePhoto(kEsperPhotoStatePhotoSharpening);
-	}
-
-	if (flash) {
+	} else if (flash) {
+		// TODO? Temporary workaround for very noticeable blue tint in the first frame during zoom-out:
+		// Don't flash for the last frame of the photo (which is the starting frame when zooming out)
 		flashViewport();
 	}
+
 	copyImageBlur(&_surfaceViewport, Common::Rect(0, 0, 299, 263), &surface, _screen, _blur);
 	drawGrid(surface);
 }
@@ -913,7 +914,12 @@ void ESPER::drawVideoZoomOut(Graphics::Surface &surface) {
 		} else if (nextFrame > 4) {
 			nextFrame = 4;
 		}
-		flash = true;
+
+		if (_vqaLastFrame < _vqaPlayerPhoto->getFrameCount() - 1) {
+			// TODO? Temporary workaround for persistent blue tint in the last frame:
+			// Don't flash for the last frame of the photo (starting frame when zooming out)
+			flash = true;
+		}
 		advanceFrame = true;
 		_vqaLastFrame -= nextFrame;
 	}