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 /include/mbgl | |
| parent | 1ad2f26b9d753940e26d0ac3be96392feb73ae9e (diff) | |
| download | qtlocation-mapboxgl-41165452bcf16e90f6e4265123021e56cfb021f6.tar.gz | |
some cleaning up, raster spin->hue-rotate rename
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/renderer/painter.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/style/property_key.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/style/style_properties.hpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index d4810cf69b..80948c49b1 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -43,6 +43,7 @@ class RasterBucket; class PrerenderedTexture; struct FillProperties; +struct RasterProperties; struct CompositeProperties; class LayerDescription; @@ -87,9 +88,8 @@ public: void renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix); void preparePrerender(RasterBucket &bucket); - void finishPrerender(RasterBucket &bucket); - void renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix); + void renderPrerenderedTexture(RasterBucket &bucket, const mat4 &matrix, const RasterProperties& properties); void createPrerendered(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id); diff --git a/include/mbgl/style/property_key.hpp b/include/mbgl/style/property_key.hpp index 68dc709597..7d24981765 100644 --- a/include/mbgl/style/property_key.hpp +++ b/include/mbgl/style/property_key.hpp @@ -54,7 +54,7 @@ enum class PropertyKey { CompositeOpacity, RasterOpacity, - RasterSpin, + RasterHueRotate, RasterBrightnessLow, RasterBrightnessHigh, RasterSaturation, diff --git a/include/mbgl/style/style_properties.hpp b/include/mbgl/style/style_properties.hpp index 35ea97781b..f12ab430e3 100644 --- a/include/mbgl/style/style_properties.hpp +++ b/include/mbgl/style/style_properties.hpp @@ -89,7 +89,7 @@ struct CompositeProperties { struct RasterProperties { inline RasterProperties() {} float opacity = 1.0f; - float spin = 0.0f; + float hue_rotate = 0.0f; std::array<float, 2> brightness = {{ 0, 1 }}; float saturation = 0.0f; float contrast = 0.0f; |