From 77e784675687d13439a8104c97c5bb0a9ccd8b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Fri, 1 Jul 2016 11:51:54 +0200 Subject: [core] code style cleanups - puts function definitions in a namespace ... {} rather than using namespace ...; - remove trailing whitespace - add trailing newline - protect SQL statements from being formatted by clang-format --- include/mbgl/map/camera.hpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/mbgl/map') diff --git a/include/mbgl/map/camera.hpp b/include/mbgl/map/camera.hpp index 3f39ca2dc9..1c389577f0 100644 --- a/include/mbgl/map/camera.hpp +++ b/include/mbgl/map/camera.hpp @@ -14,23 +14,23 @@ namespace mbgl { struct CameraOptions { /** Coordinate at the center of the map. */ optional center; - + /** Padding around the interior of the view that affects the frame of reference for `center`. */ optional padding; - + /** Point of reference for `zoom` and `angle`, assuming an origin at the top-left corner of the view. */ optional anchor; - + /** Zero-based zoom level. Constrained to the minimum and maximum zoom levels. */ optional zoom; - + /** Bearing, measured in radians counterclockwise from true north. Wrapped to [−π rad, π rad). */ optional angle; - + /** Pitch toward the horizon measured in radians, with 0 rad resulting in a two-dimensional map. */ optional pitch; @@ -42,33 +42,33 @@ struct CameraOptions { struct AnimationOptions { /** Time to animate to the viewpoint defined herein. */ optional duration; - + /** Average velocity of a flyTo() transition, measured in screenfuls per second, assuming a linear timing curve. - + A screenful is the visible span in pixels. It does not correspond to a fixed physical distance but rather varies by zoom level. */ optional velocity; - + /** Zero-based zoom level at the peak of the flyTo() transition’s flight path. */ optional minZoom; - + /** The easing timing curve of the transition. */ optional easing; - + /** A function that is called on each frame of the transition, just before a screen update, except on the last frame. The first parameter indicates the elapsed time as a percentage of the duration. */ std::function transitionFrameFn; - + /** A function that is called once on the last frame of the transition, just before the corresponding screen update. */ std::function transitionFinishFn; - + /** Creates an animation with no options specified. */ AnimationOptions() {} - + /** Creates an animation with the specified duration. */ AnimationOptions(Duration d) : duration(d) {} -- cgit v1.2.1