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

ZVISION: screenSpaceToImageSpace return 0,0 when pointer outside working window.

Browse Source
This commit is contained in:
Marisa-Chan 2013-10-17 20:24:17 +00:00
parent aba818d195
commit b9ad7e80a5
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/zvision/render_manager.cpp
View File

@ -385,30 +385,34 @@ Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Com
} }
const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) { const Common::Point RenderManager::screenSpaceToImageSpace(const Common::Point &point) {
// Convert from screen space to working window space if (_workingWindow.contains(point)) {
Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top)); // Convert from screen space to working window space
Common::Point newPoint(point - Common::Point(_workingWindow.left, _workingWindow.top));
RenderTable::RenderState state = _renderTable.getRenderState(); RenderTable::RenderState state = _renderTable.getRenderState();
if (state == RenderTable::PANORAMA || state == RenderTable::TILT) { if (state == RenderTable::PANORAMA || state == RenderTable::TILT) {
newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint); newPoint = _renderTable.convertWarpedCoordToFlatCoord(newPoint);
}
if (state == RenderTable::PANORAMA) {
newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
} else if (state == RenderTable::TILT) {
newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
}
if (newPoint.x < 0)
newPoint.x += _backgroundWidth;
else if (newPoint.x >= _backgroundWidth)
newPoint.x -= _backgroundWidth;
if (newPoint.y < 0)
newPoint.y += _backgroundHeight;
else if (newPoint.y >= _backgroundHeight)
newPoint.y -= _backgroundHeight;
return newPoint;
} else {
return Common::Point(0, 0);
} }
if (state == RenderTable::PANORAMA) {
newPoint -= (Common::Point(_screenCenterX, 0) - _backgroundOffset);
} else if (state == RenderTable::TILT) {
newPoint -= (Common::Point(0, _screenCenterY) - _backgroundOffset);
}
if (newPoint.x < 0)
newPoint.x += _backgroundWidth;
else if (newPoint.x >= _backgroundWidth)
newPoint.x -= _backgroundWidth;
if (newPoint.y < 0)
newPoint.y += _backgroundHeight;
else if (newPoint.y >= _backgroundHeight)
newPoint.y -= _backgroundHeight;
return newPoint;
} }
const Common::Point RenderManager::imageSpaceToWorkingWindowSpace(const Common::Point &point) { const Common::Point RenderManager::imageSpaceToWorkingWindowSpace(const Common::Point &point) {