diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-31 15:48:30 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-05-31 18:02:40 +0300 |
| commit | 62b4dd554ab4df891221b1e43bda5a0f5dc1741a (patch) | |
| tree | 972e38be0dd7e3b853ef0607a5e04c3ae18577d9 /src/mbgl/renderer/painter.hpp | |
| parent | b94a125ff28db2d4bfd181928ce8eee523a30ec7 (diff) | |
| download | qtlocation-mapboxgl-62b4dd554ab4df891221b1e43bda5a0f5dc1741a.tar.gz | |
[core] Update circle shader code
Ported the following patches:
- [convert mat4 exMatrix to a vec2 extrudeScale](https://github.com/mapbox/mapbox-gl-shaders/commit/a8d549b7a41540d3a99767975ff1b7b18a6010e9)
- [Enabled data-driven styling for circle-radius](https://github.com/mapbox/mapbox-gl-shaders/commit/4356e41fa657837904d189e604468617ee601ddb)
- [Reduce shader boilerplate, refactor "Bucket"](https://github.com/mapbox/mapbox-gl-shaders/commit/7d3da8f1914954fd96f305b7116cfd127a616551)
Diffstat (limited to 'src/mbgl/renderer/painter.hpp')
| -rw-r--r-- | src/mbgl/renderer/painter.hpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index a5d4a25b68..6b86dfa69d 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -158,6 +158,8 @@ private: mat4 nativeMatrix; mat4 extrudeMatrix; + std::array<float, 2> extrudeScale; + // used to composite images and flips the geometry upside down const mat4 flipMatrix = []{ mat4 flip; |