summaryrefslogtreecommitdiff
path: root/include/mbgl/style
diff options
context:
space:
mode:
authorAnsis Brammanis <brammanis@gmail.com>2014-08-13 16:16:08 -0700
committerKonstantin Käfer <mail@kkaefer.com>2014-08-15 15:52:53 +0200
commit32a1711d8cd00a5d85c61802f79619b85b9cc38a (patch)
tree06eafd07790c97fd4de063f766a04a06ed66c4db /include/mbgl/style
parent478a1dae6701f73d2a1cbcc2b7c6470671f47c4a (diff)
downloadqtlocation-mapboxgl-32a1711d8cd00a5d85c61802f79619b85b9cc38a.tar.gz
remove support for composite layers
Diffstat (limited to 'include/mbgl/style')
-rw-r--r--include/mbgl/style/property_key.hpp2
-rw-r--r--include/mbgl/style/style_properties.hpp11
-rw-r--r--include/mbgl/style/types.hpp2
3 files changed, 0 insertions, 15 deletions
diff --git a/include/mbgl/style/property_key.hpp b/include/mbgl/style/property_key.hpp
index aee5db0385..ec68ea991e 100644
--- a/include/mbgl/style/property_key.hpp
+++ b/include/mbgl/style/property_key.hpp
@@ -51,8 +51,6 @@ enum class PropertyKey {
TextTranslateY,
TextTranslateAnchor,
- CompositeOpacity,
-
RasterOpacity,
RasterHueRotate,
RasterBrightness, // for transitions only
diff --git a/include/mbgl/style/style_properties.hpp b/include/mbgl/style/style_properties.hpp
index f12ab430e3..742ae63f0f 100644
--- a/include/mbgl/style/style_properties.hpp
+++ b/include/mbgl/style/style_properties.hpp
@@ -76,16 +76,6 @@ struct SymbolProperties {
}
};
-
-struct CompositeProperties {
- inline CompositeProperties() {}
- float opacity = 1.0f;
-
- inline bool isVisible() const {
- return opacity > 0;
- }
-};
-
struct RasterProperties {
inline RasterProperties() {}
float opacity = 1.0f;
@@ -109,7 +99,6 @@ typedef util::variant<
FillProperties,
LineProperties,
SymbolProperties,
- CompositeProperties,
RasterProperties,
BackgroundProperties,
std::false_type
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 55b7685fd3..fa21f819a5 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -19,7 +19,6 @@ enum class StyleLayerType : uint8_t {
Line,
Symbol,
Raster,
- Composite,
Background
};
@@ -29,7 +28,6 @@ MBGL_DEFINE_ENUM_CLASS(StyleLayerTypeClass, StyleLayerType, {
{ StyleLayerType::Line, "line" },
{ StyleLayerType::Symbol, "symbol" },
{ StyleLayerType::Raster, "raster" },
- { StyleLayerType::Composite, "composite" },
{ StyleLayerType::Background, "background" },
{ StyleLayerType(-1), "unknown" },
});