diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-15 23:32:45 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-20 15:40:47 +0100 |
commit | 0ad2375e1047353fc65fabce3ac9123dc095179e (patch) | |
tree | adfcd395cb9f38a3eff6845bb63e3ab8bcf131a3 /test/programs | |
parent | 9ee1de575af4ef332ad8812c11d9d63edc94d76e (diff) | |
download | qtlocation-mapboxgl-0ad2375e1047353fc65fabce3ac9123dc095179e.tar.gz |
[core] remove a_/u_ prefix from attribute/uniform types
Diffstat (limited to 'test/programs')
-rw-r--r-- | test/programs/symbol_program.test.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/test/programs/symbol_program.test.cpp b/test/programs/symbol_program.test.cpp index 4d30e5dc3d..28d734c21a 100644 --- a/test/programs/symbol_program.test.cpp +++ b/test/programs/symbol_program.test.cpp @@ -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>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 12.0f); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::is_size_feature_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::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>(), false); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 9.5f); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::is_size_feature_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::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>(), false); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 8.0f); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::is_size_feature_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::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>(), false); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 18.0f); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::is_size_feature_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::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>(), true); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), true); + EXPECT_EQ(uniformValues.get<uniforms::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>(), false); - EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false); - EXPECT_EQ(uniformValues.get<uniforms::u_size_t>(), 0.45f); + EXPECT_EQ(uniformValues.get<uniforms::is_size_zoom_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::is_size_feature_constant>(), false); + EXPECT_EQ(uniformValues.get<uniforms::size_t>(), 0.45f); } |