diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-08 18:30:28 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-03-10 03:36:46 +0200 |
commit | d300f341bca4d4fe295a6dd303c0961bff7a0520 (patch) | |
tree | 5c3e2f9241a46a42ff1aae013a16beec4d759339 /src/mbgl/map | |
parent | dc2853533f4e641ac192ebca5458f876109441ff (diff) | |
download | qtlocation-mapboxgl-d300f341bca4d4fe295a6dd303c0961bff7a0520.tar.gz |
[core] Remove _validPoint from Transform code
vec2<T>::operator bool() checks for NaNs already.
Diffstat (limited to 'src/mbgl/map')
-rw-r--r-- | src/mbgl/map/transform.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index 79b43f8901..6aa0bd9a41 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -35,10 +35,6 @@ static double _normalizeAngle(double angle, double anchorAngle) return angle; } -inline bool _validPoint(const ScreenCoordinate& point) { - return !std::isnan(point.x) && !std::isnan(point.y); -} - Transform::Transform(View &view_, ConstrainMode constrainMode) : view(view_) , state(constrainMode) @@ -341,9 +337,7 @@ void Transform::flyTo(const CameraOptions &camera, const AnimationOptions &anima #pragma mark - Position void Transform::moveBy(const ScreenCoordinate& offset, const Duration& duration) { - if (!_validPoint(offset)) { - return; - } + if (!offset) return; ScreenCoordinate centerOffset = { offset.x, @@ -583,7 +577,7 @@ void Transform::startTransition(const CameraOptions& camera, // Associate the anchor, if given, with a coordinate. ScreenCoordinate anchor = camera.anchor ? *camera.anchor : ScreenCoordinate(NAN, NAN); LatLng anchorLatLng; - if (_validPoint(anchor)) { + if (anchor) { anchor.y = state.getHeight() - anchor.y; anchorLatLng = state.screenCoordinateToLatLng(anchor); } @@ -601,9 +595,7 @@ void Transform::startTransition(const CameraOptions& camera, result = frame(ease.solve(t, 0.001)); } - if (_validPoint(anchor)) { - state.moveLatLng(anchorLatLng, anchor); - } + if (anchor) state.moveLatLng(anchorLatLng, anchor); // At t = 1.0, a DidChangeAnimated notification should be sent from finish(). if (t < 1.0) { |