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 --- next/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'next') diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index aa26e3a572..5ba734f481 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -151,6 +151,8 @@ add_library( ${MBGL_ROOT}/include/mbgl/style/expression/format_section_override.hpp ${MBGL_ROOT}/include/mbgl/style/expression/formatted.hpp ${MBGL_ROOT}/include/mbgl/style/expression/get_covering_stops.hpp + ${MBGL_ROOT}/include/mbgl/style/expression/image.hpp + ${MBGL_ROOT}/include/mbgl/style/expression/image_expression.hpp ${MBGL_ROOT}/include/mbgl/style/expression/interpolate.hpp ${MBGL_ROOT}/include/mbgl/style/expression/interpolator.hpp ${MBGL_ROOT}/include/mbgl/style/expression/is_constant.hpp @@ -613,6 +615,8 @@ add_library( ${MBGL_ROOT}/src/mbgl/style/expression/format_expression.cpp ${MBGL_ROOT}/src/mbgl/style/expression/formatted.cpp ${MBGL_ROOT}/src/mbgl/style/expression/get_covering_stops.cpp + ${MBGL_ROOT}/src/mbgl/style/expression/image.cpp + ${MBGL_ROOT}/src/mbgl/style/expression/image_expression.cpp ${MBGL_ROOT}/src/mbgl/style/expression/interpolate.cpp ${MBGL_ROOT}/src/mbgl/style/expression/is_constant.cpp ${MBGL_ROOT}/src/mbgl/style/expression/is_expression.cpp -- cgit v1.2.1