diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-11 14:10:17 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-11 15:48:51 +0300 |
| commit | c13dd32242b559b00b0b716dc524ed5161c2b147 (patch) | |
| tree | 96c83728499b7317c8a6d087d38016b9a2e55644 /platform | |
| parent | 659c2568ece4153f34d2880e53f54351f51b0917 (diff) | |
| download | qtlocation-mapboxgl-c13dd32242b559b00b0b716dc524ed5161c2b147.tar.gz | |
[core] Added Viewport mode
Satisfies embedding platforms that requires the viewport coordinate
systems to be set according to its standards e.g. viewport mirrored
vertically.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/default/glfw_view.cpp | 1 | ||||
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 2 | ||||
| -rw-r--r-- | platform/osx/src/MGLMapView.mm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/platform/default/glfw_view.cpp b/platform/default/glfw_view.cpp index 7fb47ff7c9..e3a38114bd 100644 --- a/platform/default/glfw_view.cpp +++ b/platform/default/glfw_view.cpp @@ -96,6 +96,7 @@ GLFWView::GLFWView(bool fullscreen_, bool benchmark_) printf("- Press `N` to reset north\n"); printf("- Press `R` to toggle any available `night` style class\n"); printf("- Press `Z` to cycle through north orientations\n"); + printf("- Prezz `X` to cycle through the viewport modes\n"); printf("- Press `A` to cycle through Mapbox offices in the world + dateline monument\n"); printf("\n"); printf("- Press `1` through `6` to add increasing numbers of point annotations for testing\n"); diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 11484a097a..a0c24eebe5 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -380,7 +380,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) // setup mbgl map mbgl::DefaultFileSource *mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource; - _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None); + _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default); [self validateTileCacheSize]; // start paused if in IB diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm index 382d9f8bad..7a17aa9250 100644 --- a/platform/osx/src/MGLMapView.mm +++ b/platform/osx/src/MGLMapView.mm @@ -261,7 +261,7 @@ public: [[NSFileManager defaultManager] removeItemAtURL:legacyCacheURL error:NULL]; mbgl::DefaultFileSource *mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource; - _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None); + _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default); [self validateTileCacheSize]; // Install the OpenGL layer. Interface Builder’s synchronous drawing means |