tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Replace use of *Stops with expressions DSL

Browse Source
This commit is contained in:
John Firebaugh
2018-06-27 16:57:23 -07:00
parent 16a3f318a1
commit 542a4b4501
18 changed files with 438 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
test/programs/symbol_program.test.cpp
View File

@@ -1,8 +1,10 @@
#include <mbgl/test/util.hpp>
#include <mbgl/programs/symbol_program.hpp>
#include <mbgl/style/expression/dsl.hpp>
using namespace mbgl;
using namespace mbgl::style::expression::dsl;
TEST(SymbolProgram, SymbolSizeBinder) {
auto binder = SymbolSizeBinder::create(5.0f, 12.0f, 0.0f);
@@ -11,45 +13,55 @@ 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>(style::ExponentialStops<float>({
{0.0f, 8.0f},
{10.0f, 18.0f}
}, 1.0f)), 0.0f);
binder = SymbolSizeBinder::create(1.0f, style::CameraFunction<float>(
interpolate(
linear(),
zoom(),
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);
binder = SymbolSizeBinder::create(0.0f, style::CameraFunction<float>(style::ExponentialStops<float>({
{1.0f, 8.0f},
{11.0f, 18.0f}
}, 1.0f)), 0.0f);
binder = SymbolSizeBinder::create(0.0f, style::CameraFunction<float>(
interpolate(
linear(),
zoom(),
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);
binder = SymbolSizeBinder::create(12.0f, style::CameraFunction<float>(style::ExponentialStops<float>({
{1.0f, 8.0f},
{11.0f, 18.0f}
}, 1.0f)), 0.0f);
binder = SymbolSizeBinder::create(12.0f, style::CameraFunction<float>(
interpolate(
linear(),
zoom(),
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);
binder = SymbolSizeBinder::create(0.0f, style::SourceFunction<float>("x", style::ExponentialStops<float>({
{1.0f, 8.0f},
{11.0f, 18.0f}
}, 1.0f)), 0.0f);
binder = SymbolSizeBinder::create(0.0f, style::SourceFunction<float>(
interpolate(
linear(),
number(get("x")),
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);
binder = SymbolSizeBinder::create(5.0f, style::CompositeFunction<float>("x", style::CompositeExponentialStops<float>({
{1.0f, {{0.0f, 8.0f}, {100.0f, 18.0f}}},
{11.0f, {{0.0f, 12.0f}, {100.0f, 24.9f}}}
}, 1.0f)), 0.0f);
binder = SymbolSizeBinder::create(5.0f, style::CompositeFunction<float>(
interpolate(
linear(),
zoom(),
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);