summaryrefslogtreecommitdiff
path: root/include/mbgl/style
diff options
context:
space:
mode:
authorLauren Budorick <lauren@mapbox.com>2014-08-05 18:13:02 -0700
committerLauren Budorick <lauren@mapbox.com>2014-08-11 12:13:22 -0700
commit9e1156d660cfe220db25c4f21de2aec2ed175487 (patch)
treee06bc8e9c04d7b8a6bbee1aba47b5f5bd904460a /include/mbgl/style
parentdf925fe0e5429085f0f443f4be1326c0616f6acc (diff)
downloadqtlocation-mapboxgl-9e1156d660cfe220db25c4f21de2aec2ed175487.tar.gz
take 2, still not working
Diffstat (limited to 'include/mbgl/style')
-rw-r--r--include/mbgl/style/rasterize_properties.hpp2
-rw-r--r--include/mbgl/style/style_bucket.hpp1
-rw-r--r--include/mbgl/style/style_layer.hpp5
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/style/rasterize_properties.hpp b/include/mbgl/style/rasterize_properties.hpp
index e1e56d6ec9..e156ede77b 100644
--- a/include/mbgl/style/rasterize_properties.hpp
+++ b/include/mbgl/style/rasterize_properties.hpp
@@ -15,7 +15,7 @@ public:
class RasterizeProperties {
public:
-// Function<bool> enabled = ConstantFunction<bool>(false); // going to need to delete this? or keep ?
+ Function<bool> enabled = ConstantFunction<bool>(false); // maybe delete?
Function<float> buffer = ConstantFunction<float>(1.0f / 32.0f);
Function<float> size = ConstantFunction<float>(256);
Function<float> blur = ConstantFunction<float>(0);
diff --git a/include/mbgl/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp
index 25786720b1..5cb1b69312 100644
--- a/include/mbgl/style/style_bucket.hpp
+++ b/include/mbgl/style/style_bucket.hpp
@@ -82,6 +82,7 @@ public:
class StyleBucketRaster {
public:
+ bool prerendered = false;
uint16_t raster_size = 256;
float blur = 0.0f;
float buffer = 0.03125f;
diff --git a/include/mbgl/style/style_layer.hpp b/include/mbgl/style/style_layer.hpp
index 14d60ed9b6..bcda9950a2 100644
--- a/include/mbgl/style/style_layer.hpp
+++ b/include/mbgl/style/style_layer.hpp
@@ -20,8 +20,7 @@ class StyleLayerGroup;
class StyleLayer {
public:
- StyleLayer(const std::string &id, std::map<ClassID, ClassProperties> &&styles,
- std::unique_ptr<const RasterizeProperties> &&rasterize);
+ StyleLayer(const std::string &id, std::map<ClassID, ClassProperties> &&styles);
template <typename T> const T &getProperties() {
if (properties.is<T>()) {
@@ -83,7 +82,7 @@ public:
// Rasterization properties are used for prerendering the tile to a bitmap,
// which is then used as a raster image instead of rendering this layer
// directly in every frame.
- const std::unique_ptr<const RasterizeProperties> rasterize;
+// const std::unique_ptr<const RasterizeProperties> rasterize;
// Child layer array (if this layer has child layers).
std::shared_ptr<StyleLayerGroup> layers;