diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 16:44:55 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-14 11:14:05 -0700 |
| commit | 174408ed115b9381dadfb0634e9a67643a0975f0 (patch) | |
| tree | daa46a8f91063bebcb3e5d9e07c60eb62b3022fd | |
| parent | fd45242d05e496d24b814a567c3f24a4c82b499f (diff) | |
| download | qtlocation-mapboxgl-174408ed115b9381dadfb0634e9a67643a0975f0.tar.gz | |
[core] Remove unused SymbolPropertyValues members
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 6 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.hpp | 4 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 395cf283d5..2edb1ad3c3 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -83,11 +83,8 @@ style::SymbolPropertyValues RenderSymbolLayer::iconPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get<style::IconRotationAlignment>(), // icon-pitch-alignment is not yet implemented; inherit the rotation alignment layout_.get<style::IconRotationAlignment>(), - layout_.get<style::IconSize>(), evaluated.get<style::IconTranslate>(), evaluated.get<style::IconTranslateAnchor>(), - iconSize, - 1.0f, evaluated.get<style::IconHaloColor>().constantOr(Color::black()).a > 0 && evaluated.get<style::IconHaloWidth>().constantOr(1), evaluated.get<style::IconColor>().constantOr(Color::black()).a > 0 @@ -98,11 +95,8 @@ style::SymbolPropertyValues RenderSymbolLayer::textPropertyValues(const style::S return style::SymbolPropertyValues { layout_.get<style::TextPitchAlignment>(), layout_.get<style::TextRotationAlignment>(), - layout_.get<style::TextSize>(), evaluated.get<style::TextTranslate>(), evaluated.get<style::TextTranslateAnchor>(), - textSize, - 24.0f, evaluated.get<style::TextHaloColor>().constantOr(Color::black()).a > 0 && evaluated.get<style::TextHaloWidth>().constantOr(1), evaluated.get<style::TextColor>().constantOr(Color::black()).a > 0 diff --git a/src/mbgl/renderer/layers/render_symbol_layer.hpp b/src/mbgl/renderer/layers/render_symbol_layer.hpp index 8c7d43bf3a..99fd09111a 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.hpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.hpp @@ -40,14 +40,10 @@ public: // Layout AlignmentType pitchAlignment; AlignmentType rotationAlignment; - PossiblyEvaluatedPropertyValue<float> layoutSize; // Paint std::array<float, 2> translate; TranslateAnchorType translateAnchor; - float paintSize; - - float sdfScale; // Constant (1.0 or 24.0) bool hasHalo; bool hasFill; |