From c6f3cc8b60e0cff032020a780d4fd3de1cb2a112 Mon Sep 17 00:00:00 2001 From: Alexander Shalamov Date: Wed, 30 Oct 2019 10:21:17 +0200 Subject: [core] Implement image expression (#15877) * [core] Bump gl-js version * [core] Implement image expression * [core] Use new image expression * [core] Coerce image expression to / from string * [core] Serialize evaluated image * [core] Pass available images to layout * [core] Pass images to evaluation context * [core] Set available flag value based on image availability * [core] Allow image coercion to boolean to indicate image availability * [core] Coalesce image expression * [core] Add image expression to next build system * [core] Align serialization format and evaluated type with gl-js * [core] Add images to expression evaluation method * [core] Add support for Image expression to expression test runner * [core] Unskip image expression tests * [core] Update unit tests * [core] Use image expression in annotation manager * [core] Add string to ImageExpression conversion * [core] Add image expression to expression dsl * [core] Convert tokens for implicitly created Image literal * [core] Fix clang format * [core] Split generated style code lines that are over 120 characters * [core] Add unit test for image expression equality * [core] Add image property expression evaluation unit test * [core] Unskip image expression render test * [core] Skip 'in' expression tests * [core] Ignore fill-pattern/update-feature-state render test * [core] Rename Image::serialize to Image::toValue --- src/mbgl/layout/layout.hpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mbgl/layout/layout.hpp') diff --git a/src/mbgl/layout/layout.hpp b/src/mbgl/layout/layout.hpp index d1f03792c1..91d3e3f596 100644 --- a/src/mbgl/layout/layout.hpp +++ b/src/mbgl/layout/layout.hpp @@ -38,6 +38,7 @@ public: const BucketParameters& bucketParameters; GlyphDependencies& glyphDependencies; ImageDependencies& imageDependencies; + std::set& availableImages; }; } // namespace mbgl -- cgit v1.2.1