diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2015-10-26 15:12:43 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-11-10 11:33:17 -0800 |
commit | 54e08b1f83504e12cbc19b08295d9f9ed5177ab5 (patch) | |
tree | 40513395d4d0ed2d9003ef30a708f21b2e83e5ab /src/mbgl/renderer/painter_raster.cpp | |
parent | a5625675890213f94de7632d4ef152ade627c9a5 (diff) | |
download | qtlocation-mapboxgl-54e08b1f83504e12cbc19b08295d9f9ed5177ab5.tar.gz |
[core] Eliminate use of ClassProperties for paint
Diffstat (limited to 'src/mbgl/renderer/painter_raster.cpp')
-rw-r--r-- | src/mbgl/renderer/painter_raster.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp index 06e6b06c2e..9672d6f0d6 100644 --- a/src/mbgl/renderer/painter_raster.cpp +++ b/src/mbgl/renderer/painter_raster.cpp @@ -9,18 +9,18 @@ using namespace mbgl; void Painter::renderRaster(RasterBucket& bucket, const RasterLayer& layer, const TileID&, const mat4& matrix) { if (pass != RenderPass::Translucent) return; - const RasterPaintProperties& properties = layer.properties; + const RasterPaintProperties& properties = layer.paint; if (bucket.hasData()) { config.program = rasterShader->program; rasterShader->u_matrix = matrix; rasterShader->u_buffer = 0; rasterShader->u_opacity = properties.opacity; - rasterShader->u_brightness_low = properties.brightness[0]; - rasterShader->u_brightness_high = properties.brightness[1]; + rasterShader->u_brightness_low = properties.brightnessMin; + rasterShader->u_brightness_high = properties.brightnessMax; rasterShader->u_saturation_factor = saturationFactor(properties.saturation); rasterShader->u_contrast_factor = contrastFactor(properties.contrast); - rasterShader->u_spin_weights = spinWeights(properties.hue_rotate); + rasterShader->u_spin_weights = spinWeights(properties.hueRotate); config.stencilOp.reset(); config.stencilTest = GL_TRUE; |