[Scummvm-git-logs] scummvm master -> 8676a75ce0a2db97ad107db80b48c88b54df9311
sev-
sev at scummvm.org
Tue Mar 24 00:20:39 UTC 2020
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
b0c9b857b4 DIRECTOR: Enumerated transition types
83610a97ba DIRECTOR: Sorted transition implementations
8676a75ce0 DIRECTOR: Added stubs for transitions used in Warlock intro
Commit: b0c9b857b411448083dc9f65bc1ca9d82df8b7ab
https://github.com/scummvm/scummvm/commit/b0c9b857b411448083dc9f65bc1ca9d82df8b7ab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-24T01:13:14+01:00
Commit Message:
DIRECTOR: Enumerated transition types
Changed paths:
engines/director/transitions.cpp
engines/director/types.h
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index b4a9ef4080..575738e925 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -42,7 +42,7 @@ void Frame::playTransition(Score *score) {
uint16 steps = duration / stepDuration;
switch (_transType) {
- case kTransCoverDown:
+ case kTransCoverDown: // 29
{
uint16 stepSize = score->_movieRect.height() / steps;
Common::Rect r = score->_movieRect;
@@ -58,7 +58,8 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverUp:
+
+ case kTransCoverUp: // 34
{
uint16 stepSize = score->_movieRect.height() / steps;
Common::Rect r = score->_movieRect;
@@ -74,7 +75,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverRight: {
+
+ case kTransCoverRight: // 33
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -89,7 +92,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverLeft: {
+
+ case kTransCoverLeft: // 32
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -104,7 +109,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverUpLeft: {
+
+ case kTransCoverUpLeft: // 35
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -120,7 +127,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverUpRight: {
+
+ case kTransCoverUpRight: // 36
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -136,7 +145,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverDownLeft: {
+
+ case kTransCoverDownLeft: // 30
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -152,7 +163,9 @@ void Frame::playTransition(Score *score) {
}
}
break;
- case kTransCoverDownRight: {
+
+ case kTransCoverDownRight: // 31
+ {
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -168,6 +181,7 @@ void Frame::playTransition(Score *score) {
}
}
break;
+
default:
warning("Frame::playTransition(): Unhandled transition type %d %d %d", _transType, duration, _transChunkSize);
break;
diff --git a/engines/director/types.h b/engines/director/types.h
index 194550038f..6e93e0944f 100644
--- a/engines/director/types.h
+++ b/engines/director/types.h
@@ -181,52 +181,52 @@ enum TransitionType {
kTransWipeLeft,
kTransWipeDown,
kTransWipeUp,
- kTransCenterOutHorizontal,
+ kTransCenterOutHorizontal, // 5
kTransEdgesInHorizontal,
kTransCenterOutVertical,
kTransEdgesInVertical,
kTransCenterOutSquare,
- kTransEdgesInSquare,
+ kTransEdgesInSquare, // 10
kTransPushLeft,
kTransPushRight,
kTransPushDown,
kTransPushUp,
- kTransRevealUp,
+ kTransRevealUp, // 15
kTransRevealUpRight,
kTransRevealRight,
kTransRevealDown,
kTransRevealDownRight,
- kTransRevealDownLeft,
+ kTransRevealDownLeft, // 20
kTransRevealLeft,
kTransRevealUpLeft,
kTransDissolvePixelsFast,
kTransDissolveBoxyRects,
- kTransDissolveBoxySquares,
+ kTransDissolveBoxySquares, // 25
kTransDissolvePatterns,
kTransRandomRows,
kTransRandomColumns,
kTransCoverDown,
- kTransCoverDownLeft,
+ kTransCoverDownLeft, // 30
kTransCoverDownRight,
kTransCoverLeft,
kTransCoverRight,
kTransCoverUp,
- kTransCoverUpLeft,
+ kTransCoverUpLeft, // 35
kTransCoverUpRight,
kTransTypeVenitianBlind,
kTransTypeCheckerboard,
kTransTypeStripsBottomBuildLeft,
- kTransTypeStripsBottomBuildRight,
+ kTransTypeStripsBottomBuildRight, // 40
kTransTypeStripsLeftBuildDown,
kTransTypeStripsLeftBuildUp,
kTransTypeStripsRightBuildDown,
kTransTypeStripsRightBuildUp,
- kTransTypeStripsTopBuildLeft,
+ kTransTypeStripsTopBuildLeft, // 45
kTransTypeStripsTopBuildRight,
kTransZoomOpen,
kTransZoomClose,
kTransVerticalBinds,
- kTransDissolveBitsTrans,
+ kTransDissolveBitsTrans, // 50
kTransDissolvePixels,
kTransDissolveBits
};
Commit: 83610a97ba0a7b4b4a234991776a387f602a5234
https://github.com/scummvm/scummvm/commit/83610a97ba0a7b4b4a234991776a387f602a5234
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-24T01:15:38+01:00
Commit Message:
DIRECTOR: Sorted transition implementations
Changed paths:
engines/director/transitions.cpp
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 575738e925..2dc8d5f747 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -59,30 +59,32 @@ void Frame::playTransition(Score *score) {
}
break;
- case kTransCoverUp: // 34
+ case kTransCoverDownLeft: // 30
{
- uint16 stepSize = score->_movieRect.height() / steps;
+ uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
for (uint16 i = 1; i < steps; i++) {
+ r.setWidth(stepSize * i);
r.setHeight(stepSize * i);
g_system->delayMillis(stepDuration);
processQuitEvent();
- g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, 0, score->_movieRect.height() - stepSize * i, r.width(), r.height()); // transition
+ g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, score->_movieRect.width() - stepSize * i, 0, r.width(), r.height()); // transition
g_system->updateScreen();
}
}
break;
- case kTransCoverRight: // 33
+ case kTransCoverDownRight: // 31
{
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
for (uint16 i = 1; i < steps; i++) {
r.setWidth(stepSize * i);
+ r.setHeight(stepSize * i);
g_system->delayMillis(stepDuration);
processQuitEvent();
@@ -110,31 +112,29 @@ void Frame::playTransition(Score *score) {
}
break;
- case kTransCoverUpLeft: // 35
+ case kTransCoverRight: // 33
{
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
for (uint16 i = 1; i < steps; i++) {
r.setWidth(stepSize * i);
- r.setHeight(stepSize * i);
g_system->delayMillis(stepDuration);
processQuitEvent();
- g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, score->_movieRect.width() - stepSize * i, score->_movieRect.height() - stepSize * i, r.width(), r.height()); // transition
+ g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, 0, 0, r.width(), r.height()); // transition
g_system->updateScreen();
}
}
break;
- case kTransCoverUpRight: // 36
+ case kTransCoverUp: // 34
{
- uint16 stepSize = score->_movieRect.width() / steps;
+ uint16 stepSize = score->_movieRect.height() / steps;
Common::Rect r = score->_movieRect;
for (uint16 i = 1; i < steps; i++) {
- r.setWidth(stepSize * i);
r.setHeight(stepSize * i);
g_system->delayMillis(stepDuration);
@@ -146,7 +146,7 @@ void Frame::playTransition(Score *score) {
}
break;
- case kTransCoverDownLeft: // 30
+ case kTransCoverUpLeft: // 35
{
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -158,13 +158,13 @@ void Frame::playTransition(Score *score) {
g_system->delayMillis(stepDuration);
processQuitEvent();
- g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, score->_movieRect.width() - stepSize * i, 0, r.width(), r.height()); // transition
+ g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, score->_movieRect.width() - stepSize * i, score->_movieRect.height() - stepSize * i, r.width(), r.height()); // transition
g_system->updateScreen();
}
}
break;
- case kTransCoverDownRight: // 31
+ case kTransCoverUpRight: // 36
{
uint16 stepSize = score->_movieRect.width() / steps;
Common::Rect r = score->_movieRect;
@@ -176,7 +176,7 @@ void Frame::playTransition(Score *score) {
g_system->delayMillis(stepDuration);
processQuitEvent();
- g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, 0, 0, r.width(), r.height()); // transition
+ g_system->copyRectToScreen(score->_surface->getPixels(), score->_surface->pitch, 0, score->_movieRect.height() - stepSize * i, r.width(), r.height()); // transition
g_system->updateScreen();
}
}
Commit: 8676a75ce0a2db97ad107db80b48c88b54df9311
https://github.com/scummvm/scummvm/commit/8676a75ce0a2db97ad107db80b48c88b54df9311
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-24T01:20:14+01:00
Commit Message:
DIRECTOR: Added stubs for transitions used in Warlock intro
Changed paths:
engines/director/transitions.cpp
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 2dc8d5f747..721ffd545c 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -42,6 +42,18 @@ void Frame::playTransition(Score *score) {
uint16 steps = duration / stepDuration;
switch (_transType) {
+ case kTransCenterOutHorizontal: // 5
+ {
+ warning("Frame::playTransition(): Unhandled transition type kTransCenterOutHorizontal %d %d", duration, _transChunkSize);
+ }
+ break;
+
+ case kTransCenterOutVertical: // 7
+ {
+ warning("Frame::playTransition(): Unhandled transition type kTransCenterOutVertical %d %d", duration, _transChunkSize);
+ }
+ break;
+
case kTransCoverDown: // 29
{
uint16 stepSize = score->_movieRect.height() / steps;
@@ -182,6 +194,12 @@ void Frame::playTransition(Score *score) {
}
break;
+ case kTransDissolvePixels: // 51
+ {
+ warning("Frame::playTransition(): Unhandled transition type kTransDissolvePixels %d %d", duration, _transChunkSize);
+ }
+ break;
+
default:
warning("Frame::playTransition(): Unhandled transition type %d %d %d", _transType, duration, _transChunkSize);
break;
More information about the Scummvm-git-logs
mailing list