[core] Rationalize naming for style-related code

1 files changed, 82 insertions, 0 deletions

diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp
new file mode 100644
index 0000000000..a4dc264ed2
--- /dev/null
+++ b/src/mbgl/style/layers/symbol_layer_impl.cpp
@@ -0,0 +1,82 @@
+#include <mbgl/style/layers/symbol_layer_impl.hpp>
+#include <mbgl/renderer/symbol_bucket.hpp>
+#include <mbgl/style/bucket_parameters.hpp>
+
+namespace mbgl {
+namespace style {
+
+void SymbolLayer::Impl::parseLayout(const JSValue& value) {
+    layout.parse(value);
+}
+
+void SymbolLayer::Impl::parsePaints(const JSValue& layer) {
+    paint.parse(layer);
+}
+
+void SymbolLayer::Impl::cascade(const CascadeParameters& parameters) {
+    paint.cascade(parameters);
+}
+
+bool SymbolLayer::Impl::recalculate(const CalculationParameters& parameters) {
+    bool hasTransitions = paint.recalculate(parameters);
+
+    // text-size and icon-size are layout properties but they also need to be evaluated as paint properties:
+    layout.iconSize.calculate(parameters);
+    layout.textSize.calculate(parameters);
+    iconSize = layout.iconSize;
+    textSize = layout.textSize;
+
+    passes = ((paint.iconOpacity > 0 && (paint.iconColor.value[3] > 0 || paint.iconHaloColor.value[3] > 0) && iconSize > 0)
+           || (paint.textOpacity > 0 && (paint.textColor.value[3] > 0 || paint.textHaloColor.value[3] > 0) && textSize > 0))
+        ? RenderPass::Translucent : RenderPass::None;
+
+    return hasTransitions;
+}
+
+std::unique_ptr<Bucket> SymbolLayer::Impl::createBucket(BucketParameters& parameters) const {
+    auto bucket = std::make_unique<SymbolBucket>(parameters.tileID.overscaleFactor(),
+                                                 parameters.tileID.overscaledZ,
+                                                 parameters.mode,
+                                                 id,
+                                                 parameters.layer.getName());
+
+    bucket->layout = layout;
+
+    CalculationParameters p(parameters.tileID.overscaledZ);
+    bucket->layout.symbolPlacement.calculate(p);
+    if (bucket->layout.symbolPlacement.value == SymbolPlacementType::Line) {
+        bucket->layout.iconRotationAlignment.value = RotationAlignmentType::Map;
+        bucket->layout.textRotationAlignment.value = RotationAlignmentType::Map;
+    };
+
+    bucket->layout.recalculate(p);
+
+    bucket->layout.iconSize.calculate(CalculationParameters(18));
+    bucket->layout.textSize.calculate(CalculationParameters(18));
+    bucket->iconMaxSize = bucket->layout.iconSize;
+    bucket->textMaxSize = bucket->layout.textSize;
+    bucket->layout.iconSize.calculate(CalculationParameters(p.z + 1));
+    bucket->layout.textSize.calculate(CalculationParameters(p.z + 1));
+
+    bucket->parseFeatures(parameters.layer, filter);
+
+    if (bucket->needsDependencies(parameters.glyphStore, parameters.spriteStore)) {
+        parameters.partialParse = true;
+    }
+
+    // We do not add features if the parser is in a "partial" state because
+    // the layer ordering needs to be respected when calculating text
+    // collisions. Although, at this point, we requested all the resources
+    // needed by this tile.
+    if (!parameters.partialParse) {
+        bucket->addFeatures(parameters.tileUID,
+                            *spriteAtlas,
+                            parameters.glyphAtlas,
+                            parameters.glyphStore);
+    }
+
+    return std::move(bucket);
+}
+
+} // namespace style
+} // namespace mbgl