diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-13 18:14:12 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-20 11:56:30 -0700 |
| commit | c8edbb0500cbf4baf1d5fdb0e63679539e166585 (patch) | |
| tree | 750f3b72b9e3b1c91ddbc0541cfc64d7d80ffe71 /test/programs | |
| parent | 6d7072162b764c2432c010cd463a5a2c0093d606 (diff) | |
| download | qtlocation-mapboxgl-c8edbb0500cbf4baf1d5fdb0e63679539e166585.tar.gz | |
[core] Replace {Source,Camera,Composite}Function with PropertyExpression
Diffstat (limited to 'test/programs')
| -rw-r--r-- | test/programs/symbol_program.test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/programs/symbol_program.test.cpp b/test/programs/symbol_program.test.cpp index ed709a4ba7..b2467d5998 100644 --- a/test/programs/symbol_program.test.cpp +++ b/test/programs/symbol_program.test.cpp @@ -13,7 +13,7 @@ TEST(SymbolProgram, SymbolSizeBinder) { EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true); EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 12.0f); - binder = SymbolSizeBinder::create(1.0f, style::CameraFunction<float>( + binder = SymbolSizeBinder::create(1.0f, style::PropertyExpression<float>( interpolate( linear(), zoom(), @@ -24,7 +24,7 @@ TEST(SymbolProgram, SymbolSizeBinder) { EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true); EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 9.5f); - binder = SymbolSizeBinder::create(0.0f, style::CameraFunction<float>( + binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>( interpolate( linear(), zoom(), @@ -35,7 +35,7 @@ TEST(SymbolProgram, SymbolSizeBinder) { EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true); EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 8.0f); - binder = SymbolSizeBinder::create(12.0f, style::CameraFunction<float>( + binder = SymbolSizeBinder::create(12.0f, style::PropertyExpression<float>( interpolate( linear(), zoom(), @@ -46,7 +46,7 @@ TEST(SymbolProgram, SymbolSizeBinder) { EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true); EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 18.0f); - binder = SymbolSizeBinder::create(0.0f, style::SourceFunction<float>( + binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>( interpolate( linear(), number(get("x")), @@ -56,7 +56,7 @@ TEST(SymbolProgram, SymbolSizeBinder) { EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true); EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false); - binder = SymbolSizeBinder::create(5.0f, style::CompositeFunction<float>( + binder = SymbolSizeBinder::create(5.0f, style::PropertyExpression<float>( interpolate( linear(), zoom(), |