diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-30 12:10:33 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-30 19:09:17 +0200 |
| commit | 92352de87d4068985fa56100f2c6e16bf26a1c86 (patch) | |
| tree | e3dd5729e2ef8e32931b8e42ab34a3d0b806ee18 /platform | |
| parent | 8bc362e3a2836cfa96ef14a41a0e882a1d08e881 (diff) | |
| download | qtlocation-mapboxgl-92352de87d4068985fa56100f2c6e16bf26a1c86.tar.gz | |
[core] layermanager folder
Move `LayerManager` and `LayerFactory` abstract classes to a dedicated folder.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/src/style/layers/layer.hpp | 1 | ||||
| -rw-r--r-- | platform/android/src/style/layers/layer_manager.hpp | 3 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyleLayerManager.h | 1 | ||||
| -rw-r--r-- | platform/darwin/src/MGLStyleLayer_Private.h | 1 | ||||
| -rw-r--r-- | platform/default/layer_manager.cpp | 22 |
5 files changed, 15 insertions, 13 deletions
diff --git a/platform/android/src/style/layers/layer.hpp b/platform/android/src/style/layers/layer.hpp index c405bc17c1..0fb679152b 100644 --- a/platform/android/src/style/layers/layer.hpp +++ b/platform/android/src/style/layers/layer.hpp @@ -1,5 +1,6 @@ #pragma once +#include <mbgl/layermanager/layer_factory.hpp> #include <mbgl/map/map.hpp> #include <mbgl/style/layer.hpp> #include "../../gson/json_array.hpp" diff --git a/platform/android/src/style/layers/layer_manager.hpp b/platform/android/src/style/layers/layer_manager.hpp index 1521645cce..ff7e48027e 100644 --- a/platform/android/src/style/layers/layer_manager.hpp +++ b/platform/android/src/style/layers/layer_manager.hpp @@ -1,10 +1,9 @@ #pragma once +#include <mbgl/layermanager/layer_manager.hpp> #include <mbgl/map/map.hpp> #include <mbgl/style/layer.hpp> -#include <mbgl/renderer/render_layer.hpp> - #include "layer.hpp" #include <jni/jni.hpp> diff --git a/platform/darwin/src/MGLStyleLayerManager.h b/platform/darwin/src/MGLStyleLayerManager.h index 2fa34991a1..cdd30f4fff 100644 --- a/platform/darwin/src/MGLStyleLayerManager.h +++ b/platform/darwin/src/MGLStyleLayerManager.h @@ -2,6 +2,7 @@ #import "MGLStyleLayer_Private.h" +#include <mbgl/layermanager/layer_manager.hpp> #include <mbgl/style/layer.hpp> #include <map> diff --git a/platform/darwin/src/MGLStyleLayer_Private.h b/platform/darwin/src/MGLStyleLayer_Private.h index 656f74ca42..314f61f680 100644 --- a/platform/darwin/src/MGLStyleLayer_Private.h +++ b/platform/darwin/src/MGLStyleLayer_Private.h @@ -3,6 +3,7 @@ #import "MGLStyleLayer.h" #import "MGLStyleValue_Private.h" +#include <mbgl/layermanager/layer_factory.hpp> #include <mbgl/style/layer.hpp> NS_ASSUME_NONNULL_BEGIN diff --git a/platform/default/layer_manager.cpp b/platform/default/layer_manager.cpp index 32d5cbc0fc..86343369b4 100644 --- a/platform/default/layer_manager.cpp +++ b/platform/default/layer_manager.cpp @@ -1,14 +1,14 @@ -#include <mbgl/renderer/render_layer.hpp> -#include <mbgl/renderer/layers/render_background_layer.hpp> -#include <mbgl/renderer/layers/render_circle_layer.hpp> -#include <mbgl/renderer/layers/render_custom_layer.hpp> -#include <mbgl/renderer/layers/render_fill_extrusion_layer.hpp> -#include <mbgl/renderer/layers/render_fill_layer.hpp> -#include <mbgl/renderer/layers/render_hillshade_layer.hpp> -#include <mbgl/renderer/layers/render_line_layer.hpp> -#include <mbgl/renderer/layers/render_raster_layer.hpp> -#include <mbgl/renderer/layers/render_symbol_layer.hpp> -#include <mbgl/renderer/layers/render_heatmap_layer.hpp> +#include <mbgl/layermanager/layer_manager.hpp> +#include <mbgl/style/layers/background_layer.hpp> +#include <mbgl/style/layers/circle_layer.hpp> +#include <mbgl/style/layers/custom_layer.hpp> +#include <mbgl/style/layers/fill_extrusion_layer.hpp> +#include <mbgl/style/layers/fill_layer.hpp> +#include <mbgl/style/layers/heatmap_layer.hpp> +#include <mbgl/style/layers/hillshade_layer.hpp> +#include <mbgl/style/layers/line_layer.hpp> +#include <mbgl/style/layers/raster_layer.hpp> +#include <mbgl/style/layers/symbol_layer.hpp> #include <map> #include <memory> |