diff options
| author | Molly Lloyd <molly@mapbox.com> | 2018-06-14 14:35:39 -0700 |
|---|---|---|
| committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
| commit | 4a5dc37245d23805d13865f5ef9c5f26e539a9ca (patch) | |
| tree | de77bfeff6f7afbe02210c9189bf72da59293083 /src/mbgl/renderer/layers/render_hillshade_layer.cpp | |
| parent | ec62e321531b1a836074056e86de8e20018280fb (diff) | |
| download | qtlocation-mapboxgl-4a5dc37245d23805d13865f5ef9c5f26e539a9ca.tar.gz | |
[core] Implement CrossFadedDataDrivenProperty to add support for feature expressions in `*-pattern` properties
Diffstat (limited to 'src/mbgl/renderer/layers/render_hillshade_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_hillshade_layer.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp index 8bcd3f1837..b96030f44d 100644 --- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp +++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp @@ -56,6 +56,10 @@ bool RenderHillshadeLayer::hasTransition() const { return unevaluated.hasTransition(); } +bool RenderHillshadeLayer::hasCrossfade() const { + return false; +} + void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src) { if (parameters.pass != RenderPass::Translucent && parameters.pass != RenderPass::Pass3D) return; @@ -75,13 +79,13 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src const auto allUniformValues = programInstance.computeAllUniformValues( HillshadeProgram::UniformValues { - uniforms::u_matrix::Value{ matrix }, - uniforms::u_image::Value{ 0 }, - uniforms::u_highlight::Value{ evaluated.get<HillshadeHighlightColor>() }, - uniforms::u_shadow::Value{ evaluated.get<HillshadeShadowColor>() }, - uniforms::u_accent::Value{ evaluated.get<HillshadeAccentColor>() }, - uniforms::u_light::Value{ getLight(parameters) }, - uniforms::u_latrange::Value{ getLatRange(id) }, + uniforms::u_matrix::Value( matrix ), + uniforms::u_image::Value( 0 ), + uniforms::u_highlight::Value( evaluated.get<HillshadeHighlightColor>() ), + uniforms::u_shadow::Value( evaluated.get<HillshadeShadowColor>() ), + uniforms::u_accent::Value( evaluated.get<HillshadeAccentColor>() ), + uniforms::u_light::Value( getLight(parameters) ), + uniforms::u_latrange::Value( getLatRange(id) ), }, paintAttributeData, evaluated, @@ -137,11 +141,11 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src const auto allUniformValues = programInstance.computeAllUniformValues( HillshadePrepareProgram::UniformValues { - uniforms::u_matrix::Value { mat }, - uniforms::u_dimension::Value { {{uint16_t(tilesize * 2), uint16_t(tilesize * 2) }} }, - uniforms::u_zoom::Value{ float(tile.id.canonical.z) }, - uniforms::u_maxzoom::Value{ float(maxzoom) }, - uniforms::u_image::Value{ 0 } + uniforms::u_matrix::Value( mat ), + uniforms::u_dimension::Value( {{uint16_t(tilesize * 2), uint16_t(tilesize * 2)}} ), + uniforms::u_zoom::Value( float(tile.id.canonical.z) ), + uniforms::u_maxzoom::Value( float(maxzoom) ), + uniforms::u_image::Value( 0 ) }, paintAttributeData, properties, |