libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-06 10:58:01 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SCI: improving delaying transitions

Browse Source 
should hopefully make them run better on different platforms (some platforms dont update on every updateScreen call, so the transitions worked much faster there (e.g. wii) and some other platforms dont have that much power, so transitions were slower on those)

svn-id: r52266
This commit is contained in:
Martin Kiewitz 2010-08-21 17:49:59 +00:00
parent 1a0d7c87d3
commit ee6f972247
2 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
engines/sci/graphics/transitions.cpp
View File

@ -121,11 +121,20 @@ void GfxTransitions::setup(int16 number, bool blackoutFlag) {
} }
} }
void GfxTransitions::updateScreenAndWait(int msec) { void GfxTransitions::updateScreenAndWait(uint32 shouldBeAtMsec) {
Common::Event ev; Common::Event ev;
g_system->updateScreen(); uint32 msecPos = g_system->getMillis() - _transitionStartTime;
g_system->delayMillis(msec);
while (g_system->getEventManager()->pollEvent(ev)) {} // discard all events while (g_system->getEventManager()->pollEvent(ev)) {} // discard all events
if (shouldBeAtMsec > msecPos) {
// only update screen, if we are not behind schedule
g_system->updateScreen();
// and if still too early, delay those milliseconds
msecPos = g_system->getMillis() - _transitionStartTime;
if (shouldBeAtMsec > msecPos)
g_system->delayMillis(shouldBeAtMsec - msecPos);
}
} }
// will translate a number and return corresponding translationEntry // will translate a number and return corresponding translationEntry
@ -191,6 +200,7 @@ void GfxTransitions::doTransition(int16 number, bool blackoutFlag) {
setNewPalette(blackoutFlag); setNewPalette(blackoutFlag);
} }
_transitionStartTime = g_system->getMillis();
switch (number) { switch (number) {
case SCI_TRANSITIONS_VERTICALROLL_FROMCENTER: case SCI_TRANSITIONS_VERTICALROLL_FROMCENTER:
verticalRollFromCenter(blackoutFlag); verticalRollFromCenter(blackoutFlag);
@ -321,6 +331,7 @@ void GfxTransitions::fadeIn() {
void GfxTransitions::pixelation(bool blackoutFlag) { void GfxTransitions::pixelation(bool blackoutFlag) {
uint16 mask = 0x40, stepNr = 0; uint16 mask = 0x40, stepNr = 0;
Common::Rect pixelRect; Common::Rect pixelRect;
uint32 msecCount = 0;
do { do {
mask = (mask & 1) ? (mask >> 1) ^ 0xB400 : mask >> 1; mask = (mask & 1) ? (mask >> 1) ^ 0xB400 : mask >> 1;
@ -332,7 +343,8 @@ void GfxTransitions::pixelation(bool blackoutFlag) {
if (!pixelRect.isEmpty()) if (!pixelRect.isEmpty())
copyRectToScreen(pixelRect, blackoutFlag); copyRectToScreen(pixelRect, blackoutFlag);
if ((stepNr & 0x3FF) == 0) { if ((stepNr & 0x3FF) == 0) {
updateScreenAndWait(5); msecCount += 9;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
} while (mask != 0x40); } while (mask != 0x40);
@ -343,6 +355,7 @@ void GfxTransitions::pixelation(bool blackoutFlag) {
void GfxTransitions::blocks(bool blackoutFlag) { void GfxTransitions::blocks(bool blackoutFlag) {
uint16 mask = 0x40, stepNr = 0; uint16 mask = 0x40, stepNr = 0;
Common::Rect blockRect; Common::Rect blockRect;
uint32 msecCount = 0;
do { do {
mask = (mask & 1) ? (mask >> 1) ^ 0x240 : mask >> 1; mask = (mask & 1) ? (mask >> 1) ^ 0x240 : mask >> 1;
@ -354,7 +367,8 @@ void GfxTransitions::blocks(bool blackoutFlag) {
if (!blockRect.isEmpty()) if (!blockRect.isEmpty())
copyRectToScreen(blockRect, blackoutFlag); copyRectToScreen(blockRect, blackoutFlag);
if ((stepNr & 7) == 0) { if ((stepNr & 7) == 0) {
updateScreenAndWait(4); msecCount += 5;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
} while (mask != 0x40); } while (mask != 0x40);
@ -365,6 +379,7 @@ void GfxTransitions::blocks(bool blackoutFlag) {
void GfxTransitions::straight(int16 number, bool blackoutFlag) { void GfxTransitions::straight(int16 number, bool blackoutFlag) {
int16 stepNr = 0; int16 stepNr = 0;
Common::Rect newScreenRect = _picRect; Common::Rect newScreenRect = _picRect;
uint32 msecCount = 0;
switch (number) { switch (number) {
case SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT: case SCI_TRANSITIONS_STRAIGHT_FROM_RIGHT:
@ -372,7 +387,8 @@ void GfxTransitions::straight(int16 number, bool blackoutFlag) {
while (newScreenRect.left >= _picRect.left) { while (newScreenRect.left >= _picRect.left) {
copyRectToScreen(newScreenRect, blackoutFlag); copyRectToScreen(newScreenRect, blackoutFlag);
if ((stepNr & 1) == 0) { if ((stepNr & 1) == 0) {
updateScreenAndWait(1); msecCount += 2;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
newScreenRect.translate(-1, 0); newScreenRect.translate(-1, 0);
@ -384,7 +400,8 @@ void GfxTransitions::straight(int16 number, bool blackoutFlag) {
while (newScreenRect.right <= _picRect.right) { while (newScreenRect.right <= _picRect.right) {
copyRectToScreen(newScreenRect, blackoutFlag); copyRectToScreen(newScreenRect, blackoutFlag);
if ((stepNr & 1) == 0) { if ((stepNr & 1) == 0) {
updateScreenAndWait(1); msecCount += 2;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
newScreenRect.translate(1, 0); newScreenRect.translate(1, 0);
@ -395,7 +412,8 @@ void GfxTransitions::straight(int16 number, bool blackoutFlag) {
newScreenRect.top = newScreenRect.bottom - 1; newScreenRect.top = newScreenRect.bottom - 1;
while (newScreenRect.top >= _picRect.top) { while (newScreenRect.top >= _picRect.top) {
copyRectToScreen(newScreenRect, blackoutFlag); copyRectToScreen(newScreenRect, blackoutFlag);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
stepNr++; stepNr++;
newScreenRect.translate(0, -1); newScreenRect.translate(0, -1);
} }
@ -405,7 +423,8 @@ void GfxTransitions::straight(int16 number, bool blackoutFlag) {
newScreenRect.bottom = newScreenRect.top + 1; newScreenRect.bottom = newScreenRect.top + 1;
while (newScreenRect.bottom <= _picRect.bottom) { while (newScreenRect.bottom <= _picRect.bottom) {
copyRectToScreen(newScreenRect, blackoutFlag); copyRectToScreen(newScreenRect, blackoutFlag);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
stepNr++; stepNr++;
newScreenRect.translate(0, 1); newScreenRect.translate(0, 1);
} }
@ -434,6 +453,7 @@ void GfxTransitions::scroll(int16 number) {
Common::Rect oldScreenRect = _picRect; Common::Rect oldScreenRect = _picRect;
Common::Rect newMoveRect = _picRect; Common::Rect newMoveRect = _picRect;
Common::Rect newScreenRect = _picRect; Common::Rect newScreenRect = _picRect;
uint32 msecCount = 0;
_screen->copyFromScreen(_oldScreen); _screen->copyFromScreen(_oldScreen);
screenWidth = _screen->getDisplayWidth(); screenHeight = _screen->getDisplayHeight(); screenWidth = _screen->getDisplayWidth(); screenHeight = _screen->getDisplayHeight();
@ -449,7 +469,8 @@ void GfxTransitions::scroll(int16 number) {
newScreenRect.right++; newMoveRect.left--; newScreenRect.right++; newMoveRect.left--;
_screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top); _screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top);
if ((stepNr & 1) == 0) { if ((stepNr & 1) == 0) {
updateScreenAndWait(1); msecCount += 4;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
} }
@ -470,7 +491,8 @@ void GfxTransitions::scroll(int16 number) {
newScreenRect.left--; newScreenRect.left--;
_screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top); _screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top);
if ((stepNr & 1) == 0) { if ((stepNr & 1) == 0) {
updateScreenAndWait(1); msecCount += 4;
updateScreenAndWait(msecCount);
} }
stepNr++; stepNr++;
} }
@ -491,7 +513,8 @@ void GfxTransitions::scroll(int16 number) {
scrollCopyOldToScreen(oldScreenRect, _picRect.left, _picRect.top); scrollCopyOldToScreen(oldScreenRect, _picRect.left, _picRect.top);
newScreenRect.bottom++; newMoveRect.top--; newScreenRect.bottom++; newMoveRect.top--;
_screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top); _screen->copyRectToScreen(newScreenRect, newMoveRect.left, newMoveRect.top);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
break; break;
@ -503,7 +526,8 @@ void GfxTransitions::scroll(int16 number) {
scrollCopyOldToScreen(oldScreenRect, oldMoveRect.left, oldMoveRect.top); scrollCopyOldToScreen(oldScreenRect, oldMoveRect.left, oldMoveRect.top);
newScreenRect.top--; newScreenRect.top--;
_screen->copyRectToScreen(newScreenRect, _picRect.left, _picRect.top); _screen->copyRectToScreen(newScreenRect, _picRect.left, _picRect.top);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
break; break;
} }
@ -514,6 +538,7 @@ void GfxTransitions::scroll(int16 number) {
void GfxTransitions::verticalRollFromCenter(bool blackoutFlag) { void GfxTransitions::verticalRollFromCenter(bool blackoutFlag) {
Common::Rect leftRect = Common::Rect(_picRect.left + (_picRect.width() / 2) -1, _picRect.top, _picRect.left + (_picRect.width() / 2), _picRect.bottom); Common::Rect leftRect = Common::Rect(_picRect.left + (_picRect.width() / 2) -1, _picRect.top, _picRect.left + (_picRect.width() / 2), _picRect.bottom);
Common::Rect rightRect = Common::Rect(leftRect.right, _picRect.top, leftRect.right + 1, _picRect.bottom); Common::Rect rightRect = Common::Rect(leftRect.right, _picRect.top, leftRect.right + 1, _picRect.bottom);
uint32 msecCount = 0;
while ((leftRect.left >= _picRect.left) || (rightRect.right <= _picRect.right)) { while ((leftRect.left >= _picRect.left) || (rightRect.right <= _picRect.right)) {
if (leftRect.left < _picRect.left) if (leftRect.left < _picRect.left)
@ -522,7 +547,8 @@ void GfxTransitions::verticalRollFromCenter(bool blackoutFlag) {
rightRect.translate(-1, 0); rightRect.translate(-1, 0);
copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(-1, 0); copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(-1, 0);
copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(1, 0); copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(1, 0);
updateScreenAndWait(2); msecCount += 3;
updateScreenAndWait(msecCount);
} }
} }
@ -531,11 +557,13 @@ void GfxTransitions::verticalRollFromCenter(bool blackoutFlag) {
void GfxTransitions::verticalRollToCenter(bool blackoutFlag) { void GfxTransitions::verticalRollToCenter(bool blackoutFlag) {
Common::Rect leftRect = Common::Rect(_picRect.left, _picRect.top, _picRect.left + 1, _picRect.bottom); Common::Rect leftRect = Common::Rect(_picRect.left, _picRect.top, _picRect.left + 1, _picRect.bottom);
Common::Rect rightRect = Common::Rect(_picRect.right - 1, _picRect.top, _picRect.right, _picRect.bottom); Common::Rect rightRect = Common::Rect(_picRect.right - 1, _picRect.top, _picRect.right, _picRect.bottom);
uint32 msecCount = 0;
while (leftRect.left < rightRect.right) { while (leftRect.left < rightRect.right) {
copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(1, 0); copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(1, 0);
copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(-1, 0); copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(-1, 0);
updateScreenAndWait(2); msecCount += 3;
updateScreenAndWait(msecCount);
} }
} }
@ -544,6 +572,7 @@ void GfxTransitions::verticalRollToCenter(bool blackoutFlag) {
void GfxTransitions::horizontalRollFromCenter(bool blackoutFlag) { void GfxTransitions::horizontalRollFromCenter(bool blackoutFlag) {
Common::Rect upperRect = Common::Rect(_picRect.left, _picRect.top + (_picRect.height() / 2) - 1, _picRect.right, _picRect.top + (_picRect.height() / 2)); Common::Rect upperRect = Common::Rect(_picRect.left, _picRect.top + (_picRect.height() / 2) - 1, _picRect.right, _picRect.top + (_picRect.height() / 2));
Common::Rect lowerRect = Common::Rect(upperRect.left, upperRect.bottom, upperRect.right, upperRect.bottom + 1); Common::Rect lowerRect = Common::Rect(upperRect.left, upperRect.bottom, upperRect.right, upperRect.bottom + 1);
uint32 msecCount = 0;
while ((upperRect.top >= _picRect.top) || (lowerRect.bottom <= _picRect.bottom)) { while ((upperRect.top >= _picRect.top) || (lowerRect.bottom <= _picRect.bottom)) {
if (upperRect.top < _picRect.top) if (upperRect.top < _picRect.top)
@ -552,7 +581,8 @@ void GfxTransitions::horizontalRollFromCenter(bool blackoutFlag) {
lowerRect.translate(0, -1); lowerRect.translate(0, -1);
copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, -1); copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, -1);
copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, 1); copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, 1);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
} }
@ -561,11 +591,13 @@ void GfxTransitions::horizontalRollFromCenter(bool blackoutFlag) {
void GfxTransitions::horizontalRollToCenter(bool blackoutFlag) { void GfxTransitions::horizontalRollToCenter(bool blackoutFlag) {
Common::Rect upperRect = Common::Rect(_picRect.left, _picRect.top, _picRect.right, _picRect.top + 1); Common::Rect upperRect = Common::Rect(_picRect.left, _picRect.top, _picRect.right, _picRect.top + 1);
Common::Rect lowerRect = Common::Rect(upperRect.left, _picRect.bottom - 1, upperRect.right, _picRect.bottom); Common::Rect lowerRect = Common::Rect(upperRect.left, _picRect.bottom - 1, upperRect.right, _picRect.bottom);
uint32 msecCount = 0;
while (upperRect.top < lowerRect.bottom) { while (upperRect.top < lowerRect.bottom) {
copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, 1); copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, 1);
copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, -1); copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, -1);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
} }
@ -577,6 +609,7 @@ void GfxTransitions::diagonalRollFromCenter(bool blackoutFlag) {
Common::Rect lowerRect(upperRect.left, upperRect.top, upperRect.right, upperRect.bottom); Common::Rect lowerRect(upperRect.left, upperRect.top, upperRect.right, upperRect.bottom);
Common::Rect leftRect(upperRect.left, upperRect.top, upperRect.left + 1, lowerRect.bottom); Common::Rect leftRect(upperRect.left, upperRect.top, upperRect.left + 1, lowerRect.bottom);
Common::Rect rightRect(upperRect.right, upperRect.top, upperRect.right + 1, lowerRect.bottom); Common::Rect rightRect(upperRect.right, upperRect.top, upperRect.right + 1, lowerRect.bottom);
uint32 msecCount = 0;
while ((upperRect.top >= _picRect.top) || (lowerRect.bottom <= _picRect.bottom)) { while ((upperRect.top >= _picRect.top) || (lowerRect.bottom <= _picRect.bottom)) {
if (upperRect.top < _picRect.top) { if (upperRect.top < _picRect.top) {
@ -595,7 +628,8 @@ void GfxTransitions::diagonalRollFromCenter(bool blackoutFlag) {
copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, 1); lowerRect.left--; lowerRect.right++; copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, 1); lowerRect.left--; lowerRect.right++;
copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(-1, 0); leftRect.top--; leftRect.bottom++; copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(-1, 0); leftRect.top--; leftRect.bottom++;
copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(1, 0); rightRect.top--; rightRect.bottom++; copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(1, 0); rightRect.top--; rightRect.bottom++;
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
} }
@ -606,13 +640,15 @@ void GfxTransitions::diagonalRollToCenter(bool blackoutFlag) {
Common::Rect lowerRect(_picRect.left, _picRect.bottom - 1, _picRect.right, _picRect.bottom); Common::Rect lowerRect(_picRect.left, _picRect.bottom - 1, _picRect.right, _picRect.bottom);
Common::Rect leftRect(_picRect.left, _picRect.top, _picRect.left + 1, _picRect.bottom); Common::Rect leftRect(_picRect.left, _picRect.top, _picRect.left + 1, _picRect.bottom);
Common::Rect rightRect(_picRect.right - 1, _picRect.top, _picRect.right, _picRect.bottom); Common::Rect rightRect(_picRect.right - 1, _picRect.top, _picRect.right, _picRect.bottom);
uint32 msecCount = 0;
while (upperRect.top < lowerRect.bottom) { while (upperRect.top < lowerRect.bottom) {
copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, 1); upperRect.left++; upperRect.right--; copyRectToScreen(upperRect, blackoutFlag); upperRect.translate(0, 1); upperRect.left++; upperRect.right--;
copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, -1); lowerRect.left++; lowerRect.right--; copyRectToScreen(lowerRect, blackoutFlag); lowerRect.translate(0, -1); lowerRect.left++; lowerRect.right--;
copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(1, 0); copyRectToScreen(leftRect, blackoutFlag); leftRect.translate(1, 0);
copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(-1, 0); copyRectToScreen(rightRect, blackoutFlag); rightRect.translate(-1, 0);
updateScreenAndWait(3); msecCount += 4;
updateScreenAndWait(msecCount);
} }
} }

4
engines/sci/graphics/transitions.h
View File

@ -91,7 +91,7 @@ private:
void horizontalRollToCenter(bool blackoutFlag); void horizontalRollToCenter(bool blackoutFlag);
void diagonalRollFromCenter(bool blackoutFlag); void diagonalRollFromCenter(bool blackoutFlag);
void diagonalRollToCenter(bool blackoutFlag); void diagonalRollToCenter(bool blackoutFlag);
void updateScreenAndWait(int msec); void updateScreenAndWait(uint32 shouldBeAtMsec);
GfxScreen *_screen; GfxScreen *_screen;
GfxPalette *_palette; GfxPalette *_palette;
@ -102,6 +102,8 @@ private:
bool _blackoutFlag; bool _blackoutFlag;
Common::Rect _picRect; Common::Rect _picRect;
byte *_oldScreen; // buffer for saving current active screen data to, has dimenions of _screen->_displayScreen byte *_oldScreen; // buffer for saving current active screen data to, has dimenions of _screen->_displayScreen
uint32 _transitionStartTime; // when the current transition started in milliseconds
}; };
} // End of namespace Sci } // End of namespace Sci