[Scummvm-git-logs] scummvm master -> bf5850efa8f42e93119a73eb84e92e2e964aaec1

[sev-]

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

Summary:
7cc0c1adab DIRECTOR: Added Score CastInfo structs
bf5850efa8 VIDEO: QTVR: Fix regression with zooming in


Commit: 7cc0c1adab31604f551ac323e3767dfffa46f997
    https://github.com/scummvm/scummvm/commit/7cc0c1adab31604f551ac323e3767dfffa46f997
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-12T11:39:49+02:00

Commit Message:
DIRECTOR: Added Score CastInfo structs

Changed paths:
    engines/director/score.h


diff --git a/engines/director/score.h b/engines/director/score.h
index 846b3c5a341..72244c41568 100644
--- a/engines/director/score.h
+++ b/engines/director/score.h
@@ -72,6 +72,47 @@ struct BehaviorElement {
 	}
 };
 
+struct TweenInfo{
+    int32 curvature;
+    int32 flags;
+    int32 easeIn;
+    int32 easeOut;
+    int32 padding;
+
+	void read(Common::ReadStreamEndian &stream) {
+		curvature = (int32)stream.readUint32();
+		flags = (int32)stream.readUint32();
+		easeIn = (int32)stream.readUint32();
+		easeOut = (int32)stream.readUint32();
+		padding = (int32)stream.readUint32();
+	}
+};
+
+struct SpriteInfo {
+    int32 startFrame;
+    int32 endFrame;
+    int32 xtraInfo;
+    int32 flags;
+    int32 channelNum;
+    TweenInfo tweenInfo;
+
+    Common::Array<int32> keyFrames;
+
+	void read(Common::ReadStreamEndian &stream) {
+		startFrame = (int32)stream.readUint32();
+		endFrame = (int32)stream.readUint32();
+		xtraInfo = (int32)stream.readUint32();
+		flags = (int32)stream.readUint32();
+		channelNum = (int32)stream.readUint32();
+		tweenInfo.read(stream);
+
+		keyFrames.clear();
+		while (!stream.eos()) {
+			keyFrames.push_back((int32)stream.readUint32());
+		}
+	}
+};
+
 class Score {
 public:
 	Score(Movie *movie);


Commit: bf5850efa8f42e93119a73eb84e92e2e964aaec1
    https://github.com/scummvm/scummvm/commit/bf5850efa8f42e93119a73eb84e92e2e964aaec1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-09-12T12:11:50+02:00

Commit Message:
VIDEO: QTVR: Fix regression with zooming in

The default zoom setting was getting in the way which was leading
to a looped zoom.

Changed paths:
    video/qtvr_decoder.cpp


diff --git a/video/qtvr_decoder.cpp b/video/qtvr_decoder.cpp
index cdb56376362..f85ba4e35c4 100644
--- a/video/qtvr_decoder.cpp
+++ b/video/qtvr_decoder.cpp
@@ -345,7 +345,7 @@ bool QuickTimeDecoder::setFOV(float fov) {
 	PanoSampleDesc *desc = (PanoSampleDesc *)_panoTrack->sampleDescs[0];
 	bool success = true;
 
-	if (fov == 0.0f)	// This is reference to default FOV
+	if (fov == 0.0f && _zoomState == kZoomNone)	// This is reference to default FOV
 		fov = _panoTrack->panoInfo.defZoom;
 
 	if (fov <= desc->_minimumZoom) {