libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 22:07:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: Do precomputations for 'zoomBox' built-in

Browse Source
This commit is contained in:
Eugene Sandulenko 2019-12-09 22:36:57 +01:00
parent 1c119b4119
commit 080c2b8410
3 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/director/frame.cpp
View File

@ -998,4 +998,12 @@ bool Frame::checkSpriteIntersection(uint16 spriteId, Common::Point pos) {
return false; return false;
} }
Common::Rect *Frame::getSpriteRect(uint16 spriteId) {
for (int dr = _drawRects.size() - 1; dr >= 0; dr--)
if (_drawRects[dr]->spriteId == spriteId)
return &_drawRects[dr]->rect;
return nullptr;
}
} // End of namespace Director } // End of namespace Director

1
engines/director/frame.h
View File

@ -118,6 +118,7 @@ public:
void prepareFrame(Score *score); void prepareFrame(Score *score);
uint16 getSpriteIDFromPos(Common::Point pos); uint16 getSpriteIDFromPos(Common::Point pos);
bool checkSpriteIntersection(uint16 spriteId, Common::Point pos); bool checkSpriteIntersection(uint16 spriteId, Common::Point pos);
Common::Rect *getSpriteRect(uint16 spriteId);
void executeImmediateScripts(); void executeImmediateScripts();

48
engines/director/lingo/lingo-builtins.cpp
View File

@ -1278,9 +1278,55 @@ void Lingo::b_unLoadCast(int nargs) {
} }
void Lingo::b_zoomBox(int nargs) { void Lingo::b_zoomBox(int nargs) {
// zoomBox startSprite, endSprite [, delatTicks]
// ticks are in 1/60th, default 1
g_lingo->printSTUBWithArglist("b_zoomBox", nargs); g_lingo->printSTUBWithArglist("b_zoomBox", nargs);
g_lingo->dropStack(nargs); if (nargs < 2 || nargs > 3) {
warning("b_zoomBox: expected 2 or 3 arguments, got %d", nargs);
g_lingo->dropStack(nargs);
return;
}
int delayTicks = 1;
if (nargs > 2) {
Datum d = g_lingo->pop();
d.toInt();
delayTicks = d.u.i;
}
Datum endSprite = g_lingo->pop();
Datum startSprite = g_lingo->pop();
startSprite.toInt();
endSprite.toInt();
Frame *frame = g_director->getCurrentScore()->_frames[g_director->getCurrentScore()->getCurrentFrame()];
Frame *frame2 = nullptr;
if (g_director->getCurrentScore()->_frames.size() > g_director->getCurrentScore()->getCurrentFrame())
frame2 = g_director->getCurrentScore()->_frames[g_director->getCurrentScore()->getCurrentFrame() + 1];
Common::Rect *startRect = frame->getSpriteRect(startSprite.u.i);
if (!startRect) {
warning("b_zoomBox: unknown start sprite #%d", startSprite.u.i);
return;
}
Common::Rect *endRect = frame->getSpriteRect(endSprite.u.i);
if (!endRect && frame2)
endRect = frame2->getSpriteRect(endSprite.u.i);
if (!endRect) {
warning("b_zoomBox: unknown end sprite #%d", endSprite.u.i);
return;
}
startRect->debugPrint(0, "b_zoomBox: start: ");
endRect->debugPrint(0, "b_zoomBox: end: ");
} }
void Lingo::b_updateStage(int nargs) { void Lingo::b_updateStage(int nargs) {