summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/painter_raster.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-04-21 13:05:10 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-04-21 14:05:40 -0700
commitb2beeda50bbd48fecad957d194dd5b40c72eb9c7 (patch)
tree4e13e0281222e79da20ad37eeea9cc468cdf3c32 /src/mbgl/renderer/painter_raster.cpp
parent2ea450205d8b89db28f7160365b73d26bf4b8812 (diff)
downloadqtlocation-mapboxgl-b2beeda50bbd48fecad957d194dd5b40c72eb9c7.tar.gz
[core] Adopt a strict naming convention for style properties
This will allow code to be generated from the style specification.
Diffstat (limited to 'src/mbgl/renderer/painter_raster.cpp')
-rw-r--r--src/mbgl/renderer/painter_raster.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index c86d1a4c58..39e0b5f195 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -15,12 +15,12 @@ void Painter::renderRaster(RasterBucket& bucket, const RasterLayer& layer, const
config.program = rasterShader->getID();
rasterShader->u_matrix = matrix;
rasterShader->u_buffer = 0;
- rasterShader->u_opacity = properties.opacity;
- 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.hueRotate);
+ rasterShader->u_opacity = properties.rasterOpacity;
+ rasterShader->u_brightness_low = properties.rasterBrightnessMin;
+ rasterShader->u_brightness_high = properties.rasterBrightnessMax;
+ rasterShader->u_saturation_factor = saturationFactor(properties.rasterSaturation);
+ rasterShader->u_contrast_factor = contrastFactor(properties.rasterContrast);
+ rasterShader->u_spin_weights = spinWeights(properties.rasterHueRotate);
config.stencilTest = GL_FALSE;