diff options
Diffstat (limited to 'src/style')
-rw-r--r-- | src/style/property_fallback.cpp | 2 | ||||
-rw-r--r-- | src/style/style_layer.cpp | 8 | ||||
-rw-r--r-- | src/style/style_parser.cpp | 3 | ||||
-rw-r--r-- | src/style/style_properties.cpp | 1 |
4 files changed, 0 insertions, 14 deletions
diff --git a/src/style/property_fallback.cpp b/src/style/property_fallback.cpp index 4028980cbe..0f8335dd66 100644 --- a/src/style/property_fallback.cpp +++ b/src/style/property_fallback.cpp @@ -44,8 +44,6 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::TextTranslateY, defaultStyleProperties<SymbolProperties>().text.translate[1] }, { PropertyKey::TextTranslateAnchor, defaultStyleProperties<SymbolProperties>().text.translate_anchor }, - { PropertyKey::CompositeOpacity, defaultStyleProperties<CompositeProperties>().opacity }, - { PropertyKey::RasterOpacity, defaultStyleProperties<RasterProperties>().opacity }, { PropertyKey::RasterHueRotate, defaultStyleProperties<RasterProperties>().hue_rotate }, { PropertyKey::RasterBrightnessLow, defaultStyleProperties<RasterProperties>().brightness[0] }, diff --git a/src/style/style_layer.cpp b/src/style/style_layer.cpp index 520c183780..d4e6d19db4 100644 --- a/src/style/style_layer.cpp +++ b/src/style/style_layer.cpp @@ -217,13 +217,6 @@ void StyleLayer::applyStyleProperties<SymbolProperties>(const float z, const tim } template <> -void StyleLayer::applyStyleProperties<CompositeProperties>(const float z, const timestamp now) { - properties.set<CompositeProperties>(); - CompositeProperties &composite = properties.get<CompositeProperties>(); - applyStyleProperty(PropertyKey::CompositeOpacity, composite.opacity, z, now); -} - -template <> void StyleLayer::applyStyleProperties<RasterProperties>(const float z, const timestamp now) { properties.set<RasterProperties>(); RasterProperties &raster = properties.get<RasterProperties>(); @@ -255,7 +248,6 @@ void StyleLayer::updateProperties(float z, const timestamp now) { case StyleLayerType::Line: applyStyleProperties<LineProperties>(z, now); break; case StyleLayerType::Symbol: applyStyleProperties<SymbolProperties>(z, now); break; case StyleLayerType::Raster: applyStyleProperties<RasterProperties>(z, now); break; - case StyleLayerType::Composite: applyStyleProperties<CompositeProperties>(z, now); break; case StyleLayerType::Background: applyStyleProperties<BackgroundProperties>(z, now); break; default: properties.set<std::false_type>(); break; } diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index 02a7835358..0c0636695e 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -628,9 +628,6 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) { parseOptionalProperty<Function<float>>("text-translate", { Key::TextTranslateX, Key::TextTranslateY }, klass, value); parseOptionalProperty<PropertyTransition>("transition-text-translate", Key::TextTranslate, klass, value); - parseOptionalProperty<Function<float>>("composite-opacity", Key::CompositeOpacity, klass, value); - parseOptionalProperty<PropertyTransition>("transition-composite-opacity", Key::CompositeOpacity, klass, value); - parseOptionalProperty<Function<float>>("raster-opacity", Key::RasterOpacity, klass, value); parseOptionalProperty<PropertyTransition>("transition-raster-opacity", Key::RasterOpacity, klass, value); parseOptionalProperty<Function<float>>("raster-hue-rotate", Key::RasterHueRotate, klass, value); diff --git a/src/style/style_properties.cpp b/src/style/style_properties.cpp index 1b05528d2f..29730fb85b 100644 --- a/src/style/style_properties.cpp +++ b/src/style/style_properties.cpp @@ -5,7 +5,6 @@ namespace mbgl { template<> const FillProperties &defaultStyleProperties() { static const FillProperties p; return p; } template<> const LineProperties &defaultStyleProperties() { static const LineProperties p; return p; } template<> const SymbolProperties &defaultStyleProperties() { static const SymbolProperties p; return p; } -template<> const CompositeProperties &defaultStyleProperties() { static const CompositeProperties p; return p; } template<> const RasterProperties &defaultStyleProperties() { static const RasterProperties p; return p; } template<> const BackgroundProperties &defaultStyleProperties() { static const BackgroundProperties p; return p; } |