diff options
Diffstat (limited to 'platform/glfw')
| -rw-r--r-- | platform/glfw/glfw_view.cpp | 8 | ||||
| -rw-r--r-- | platform/glfw/main.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/platform/glfw/glfw_view.cpp b/platform/glfw/glfw_view.cpp index d222112aa2..64c9eb495e 100644 --- a/platform/glfw/glfw_view.cpp +++ b/platform/glfw/glfw_view.cpp @@ -209,7 +209,7 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, #endif // MBGL_USE_GLES2 case GLFW_KEY_N: if (!mods) - view->map->easeTo(mbgl::CameraOptions().withAngle(0.0), mbgl::AnimationOptions {{mbgl::Milliseconds(500)}}); + view->map->easeTo(mbgl::CameraOptions().withBearing(0.0), mbgl::AnimationOptions {{mbgl::Milliseconds(500)}}); break; case GLFW_KEY_Z: view->nextOrientation(); @@ -273,10 +273,10 @@ void GLFWView::onKey(GLFWwindow *window, int key, int /*scancode*/, int action, const mbgl::LatLng center { point.y, point.x }; auto latLng = *camera.center; double bearing = ruler.bearing({ latLng.longitude(), latLng.latitude() }, point); - double easing = bearing - *camera.angle; + double easing = bearing - *camera.bearing; easing += easing > 180.0 ? -360.0 : easing < -180 ? 360.0 : 0; - bearing = *camera.angle + (easing / 20); - routeMap->jumpTo(mbgl::CameraOptions().withCenter(center).withZoom(18.0).withAngle(bearing).withPitch(60.0)); + bearing = *camera.bearing + (easing / 20); + routeMap->jumpTo(mbgl::CameraOptions().withCenter(center).withZoom(18.0).withBearing(bearing).withPitch(60.0)); }; view->animateRouteCallback(view->map); } break; diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp index 9963ca6884..c52ea92512 100644 --- a/platform/glfw/main.cpp +++ b/platform/glfw/main.cpp @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { map.jumpTo(mbgl::CameraOptions() .withCenter(mbgl::LatLng {settings.latitude, settings.longitude}) .withZoom(settings.zoom) - .withAngle(settings.bearing) + .withBearing(settings.bearing) .withPitch(settings.pitch)); map.setDebug(mbgl::MapDebugOptions(settings.debug)); @@ -178,7 +178,7 @@ int main(int argc, char *argv[]) { settings.latitude = camera.center->latitude(); settings.longitude = camera.center->longitude(); settings.zoom = *camera.zoom; - settings.bearing = *camera.angle; + settings.bearing = *camera.bearing; settings.pitch = *camera.pitch; settings.debug = mbgl::EnumType(map.getDebug()); settings.save(); |