diff options
| author | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-05-13 23:02:05 +0300 |
|---|---|---|
| committer | Aleksandar Stojiljkovic <aleksandar.stojiljkovic@mapbox.com> | 2019-05-28 14:38:01 +0300 |
| commit | 9809c9f8f5583739e07d1a02df4c6cb96dfc4a10 (patch) | |
| tree | f61c9979ad7943c1975aad6725054b2458c22b36 /include | |
| parent | ddb6f749ec8992c363c067b6ad5871b31ccb7b8a (diff) | |
| download | qtlocation-mapboxgl-9809c9f8f5583739e07d1a02df4c6cb96dfc4a10.tar.gz | |
[core] Offset viewport center when edge insets are specified
The change is implemented in TransformState::getProjMatrix, the rest of the code is making sure that existing API contracts stay and there are tests verifyingrendering and render query processing only items within screen and given tolerance around screen edges.
MapView: don't bake edge insets into relalculated camera center. Keep edge insets as property of camera in TransformState (similar to pitch, zoom, bearing) independent from specified camera center. Interpolate edge insets in animation.
iOS Demo app: "Turn On/Off Content Insets" pitch the camera and navigate to convenient location in Denver, where streets are parallel to cardinal directions, to illustrate viewport center offset when edge insets are set.
Tests:
ViewFrustumCulling: although Annotations are deprecated, queryRenderedFeatures related tests in Annotations would need to get ported and decided to add the edge insets related query tests next to them. Verify frustum culling (render+queryRenderedFeatures) With different camera and edge insets setups. TODO: port Annotations tests.
Transform.Padding: Verify that coordinates take proper place on screen after applying edge insets.
LocalGlyphRasterizer: verify text rendering when applying padding.
Related to #11882: both use projection matrix elements [8] and [9].
Alternative approach to this was to increase and offset map origin so that the screen would be a sub-rectangle in larger map viewport. This approach has a drawback of unecessary processing the items that are outside screen area.
Fixes #12107, #12728, navigation-sdks/issues/120
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/camera.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index e3d6677c0a..c8b665fc16 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -16,7 +16,7 @@ namespace mbgl { */ struct CameraOptions { CameraOptions& withCenter(const optional<LatLng>& o) { center = o; return *this; } - CameraOptions& withPadding(const EdgeInsets& p) { padding = p; return *this; } + CameraOptions& withPadding(const optional<EdgeInsets>& p) { padding = p; return *this; } CameraOptions& withAnchor(const optional<ScreenCoordinate>& o) { anchor = o; return *this; } CameraOptions& withZoom(const optional<double>& o) { zoom = o; return *this; } CameraOptions& withBearing(const optional<double>& o) { bearing = o; return *this; } @@ -27,7 +27,7 @@ struct CameraOptions { /** Padding around the interior of the view that affects the frame of reference for `center`. */ - EdgeInsets padding; + optional<EdgeInsets> padding; /** Point of reference for `zoom` and `angle`, assuming an origin at the top-left corner of the view. */ |