diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2014-08-11 12:02:46 -0700 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2014-08-11 12:13:24 -0700 |
| commit | 41165452bcf16e90f6e4265123021e56cfb021f6 (patch) | |
| tree | 6c7f19cebe19c931141f0e1b99f37a472436f6ed /src/style | |
| parent | 1ad2f26b9d753940e26d0ac3be96392feb73ae9e (diff) | |
| download | qtlocation-mapboxgl-41165452bcf16e90f6e4265123021e56cfb021f6.tar.gz | |
some cleaning up, raster spin->hue-rotate rename
Diffstat (limited to 'src/style')
| -rw-r--r-- | src/style/property_fallback.cpp | 2 | ||||
| -rw-r--r-- | src/style/style_layer.cpp | 2 | ||||
| -rw-r--r-- | src/style/style_parser.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/style/property_fallback.cpp b/src/style/property_fallback.cpp index 4401c8105a..4028980cbe 100644 --- a/src/style/property_fallback.cpp +++ b/src/style/property_fallback.cpp @@ -47,7 +47,7 @@ const std::map<PropertyKey, PropertyValue> PropertyFallbackValue::properties = { { PropertyKey::CompositeOpacity, defaultStyleProperties<CompositeProperties>().opacity }, { PropertyKey::RasterOpacity, defaultStyleProperties<RasterProperties>().opacity }, - { PropertyKey::RasterSpin, defaultStyleProperties<RasterProperties>().spin }, + { PropertyKey::RasterHueRotate, defaultStyleProperties<RasterProperties>().hue_rotate }, { PropertyKey::RasterBrightnessLow, defaultStyleProperties<RasterProperties>().brightness[0] }, { PropertyKey::RasterBrightnessHigh, defaultStyleProperties<RasterProperties>().brightness[1] }, { PropertyKey::RasterSaturation, defaultStyleProperties<RasterProperties>().saturation }, diff --git a/src/style/style_layer.cpp b/src/style/style_layer.cpp index 8ec04d6695..520c183780 100644 --- a/src/style/style_layer.cpp +++ b/src/style/style_layer.cpp @@ -228,7 +228,7 @@ void StyleLayer::applyStyleProperties<RasterProperties>(const float z, const tim properties.set<RasterProperties>(); RasterProperties &raster = properties.get<RasterProperties>(); applyStyleProperty(PropertyKey::RasterOpacity, raster.opacity, z, now); - applyStyleProperty(PropertyKey::RasterSpin, raster.spin, z, now); + applyStyleProperty(PropertyKey::RasterHueRotate, raster.hue_rotate, z, now); applyStyleProperty(PropertyKey::RasterBrightnessLow, raster.brightness[0], z, now); applyStyleProperty(PropertyKey::RasterBrightnessHigh, raster.brightness[1], z, now); applyStyleProperty(PropertyKey::RasterSaturation, raster.saturation, z, now); diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp index 17c8fdf25a..33a1573c0b 100644 --- a/src/style/style_parser.cpp +++ b/src/style/style_parser.cpp @@ -639,8 +639,8 @@ void StyleParser::parseStyle(JSVal value, ClassProperties &klass) { // TODO edit these?: parseOptionalProperty<Function<float>>("raster-opacity", Key::RasterOpacity, klass, value); parseOptionalProperty<PropertyTransition>("transition-raster-opacity", Key::RasterOpacity, klass, value); - parseOptionalProperty<Function<float>>("raster-spin", Key::RasterSpin, klass, value); - parseOptionalProperty<PropertyTransition>("transition-raster-spin", Key::RasterSpin, klass, value); + parseOptionalProperty<Function<float>>("raster-hue-rotate", Key::RasterHueRotate, klass, value); + parseOptionalProperty<PropertyTransition>("transition-raster-hue-rotate", Key::RasterHueRotate, klass, value); parseOptionalProperty<Function<float>>("raster-brightness-low", Key::RasterBrightnessLow, klass, value); parseOptionalProperty<PropertyTransition>("transition-raster-brightness-low", Key::RasterBrightnessLow, klass, value); parseOptionalProperty<Function<float>>("raster-brightness-high", Key::RasterBrightnessHigh, klass, value); |