diff options
| author | Vladimir Agafonkin <agafonkin@gmail.com> | 2018-01-26 19:36:33 +0200 |
|---|---|---|
| committer | Vladimir Agafonkin <agafonkin@gmail.com> | 2018-01-26 19:36:33 +0200 |
| commit | a175d1e27974a5f2d5dd7165f963381926d3172e (patch) | |
| tree | bae9803ea542af174720ff757093532424d34a65 | |
| parent | d3339488509ed29c0373b2fd3cb99108a46edb25 (diff) | |
| download | qtlocation-mapboxgl-a175d1e27974a5f2d5dd7165f963381926d3172e.tar.gz | |
hopefully fix android build this time
| -rw-r--r-- | platform/android/src/style/layers/layers.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/gl/context.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/renderer_impl.cpp | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/platform/android/src/style/layers/layers.cpp b/platform/android/src/style/layers/layers.cpp index 0e1b4b4122..acd851b0a6 100644 --- a/platform/android/src/style/layers/layers.cpp +++ b/platform/android/src/style/layers/layers.cpp @@ -35,6 +35,7 @@ template <> struct PeerType<style::CircleLayer> { using Type = android::CircleLa template <> struct PeerType<style::FillExtrusionLayer> { using Type = android::FillExtrusionLayer; }; template <> struct PeerType<style::FillLayer> { using Type = android::FillLayer; }; template <> struct PeerType<style::HillshadeLayer> { using Type = android::HillshadeLayer; }; +template <> struct PeerType<style::HeatmapLayer> { using Type = android::HeatmapLayer; }; template <> struct PeerType<style::LineLayer> { using Type = android::LineLayer; }; template <> struct PeerType<style::RasterLayer> { using Type = android::RasterLayer; }; template <> struct PeerType<style::SymbolLayer> { using Type = android::SymbolLayer; }; @@ -98,6 +99,7 @@ void registerNativeLayers(jni::JNIEnv& env) { FillExtrusionLayer::registerNative(env); FillLayer::registerNative(env); HillshadeLayer::registerNative(env); + HeatmapLayer::registerNative(env); LineLayer::registerNative(env); RasterLayer::registerNative(env); SymbolLayer::registerNative(env); diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index 98eda1df54..bdf78b0f4e 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -81,7 +81,7 @@ public: createIndexBuffer(v.data(), v.byteSize(), usage) }; } - + template <class DrawMode> void updateIndexBuffer(IndexBuffer<DrawMode>& buffer, IndexVector<DrawMode>&& v) { assert(v.indexSize() == buffer.indexCount); diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp index 2d912dd26b..ebac1dac22 100644 --- a/src/mbgl/renderer/renderer_impl.cpp +++ b/src/mbgl/renderer/renderer_impl.cpp @@ -409,9 +409,9 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) { if (placementChanged || symbolBucketsChanged) { placement = std::move(newPlacement); } - - placement->setRecent(parameters.timePoint); + placement->setRecent(parameters.timePoint); + updateFadingTiles(); } else { placement->setStale(); |