From f901e776b3e63aaaa6bc0cc4476624bf84127fe6 Mon Sep 17 00:00:00 2001
From: Anand Thakker <anandthakker@users.noreply.github.com>
Date: Tue, 28 Feb 2017 19:54:24 -0800
Subject: [core] Implement data-driven styling for
 {text,icon}-{color,opacity,halo-color,halo-blur,halo-width} (#7939)

* Add symbol dds attributes and adapt style code generation

* Update to mapbox-gl-js/master

* Refactor SymbolFeature as a subclass of GeometryTileFeature

Prepares for enabling DDS on symbol paint properties by allowing the
SymbolFeatures, which we keep around after constructing SymbolLayout,
to be used in evaluating data-driven paint properties later in the
layout process.

* Draft approach for splitting icon/text paint properties

The `Program` types are set up to bind GL attributes to each of the
data-driven paint properties specified in the `PaintProperties` type
provided.  Since `SymbolPaintProperties` specifies both `Text*` and
`Icon*` properties, the symbolIcon, symbolIconSDF, and symbolGlyph
programs each attempt to bind roughly double the number of attributes
that they actually need.

This change addresses this by:
- Adding the more specific `IconPaintProperties` and `TextPaintProperties` types, which are subsets of the full `SymbolPaintProperties`.
- The symbol layer continues to use its `SymbolPaintProperties paint` member to track layer property state, but it provides helpers that construct objects of each the specific `{Icon,Text}PaintProperties::Evaluated` type, for use by the painter.
- The three symbol programs instantiate `Program<>` using the appropriate `{Icon,Text}PaintProperties` type.

* check in generated style code

* Populate paint buffers for symbol DDS properties

* Address first round of review comments

* Refactor VectorTile{Layer,Feature} to explicitly share data

* Update submodule
---
 include/mbgl/style/layers/symbol_layer.hpp | 60 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'include/mbgl')

diff --git a/include/mbgl/style/layers/symbol_layer.hpp b/include/mbgl/style/layers/symbol_layer.hpp
index 8f655d6f77..aeccabb97e 100644
--- a/include/mbgl/style/layers/symbol_layer.hpp
+++ b/include/mbgl/style/layers/symbol_layer.hpp
@@ -169,29 +169,29 @@ public:
 
     // Paint properties
 
-    static PropertyValue<float> getDefaultIconOpacity();
-    PropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const;
-    void setIconOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultIconOpacity();
+    DataDrivenPropertyValue<float> getIconOpacity(const optional<std::string>& klass = {}) const;
+    void setIconOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultIconColor();
-    PropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const;
-    void setIconColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultIconColor();
+    DataDrivenPropertyValue<Color> getIconColor(const optional<std::string>& klass = {}) const;
+    void setIconColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setIconColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultIconHaloColor();
-    PropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const;
-    void setIconHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultIconHaloColor();
+    DataDrivenPropertyValue<Color> getIconHaloColor(const optional<std::string>& klass = {}) const;
+    void setIconHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setIconHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultIconHaloWidth();
-    PropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const;
-    void setIconHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultIconHaloWidth();
+    DataDrivenPropertyValue<float> getIconHaloWidth(const optional<std::string>& klass = {}) const;
+    void setIconHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultIconHaloBlur();
-    PropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const;
-    void setIconHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultIconHaloBlur();
+    DataDrivenPropertyValue<float> getIconHaloBlur(const optional<std::string>& klass = {}) const;
+    void setIconHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setIconHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultIconTranslate();
@@ -204,29 +204,29 @@ public:
     void setIconTranslateAnchor(PropertyValue<TranslateAnchorType>, const optional<std::string>& klass = {});
     void setIconTranslateAnchorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultTextOpacity();
-    PropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const;
-    void setTextOpacity(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultTextOpacity();
+    DataDrivenPropertyValue<float> getTextOpacity(const optional<std::string>& klass = {}) const;
+    void setTextOpacity(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextOpacityTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultTextColor();
-    PropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const;
-    void setTextColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultTextColor();
+    DataDrivenPropertyValue<Color> getTextColor(const optional<std::string>& klass = {}) const;
+    void setTextColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setTextColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<Color> getDefaultTextHaloColor();
-    PropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const;
-    void setTextHaloColor(PropertyValue<Color>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<Color> getDefaultTextHaloColor();
+    DataDrivenPropertyValue<Color> getTextHaloColor(const optional<std::string>& klass = {}) const;
+    void setTextHaloColor(DataDrivenPropertyValue<Color>, const optional<std::string>& klass = {});
     void setTextHaloColorTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultTextHaloWidth();
-    PropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const;
-    void setTextHaloWidth(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultTextHaloWidth();
+    DataDrivenPropertyValue<float> getTextHaloWidth(const optional<std::string>& klass = {}) const;
+    void setTextHaloWidth(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextHaloWidthTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
-    static PropertyValue<float> getDefaultTextHaloBlur();
-    PropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const;
-    void setTextHaloBlur(PropertyValue<float>, const optional<std::string>& klass = {});
+    static DataDrivenPropertyValue<float> getDefaultTextHaloBlur();
+    DataDrivenPropertyValue<float> getTextHaloBlur(const optional<std::string>& klass = {}) const;
+    void setTextHaloBlur(DataDrivenPropertyValue<float>, const optional<std::string>& klass = {});
     void setTextHaloBlurTransition(const TransitionOptions&, const optional<std::string>& klass = {});
 
     static PropertyValue<std::array<float, 2>> getDefaultTextTranslate();
-- 
cgit v1.2.1