1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00

Close #15896: Refactor out the ZoomLevel operators

This commit is contained in:
Hielke Morsink
2022-02-26 23:14:59 +01:00
committed by GitHub
parent f27d0ff3b0
commit ba85cf4873
23 changed files with 136 additions and 135 deletions

View File

@@ -358,8 +358,8 @@ static rct_viewport GetGiantViewport(const TileCoordsXY& mapSize, int32_t rotati
viewport.viewPos = { left, top };
viewport.view_width = right - left;
viewport.view_height = bottom - top;
viewport.width = viewport.view_width / zoom;
viewport.height = viewport.view_height / zoom;
viewport.width = zoom.ApplyInversedTo(viewport.view_width);
viewport.height = zoom.ApplyInversedTo(viewport.view_height);
viewport.zoom = zoom;
return viewport;
}
@@ -805,8 +805,8 @@ void CaptureImage(const CaptureOptions& options)
auto z = tile_element_height(options.View->Position);
CoordsXYZ coords3d(options.View->Position, z);
auto coords2d = translate_3d_to_2d_with_z(options.Rotation, coords3d);
viewport.viewPos = { coords2d.x - ((viewport.view_width * options.Zoom) / 2),
coords2d.y - ((viewport.view_height * options.Zoom) / 2) };
viewport.viewPos = { coords2d.x - ((options.Zoom.ApplyTo(viewport.view_width)) / 2),
coords2d.y - ((options.Zoom.ApplyTo(viewport.view_height)) / 2) };
viewport.zoom = options.Zoom;
}
else