1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00

Fixed map view centering during scaling change

This commit is contained in:
Ivan Savenko
2023-05-17 14:36:12 +03:00
parent 9e3bc87a6b
commit 7504ceb256
2 changed files with 20 additions and 7 deletions

View File

@ -35,12 +35,15 @@ void MapViewModel::setLevel(int newLevel)
Point MapViewModel::getSingleTileSizeUpperLimit() const
{
return Point(128, 128); // arbitrary-seleted upscaling limit
// arbitrary-seleted upscaling limit
// TODO: figure out reason behind graphical artifacts on scaling higher than 120px (375%)
return Point(120, 120);
}
Point MapViewModel::getSingleTileSizeLowerLimit() const
{
return Point(4, 4); // arbitrary-seleted upscaling limit
// arbitrary-seleted downscaling limit
return Point(4, 4);
}
Point MapViewModel::getSingleTileSize() const
@ -114,14 +117,14 @@ Rect MapViewModel::getCacheTileArea(const int3 & coordinates) const
(getTilesVisibleDimensions().y + coordinates.y) % getTilesVisibleDimensions().y
};
return Rect(tileIndex * tileSize, tileSize);
return Rect(tileIndex * getSingleTileSize(), getSingleTileSize());
}
Rect MapViewModel::getTargetTileArea(const int3 & coordinates) const
{
Point topLeftOffset = getMapViewCenter() - getPixelsVisibleDimensions() / 2;
Point tilePosAbsolute = Point(coordinates) * tileSize;
Point tilePosAbsolute = Point(coordinates) * getSingleTileSize();
Point tilePosRelative = tilePosAbsolute - topLeftOffset;
return Rect(tilePosRelative, tileSize);
return Rect(tilePosRelative, getSingleTileSize());
}