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

[core] Fix: fill-extrusion-vertical-gradient was ignored. #14784

Browse Source 
fill-extrusion-vertical-gradient "property-type": "data-constant" and it shouldn't be computed through property binders.

Fixes: #14784
This commit is contained in:
Aleksandar Stojiljkovic
2019-05-30 09:45:02 +03:00
parent 0181ef8f63
commit 62f6338d5b
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mbgl/programs/fill_extrusion_program.cpp
View File

@@ -32,13 +32,14 @@ float lightIntensity(const EvaluatedLight& light) {
}
FillExtrusionProgram::LayoutUniformValues FillExtrusionProgram::layoutUniformValues(
mat4 matrix, const TransformState& state, const float opacity, const EvaluatedLight& light) {
mat4 matrix, const TransformState& state, const float opacity, const EvaluatedLight& light, const float verticalGradient) {
return {
uniforms::matrix::Value( matrix ),
uniforms::opacity::Value( opacity ),
uniforms::lightcolor::Value( lightColor(light) ),
uniforms::lightpos::Value( lightPosition(light, state) ),
uniforms::lightintensity::Value( lightIntensity(light) )
uniforms::lightintensity::Value( lightIntensity(light) ),
uniforms::vertical_gradient::Value( verticalGradient )
};
}
@@ -51,7 +52,8 @@ FillExtrusionPatternProgram::layoutUniformValues(mat4 matrix,
const float opacity,
const float heightFactor,
const float pixelRatio,
const EvaluatedLight& light) {
const EvaluatedLight& light,
const float verticalGradient) {
const auto tileRatio = 1 / tileID.pixelsToTileUnits(1, state.getIntegerZoom());
int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z);
int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z));
@@ -69,6 +71,7 @@ FillExtrusionPatternProgram::layoutUniformValues(mat4 matrix,
uniforms::lightcolor::Value( lightColor(light) ),
uniforms::lightpos::Value( lightPosition(light, state) ),
uniforms::lightintensity::Value( lightIntensity(light) ),
uniforms::vertical_gradient::Value( verticalGradient )
};
}