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

TWINE: added missing reset of clipping area

Browse Source
This commit is contained in:
Martin Gerhardy 2021-10-10 17:10:17 +02:00
parent f9e6995539
commit 10402047b7
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engines/twine/renderer/redraw.cpp
View File

@ -336,6 +336,7 @@ void Redraw::processDrawListShadows(const DrawListStruct &drawCmd) {
addRedrawArea(_engine->_interface->_clip);
_engine->_debugScene->drawClip(renderRect);
_engine->_interface->resetClip();
}
void Redraw::processDrawListActors(const DrawListStruct &drawCmd, bool bgRedraw) {
@ -378,6 +379,7 @@ void Redraw::processDrawListActors(const DrawListStruct &drawCmd, bool bgRedraw)
}
_engine->_debugScene->drawClip(_engine->_interface->_clip);
_engine->_interface->resetClip();
}
}
@ -402,14 +404,15 @@ void Redraw::processDrawListActorSprites(const DrawListStruct &drawCmd, bool bgR
renderRect.right = renderRect.left + spriteWidth;
renderRect.bottom = renderRect.top + spriteHeight;
bool validClip;
if (actor->_staticFlags.bUsesClipping) {
const Common::Rect rect(_projPosScreen.x + actor->_cropLeft, _projPosScreen.y + actor->_cropTop, _projPosScreen.x + actor->_cropRight, _projPosScreen.y + actor->_cropBottom);
_engine->_interface->setClip(rect);
validClip = _engine->_interface->setClip(rect);
} else {
_engine->_interface->setClip(renderRect);
validClip = _engine->_interface->setClip(renderRect);
}
if (_engine->_interface->_clip.isValidRect()) {
if (validClip) {
_engine->_grid->drawSprite(0, renderRect.left, renderRect.top, spritePtr);
actor->_dynamicFlags.bIsVisible = 1;
@ -437,6 +440,7 @@ void Redraw::processDrawListActorSprites(const DrawListStruct &drawCmd, bool bgR
}
_engine->_debugScene->drawClip(renderRect);
_engine->_interface->resetClip();
}
}
@ -464,9 +468,7 @@ void Redraw::processDrawListExtras(const DrawListStruct &drawCmd) {
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
}
_engine->_interface->setClip(renderRect);
if (_engine->_interface->_clip.isValidRect()) {
if (_engine->_interface->setClip(renderRect)) {
const int32 tmpX = (extra->pos.x + BRICK_HEIGHT) / BRICK_SIZE;
const int32 tmpY = extra->pos.y / BRICK_HEIGHT;
const int32 tmpZ = (extra->pos.z + BRICK_HEIGHT) / BRICK_SIZE;
@ -476,6 +478,7 @@ void Redraw::processDrawListExtras(const DrawListStruct &drawCmd) {
// show clipping area
//drawRectBorders(renderRect);
_engine->_interface->resetClip();
}
}
@ -564,6 +567,8 @@ void Redraw::renderOverlays() {
_engine->_text->drawText(renderRect.left, renderRect.top, text);
addRedrawArea(_engine->_interface->_clip);
_engine->_interface->resetClip();
break;
}
case OverlayType::koNumberRange: {
@ -588,6 +593,7 @@ void Redraw::renderOverlays() {
_engine->_text->drawText(renderRect.left, renderRect.top, text);
addRedrawArea(_engine->_interface->_clip);
_engine->_interface->resetClip();
break;
}
case OverlayType::koInventoryItem: {
@ -603,6 +609,7 @@ void Redraw::renderOverlays() {
_engine->_menu->drawRectBorders(rect);
addRedrawArea(rect);
_engine->_gameState->initEngineProjections();
_engine->_interface->resetClip();
break;
}
case OverlayType::koText: {
@ -627,6 +634,7 @@ void Redraw::renderOverlays() {
_engine->_text->drawText(renderRect.left, renderRect.top, text);
addRedrawArea(_engine->_interface->_clip);
_engine->_interface->resetClip();
break;
}
}
@ -732,9 +740,10 @@ void Redraw::drawBubble(int32 actorIdx) {
renderRect.right = spriteWidth + renderRect.left - 1;
renderRect.bottom = spriteHeight + renderRect.top - 1;
_engine->_interface->setClip(renderRect);
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
_engine->_interface->resetClip();
if (_engine->_interface->setClip(renderRect)) {
_engine->_grid->drawSprite(renderRect.left, renderRect.top, spritePtr);
_engine->_interface->resetClip();
}
}
void Redraw::zoomScreenScale() {

1
engines/twine/renderer/renderer.cpp
View File

@ -1563,6 +1563,7 @@ void Renderer::renderBehaviourModel(const Common::Rect &rect, int32 y, int32 ang
} else {
renderIsoModel(0, y, 0, ANGLE_0, angle, ANGLE_0, bodyData, dummy);
}
_engine->_interface->resetClip();
}
void Renderer::renderInventoryItem(int32 x, int32 y, const BodyData &bodyData, int32 angle, int32 param) {

1
engines/twine/scene/gamestate.cpp
View File

@ -445,6 +445,7 @@ void GameState::processFoundItem(InventoryItems item) {
_engine->_text->stopVox(_engine->_text->_currDialTextEntry);
_engine->_scene->_sceneHero->_animTimerData = tmpAnimTimer;
_engine->_interface->resetClip();
}
void GameState::processGameChoices(TextId choiceIdx) {