[Scummvm-cvs-logs] scummvm master -> b6a7d8c6a5bc286c68fea091e43e6a51df456655

[csnover]

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:
5e0cff364f SCI32: "Fix" missing fade transitions
b6a7d8c6a5 SCI32: Minor consistency improvement to FrameOut


Commit: 5e0cff364f95d21853a7f5ddc96aed36897774c4
    https://github.com/scummvm/scummvm/commit/5e0cff364f95d21853a7f5ddc96aed36897774c4
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-02T14:02:49-06:00

Commit Message:
SCI32: "Fix" missing fade transitions

The original engine had some members on PlaneShowStyle to
allow wall clock timing but never actually used them in the
processing loop so transitions simply ran as quickly as the
CPU could process them. For the moment, we will just limit
these transitions to ~30fps, which hopefully roughly matches
the speed of the engine on hardware of the era.

Changed paths:
    engines/sci/graphics/frameout.cpp



diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index ccce8ef..32de79d 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1600,16 +1600,15 @@ void GfxFrameout::processShowStyles() {
 		}
 
 		if (doFrameOut) {
-			Common::Rect frameOutRect(0, 0);
-			frameOut(true, frameOutRect);
-
-			// TODO: It seems like transitions without the “animate”
-			// flag are too fast in in SCI2–2.1early, but the throttle
-			// value is arbitrary. Someone on real hardware probably
-			// needs to test what the actual speed of transitions
-			// should be
-			//state->speedThrottler(30);
-			//state->_throttleTrigger = true;
+			frameOut(true);
+
+			// TODO: Transitions without the “animate” flag are too
+			// fast, but the throttle value is arbitrary. Someone on
+			// real hardware probably needs to test what the actual
+			// speed of these transitions should be
+			EngineState *state = g_sci->getEngineState();
+			state->speedThrottler(33);
+			state->_throttleTrigger = true;
 		}
 	} while(continueProcessing && doFrameOut);
 }


Commit: b6a7d8c6a5bc286c68fea091e43e6a51df456655
    https://github.com/scummvm/scummvm/commit/b6a7d8c6a5bc286c68fea091e43e6a51df456655
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-03-02T14:02:49-06:00

Commit Message:
SCI32: Minor consistency improvement to FrameOut

Changed paths:
    engines/sci/engine/kgraphics32.cpp
    engines/sci/graphics/frameout.cpp
    engines/sci/graphics/frameout.h



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 5810a59..36f637b 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -132,7 +132,7 @@ reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) {
 
 reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
 	bool showBits = argc > 0 ? argv[0].toUint16() : true;
-	g_sci->_gfxFrameout->kernelFrameout(showBits);
+	g_sci->_gfxFrameout->kernelFrameOut(showBits);
 	s->speedThrottler(16);
 	s->_throttleTrigger = true;
 	return NULL_REG;
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index 32de79d..ab2ed7a 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -1947,7 +1947,7 @@ bool GfxFrameout::processShowStyle12(ShowStyleEntry *const showStyle) {
 }
 #endif
 
-void GfxFrameout::kernelFrameout(const bool shouldShowBits) {
+void GfxFrameout::kernelFrameOut(const bool shouldShowBits) {
 	if (_showStyles != nullptr) {
 		processShowStyles();
 	} else if (_palMorphIsOn) {
@@ -1959,8 +1959,7 @@ void GfxFrameout::kernelFrameout(const bool shouldShowBits) {
 //			doScroll();
 //		}
 
-		Common::Rect frameOutRect(0, 0);
-		frameOut(shouldShowBits, frameOutRect);
+		frameOut(shouldShowBits);
 	}
 }
 
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 0da6866..f172997 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -427,7 +427,7 @@ private:
 	 * frame. If `shouldShowBits` is true, also sends the
 	 * buffer to hardware.
 	 */
-	void frameOut(const bool shouldShowBits, const Common::Rect &rect);
+	void frameOut(const bool shouldShowBits, const Common::Rect &rect = Common::Rect());
 
 	/**
 	 * Adds a new rectangle to the list of regions to write
@@ -466,7 +466,7 @@ public:
 		return _currentBuffer;
 	}
 
-	void kernelFrameout(const bool showBits);
+	void kernelFrameOut(const bool showBits);
 
 	/**
 	 * Modifies the raw pixel data for the next frame with