summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <friedbunny@users.noreply.github.com>2016-08-23 20:14:22 -0400
committerGitHub <noreply@github.com>2016-08-23 20:14:22 -0400
commita5b089de6289acc588683951fd3c5cf081c30fd8 (patch)
treecc240f70189ecb68ecab90730cc37db182630d89
parent63cce78cf1597ba5879227f2298bda52e91e4e04 (diff)
downloadqtlocation-mapboxgl-a5b089de6289acc588683951fd3c5cf081c30fd8.tar.gz
[ios, macos] Move debug mask options to shared header (#6094)
* [ios, macos] Move debug mask options to shared header * Limit buffer debug modes to macOS ... because these modes use OpenGL features that aren't supported by iOS. * Try a different tact: exclude "iPhone" ... which is actually all iOS-like devices.
-rw-r--r--platform/darwin/src/MGLTypes.h26
-rw-r--r--platform/ios/src/MGLMapView.h19
-rw-r--r--platform/macos/src/MGLMapView.h33
3 files changed, 26 insertions, 52 deletions
diff --git a/platform/darwin/src/MGLTypes.h b/platform/darwin/src/MGLTypes.h
index bc1889c96c..6a323153fb 100644
--- a/platform/darwin/src/MGLTypes.h
+++ b/platform/darwin/src/MGLTypes.h
@@ -42,6 +42,32 @@ typedef NS_ENUM(NSUInteger, MGLUserTrackingMode) {
MGLUserTrackingModeFollowWithCourse,
};
+/** Options for enabling debugging features in an `MGLMapView` instance. */
+typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
+ /** Edges of tile boundaries are shown as thick, red lines to help diagnose
+ tile clipping issues. */
+ MGLMapDebugTileBoundariesMask = 1 << 1,
+ /** Each tile shows its tile coordinate (x/y/z) in the upper-left corner. */
+ MGLMapDebugTileInfoMask = 1 << 2,
+ /** Each tile shows a timestamp indicating when it was loaded. */
+ MGLMapDebugTimestampsMask = 1 << 3,
+ /** Edges of glyphs and symbols are shown as faint, green lines to help
+ diagnose collision and label placement issues. */
+ MGLMapDebugCollisionBoxesMask = 1 << 4,
+ /** Each drawing operation is replaced by a translucent fill. Overlapping
+ drawing operations appear more prominent to help diagnose overdrawing.
+ @note This option does nothing in Release builds of the SDK. */
+ MGLMapDebugOverdrawVisualizationMask = 1 << 5,
+#if !TARGET_OS_IPHONE
+ /** The stencil buffer is shown instead of the color buffer.
+ @note This option does nothing in Release builds of the SDK. */
+ MGLMapDebugStencilBufferMask = 1 << 6,
+ /** The depth buffer is shown instead of the color buffer.
+ @note This option does nothing in Release builds of the SDK. */
+ MGLMapDebugDepthBufferMask = 1 << 7,
+#endif
+};
+
NS_ASSUME_NONNULL_END
#ifndef NS_ARRAY_OF
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index db273ebcb6..40a9ad51f7 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -44,25 +44,6 @@ typedef NS_ENUM(NSUInteger, MGLAnnotationVerticalAlignment) {
MGLAnnotationVerticalAlignmentBottom,
};
-/** Options for enabling debugging features in an `MGLMapView` instance. */
-typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
- /** Edges of tile boundaries are shown as thick, red lines to help diagnose
- tile clipping issues. */
- MGLMapDebugTileBoundariesMask = 1 << 1,
- /** Each tile shows its tile coordinate (x/y/z) in the upper-left corner. */
- MGLMapDebugTileInfoMask = 1 << 2,
- /** Each tile shows a timestamp indicating when it was loaded. */
- MGLMapDebugTimestampsMask = 1 << 3,
- /** Edges of glyphs and symbols are shown as faint, green lines to help
- diagnose collision and label placement issues. */
- MGLMapDebugCollisionBoxesMask = 1 << 4,
- /** Each drawing operation is replaced by a translucent fill. Overlapping
- drawing operations appear more prominent to help diagnose overdrawing.
- @note This option does nothing in Release builds of the SDK.
- */
- MGLMapDebugOverdrawVisualizationMask = 1 << 5,
-};
-
/**
An interactive, customizable map view with an interface similar to the one
provided by Apple’s MapKit.
diff --git a/platform/macos/src/MGLMapView.h b/platform/macos/src/MGLMapView.h
index 37c13802b1..3499671ff1 100644
--- a/platform/macos/src/MGLMapView.h
+++ b/platform/macos/src/MGLMapView.h
@@ -6,39 +6,6 @@
NS_ASSUME_NONNULL_BEGIN
-/** Options for enabling debugging features in an MGLMapView instance. */
-typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
- /** Edges of tile boundaries are shown as thick, red lines to help diagnose
- tile clipping issues. */
- MGLMapDebugTileBoundariesMask = 1 << 1,
-
- /** Each tile shows its tile coordinate (x/y/z) in the upper-left corner. */
- MGLMapDebugTileInfoMask = 1 << 2,
-
- /** Each tile shows a timestamp indicating when it was loaded. */
- MGLMapDebugTimestampsMask = 1 << 3,
-
- /** Edges of glyphs and symbols are shown as faint, green lines to help
- diagnose collision and label placement issues. */
- MGLMapDebugCollisionBoxesMask = 1 << 4,
-
- /** Each drawing operation is replaced by a translucent fill. Overlapping
- drawing operations appear more prominent to help diagnose overdrawing.
- @note This option does nothing in Release builds of the SDK.
- */
- MGLMapDebugOverdrawVisualizationMask = 1 << 5,
-
- /** The stencil buffer is shown instead of the color buffer.
- @note This option does nothing in Release builds of the SDK.
- */
- MGLMapDebugStencilBufferMask = 1 << 6,
-
- /** The depth buffer is shown instead of the color buffer.
- @note This option does nothing in Release builds of the SDK.
- */
- MGLMapDebugDepthBufferMask = 1 << 7,
-};
-
@class MGLAnnotationImage;
@class MGLMapCamera;
@class MGLStyle;