[core] Implement CrossFadedDataDrivenProperty to add support for feature expressions in *-pattern properties

This commit is contained in:
Molly Lloyd
2018-06-14 14:35:39 -07:00
committed by Molly Lloyd
parent ec62e32153
commit 4a5dc37245
122 changed files with 3012 additions and 2108 deletions

View File

@@ -9,9 +9,9 @@ using namespace mbgl::style::expression::dsl;
TEST(SymbolProgram, SymbolSizeBinder) {
auto binder = SymbolSizeBinder::create(5.0f, 12.0f, 0.0f);
auto uniformValues = binder->uniformValues(5.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 12.0f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 12.0f);
binder = SymbolSizeBinder::create(1.0f, style::PropertyExpression<float>(
interpolate(
@@ -20,9 +20,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
0., literal(8.),
10., literal(18.))), 0.0f);
uniformValues = binder->uniformValues(1.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 9.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 9.5f);
binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>(
interpolate(
@@ -31,9 +31,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
1., literal(8.),
11., literal(18.))), 0.0f);
uniformValues = binder->uniformValues(0.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 8.0f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 8.0f);
binder = SymbolSizeBinder::create(12.0f, style::PropertyExpression<float>(
interpolate(
@@ -42,9 +42,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
1., literal(8.),
11., literal(18.))), 0.0f);
uniformValues = binder->uniformValues(12.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 18.0f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 18.0f);
binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>(
interpolate(
@@ -53,8 +53,8 @@ TEST(SymbolProgram, SymbolSizeBinder) {
1., literal(8.),
11., literal(18.))), 0.0f);
uniformValues = binder->uniformValues(12.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), true);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false);
binder = SymbolSizeBinder::create(5.0f, style::PropertyExpression<float>(
interpolate(
@@ -63,7 +63,7 @@ TEST(SymbolProgram, SymbolSizeBinder) {
1., interpolate(linear(), number(get("x")), 0., literal(8.), 100., literal(18.)),
11., interpolate(linear(), number(get("x")), 0., literal(12.), 100., literal(24.9)))), 0.0f);
uniformValues = binder->uniformValues(5.5f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);
EXPECT_EQ(uniformValues.get<uniforms::u_size_t>().t, 0.45f);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false);
EXPECT_EQ(uniformValues.get<uniforms::u_size_t>(), 0.45f);
}