[core] add raster-dem source type and hillshade layer type #10642

mollymerp · 2017-12-06T01:04:55Z

mollymerp · 2017-12-20T01:05:23Z

@kkaefer so the rendering working ok now, but I'm not sure how to proceed with a couple things

to backfill the borders, I'd like to call a function on every tile load, or onTileChanged at the source level so I have access to the full tile pyramid or all the loaded tiles in a source, and I'm just not sure where to put that. I hacked it inRenderSource::onTileChanged but that does not seem like an ideal solution. If there isn't a rendersource-specific listener that is invoked when a tile loads, do you have an idea of how/where that would go?
there is a lot of code duplication between the various RasterSource and RasterDEMSource classes and I'm not sure if I need to use templates or simply inheritance. I (briefly) tried to use inheritance on RasterDEMTile inheriting from RasterTile but I had trouble appeasing the compiler with the correct use/removal of final override etc.

asheemmamoowala

For Source types
The only difference between the RasterSource and RasterDEMSource types is the SourceType. VectorSource also seems to differ by only SourceType

You could have RasterDEMSource inherit from RasterSource, remove RasterDEMSource::Impl, and have the RasterSource::Impl constructor take SourceType as a parameter.

Alternatively, all of the tileset-based sources could derive from a new TilesetSource (or other better name) base class and a common TilesetSource::Impl.

For Tile Types
This one's a bit harder. RasterDEMTileWorker can be removed in favor of RasterTileWorker<class Tile, class Bucket>, but that doesn't remove the duplication of the tile types. Templatizing on the bucket type could help resolve this, but I'm not sure if this would be a real improvement.

asheemmamoowala · 2018-01-03T20:57:05Z

src/mbgl/tile/raster_dem_tile.cpp

+             ActorRef<RasterDEMTile>(*this, mailbox)) {
+
+     const CanonicalTileID canonical = id_.canonical;
+     const u_int32_t dim = pow(2, canonical.z);


The u_int32_t type is non-standard, use uint32_t instead.

asheemmamoowala · 2018-01-03T23:15:53Z

src/mbgl/tile/raster_dem_tile.hpp

+    void setMetadata(optional<Timestamp> modified, optional<Timestamp> expires);
+    void setData(std::shared_ptr<const std::string> data);
+
+    void cancel() override;


Give Tile::cancel an empty implementation so this override and the one in RasterTile are not needed.

asheemmamoowala · 2018-01-08T21:09:42Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

@@ -55,6 +55,51 @@ void RenderRasterDEMSource::update(Immutable<style::Source::Impl> baseImpl_,
                       [&] (const OverscaledTileID& tileID) {
                           return std::make_unique<RasterDEMTile>(tileID, parameters, *tileset);
                       });
+    auto rendertiles = getRenderTiles();


getRenderTiles() returns only the RenderTiles that are about to be rendered. This excludes the previously loaded tiles that may have been cached in TilePyramid.cache.

Iterating all the tiles on each update seems unnecessary.

Alternatively:

Overload onTileLoaded/onTileChanged in RenderRasterDEMSource (may require changes in RenderSource).

When a tile is loaded query the TilePyramid for its specific neighbors and backfill both. Ensue that the query includes both the tiles map and the TileCache

Change TileCache to access the cached tile directly using something like Tile* get(OverscaledTileID& key) const. Change the existing get method to pop

👍 done in 0f0aaf1 and 85818c8

asheemmamoowala · 2018-01-09T23:27:37Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

+
+                    // update the bitmasks to indicate that these tiles have been backfilled by flipping the relevant bit
+                    demtile.neighboringTiles = demtile.neighboringTiles | mask;
+                    borderTile.neighboringTiles = borderTile.neighboringTiles | mask;


The mask for borderTile needs to be computed correctly. i.e. I am the downstairs neighbor of my upstairs neighbor.

🤦‍♀️

asheemmamoowala · 2018-01-09T23:30:38Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

-                    const RasterDEMTile& borderTile = static_cast<RasterDEMTile&>(renderableNeighbor->get().tile);
+    RasterDEMTile& demtile = static_cast<RasterDEMTile&>(tile);
+
+    if (tile.isRenderable() && demtile.neighboringTiles != 0b11111111) {


Use an enum to define the neighbors and some of the helpful constants:

enum class DEMTileNeighbors { Empty: 0 TopLeft: 1 << 1 Top: 1 << 2, TopRight: 1 << 3, ..., Complete: 0b11111111 BottomMost: Empty | BottomRight | BottomLeft | Bottom }

asheemmamoowala · 2018-01-09T23:32:50Z

src/mbgl/tile/raster_dem_tile.cpp

@@ -20,31 +20,6 @@ RasterDEMTile::RasterDEMTile(const OverscaledTileID& id_,
      mailbox(std::make_shared<Mailbox>(*Scheduler::GetCurrent())),
      worker(parameters.workerScheduler,
             ActorRef<RasterDEMTile>(*this, mailbox)) {


For tiles on the bottom edge or top edge, consider updating neighboring tiles to mark those neighbors as backfilled.

asheemmamoowala · 2018-01-09T23:39:51Z

src/mbgl/tile/tile_cache.cpp

+Tile* TileCache::get(const OverscaledTileID& key) {
+    auto it = tiles.find(key);
+    if (it != tiles.end()) {
+        return std::move(it->second.get());


No need to move

asheemmamoowala · 2018-01-09T23:42:52Z

src/mbgl/renderer/render_source.hpp

@@ -84,7 +84,7 @@ class RenderSource : protected TileObserver {

    bool enabled = false;

-    virtual void onTileChanged(Tile&);
+    void onTileChanged(Tile&);


add override

asheemmamoowala · 2018-01-10T21:10:33Z

src/mbgl/geometry/dem_pyramid.hpp

+        }
+
+    public:
+        const int32_t dim;


nit: spell out dimension or change to size

hmm its dim in JS too...

asheemmamoowala · 2018-01-10T21:11:53Z

src/mbgl/geometry/dem_pyramid.cpp

+      border(border_),
+      stride(dim + 2 * border),
+      image({ static_cast<uint32_t>(dim + 2 * border),
+              static_cast<uint32_t>(dim + 2 * border) }) {


nit: use stride to init image

asheemmamoowala · 2018-01-10T21:15:48Z

src/mbgl/renderer/layers/render_hillshade_layer.cpp

+    for (const RenderTile& tile : renderTiles) {
+        assert(dynamic_cast<HillshadeBucket*>(tile.tile.getBucket(*baseImpl)));
+        HillshadeBucket& bucket = *reinterpret_cast<HillshadeBucket*>(tile.tile.getBucket(*baseImpl));
+


nit empty line

asheemmamoowala · 2018-01-11T19:09:12Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

 }

 void RenderRasterDEMSource::onTileChanged(Tile& tile){
    RasterDEMTile& demtile = static_cast<RasterDEMTile&>(tile);

+    std::map<DEMTileNeighbors, DEMTileNeighbors> opposites = {


asheemmamoowala · 2018-01-11T19:13:25Z

src/mbgl/tile/raster_dem_tile.cpp

+
+    if ( id.canonical.y == 0 ){
+        // this tile doesn't have upper neighboring tiles so marked those as backfilled
+        neighboringTiles = neighboringTiles | 0b00011100;


Would be safer to use the enum values here. Or create an enum value for this constant.

asheemmamoowala · 2018-01-11T19:17:29Z

src/mbgl/renderer/sources/render_raster_dem_source.hpp

+  BottomRight = 1 << 7
+};
+
+inline unsigned char operator|(unsigned char a, DEMTileNeighbors b) {


Define RasterDEMTile::neighboringTiles of type DEMTileNeighbors. Then these operator overrides can uniformly use DEMTileNeighbors.

asheemmamoowala · 2018-01-11T19:24:05Z

src/mbgl/renderer/sources/render_raster_dem_source.hpp

@@ -6,6 +6,38 @@

 namespace mbgl {

+enum class DEMTileNeighbors {


The underlying type of a C++ enum is implementation-defined. It may not choose the smallest integral type to fit all the values. We can be more specific by providing a type enum class DEMTileNeighbors: unsigned char

asheemmamoowala · 2018-01-11T19:34:12Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp


        std::vector<OverscaledTileID> neighbors = {
+            // left and right neighbor


Could use a comment here to indicate that the order of the tile ids defined here must be kept in sync with the order of enum values defined in DEMTileNeighbors.

Alternatively, you can remove this vector and add a lambda function to dynamically compute the id in each iteration of the for-loop.

asheemmamoowala · 2018-01-12T18:50:46Z

src/mbgl/tile/raster_dem_tile.cpp

@@ -23,12 +23,12 @@ RasterDEMTile::RasterDEMTile(const OverscaledTileID& id_,

    if ( id.canonical.y == 0 ){
        // this tile doesn't have upper neighboring tiles so marked those as backfilled
-        neighboringTiles = neighboringTiles | 0b00011100;
+        neighboringTiles = neighboringTiles | DEMTileNeighbors::NoUpper;


asheemmamoowala · 2018-01-12T18:51:13Z

src/mbgl/tile/raster_dem_tile.hpp

+  Empty = 0 << 1,
+
+  // the order of the neighbors in this enum (or rather the order of their flipped bits
+  // must stay the same as


Incomplete comment?

derp – yeah I think I decided to use a lambda while writing this

asheemmamoowala · 2018-01-13T01:33:10Z

src/mbgl/geometry/dem_pyramid.hpp

@@ -47,7 +48,7 @@ class DEMPyramid {
    bool isLoaded() {
        return loaded;
    };
-    std::vector<Level> levels;
+    std::unique_ptr<Level> level;


Now that DEMPyramid doesn't account for multiple levels, change it to DEMData to match gl-js, and fold in the Level class into DEMData.

As part of folding in the Level class, also consider:

using a getter method for image. You'll have to return as a const reference.

defining the dim, stride, and border members as const. They are assigned to in the constructor and shouldn't be changed after.

As a bonus, this will eliminate the need to zero out the image data in the Level constructor.

asheemmamoowala · 2018-01-13T01:59:21Z

src/mbgl/renderer/buckets/hillshade_bucket.cpp

-    }
+    dem = context.createTexture(pyramid.level->image);
+    auto& image = pyramid.level->image;
+    context.updateTexture(*dem, image);


Shouldn't need to update the texture right after creation.

asheemmamoowala · 2018-01-13T02:07:23Z

src/mbgl/renderer/buckets/hillshade_bucket.hpp

+
+    TileMask mask{ { 0, 0, 0 } };
+    bool prepared = false;
+    DEMPyramid* getDEMPyramid();


Return const reference instead of pointer.

mollymerp · 2018-01-16T22:50:02Z

@kkaefer the remaining tasks on this PR as I see it are:

attempt to refactor Raster*Source files to reduce code duplication per [core] add raster-dem source type and hillshade layer type #10642 (review)
- PR for this: make RasterDEMSource inherit from RasterSource #10952
minor refactoring of fillBorder in RenderRasterDEMSource to better contain statemanagement of HillshadeBucket and RasterDEMTile in their respective classes (per chat with @asheemmamoowala)
remove hard-coded constants (tilesize, texture size)
figure out why backfilling is wonky – the backfill is happening and the render and unit tests are passing, but I'm still seeing strange seaming between tiles on the final render, so something is wrong.

The first two items should be straightforward and this should be ready for a more in-depth review after those are completed. Debugging the backfill issue is proving to be tricky, but I hope to track it down soon.

mollymerp · 2018-01-17T17:41:18Z

I have taken care of the last three issues on my list above, and I will work on code-duplication-reduction quest today.

Thank you @asheemmamoowala for your super helpful continuous feedback and code reviews over the past week or so! Can you confirm that a724ce0 covers what you were suggesting to me in chat?

asheemmamoowala

@mollymerp a724ce0 👍

asheemmamoowala · 2018-01-17T19:32:13Z

circle.yml

-          filters:
-            tags:
-              only: /node-.*/
+      #- ios-sanitize-thread


You'll want to remove these temporary changes when ready

asheemmamoowala · 2018-01-17T19:40:05Z

src/mbgl/geometry/dem_data.hpp

+
+class DEMData {
+public:
+    class Level {


Is there a need for the inner Level class anymore? Can DEMData own the image and other members directly ?

removed in #10964

asheemmamoowala · 2018-01-17T19:42:54Z

src/mbgl/renderer/renderer_impl.cpp

@@ -289,7 +290,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
        RenderLayer* layer = getRenderLayer(layerImpl->id);
        assert(layer);

-        if (!parameters.staticData.has3D && layer->is<RenderFillExtrusionLayer>()) {
+        if ((!parameters.staticData.has3D && layer->is<RenderFillExtrusionLayer>()) || (!parameters.staticData.has3D && layer->is<RenderHillshadeLayer>())) {


Can be simplified to !has3D && (is<Fill> || is<Hillshade>)

asheemmamoowala · 2018-01-17T20:48:25Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

+                if (renderableNeighbor != nullptr && renderableNeighbor->isRenderable()) {
+                    RasterDEMTile& borderTile = static_cast<RasterDEMTile&>(*renderableNeighbor);
+                    demtile.backfillBorder(borderTile, mask);
+                    borderTile.backfillBorder(demtile, opposites[mask]);


There is a rare situation where borderTile has already been back-filled with a previous instance of demTile.
A tile might be loaded, then eventually evicted from the cache. Next time it is loaded, it may attempt to back-fill a bordering tile for a second time. This can be guarded against in RasterDEMTile::backfillBorder

kkaefer · 2018-01-18T00:43:01Z

src/mbgl/geometry/dem_data.cpp

+
+namespace mbgl {
+
+DEMData::DEMData(PremultipliedImage& image):


This object should either get a &&, or a const &. You're currently passing in a modifiable reference, which in most cases isn't what we want because it means that this constructor can modify the image object, but doesn't take ownership of it. Looking at the code below, we don't seem to modify any of it, so using const & should work. The other option would be to use && and move image into this function/constructor. This would potentially allow the constructor to take ownership of the object.

kkaefer · 2018-01-18T00:44:48Z

src/mbgl/geometry/dem_data.cpp

+
+DEMData::DEMData(PremultipliedImage& image):
+    level(image.size.height, std::max<int32_t>(std::ceil(image.size.height / 2), 1)){
+    assert(image.size.height == image.size.width);


assert is checked only when we compile in Debug mode (and it crashes the app if the assertion fails). Since this data is originally from the image we download from the internet (which could be any size), we should always validate that the size is correct, and throw an exception otherwise (and make sure that the exception is handled elsewhere!)

kkaefer · 2018-01-18T00:47:15Z

src/mbgl/geometry/dem_data.cpp

+        for (int32_t x = 0; x < level.dim; x++) {
+            const int32_t i = y * level.dim + x;
+            const int32_t j = i * 4;
+            level.set(x, y, (image.data[j] * 256 * 256 + image.data[j+1] * 256 + image.data[j+2])/10 - 10000);


In Release mode, this could lead to undefined behavior/memory access out of bounds in the following scenario:

assert isn't run (see above)

level.dim is larger than the image's height

computing the offset produces a number that is larger than the number of bytes in image.data

It looks like you're making assumptions about the image width having to be exactly 256 pixels, but it also seems that this isn't checked in the constructor. We should add a check and throw an exception if that isn't the case (probably combine with assertion above).

I don't think I'm assuming the tile is 256px; the 256 in that line comes from the terrain-rgb decoding formula

You’re right 🤦‍♂️
However the comment about assert still holds true

kkaefer · 2018-01-18T00:48:40Z

src/mbgl/geometry/dem_data.cpp

+    loaded = true;
+}
+
+void DEMData::backfillBorder(const DEMData& borderTileData, int8_t dx, int8_t dy) {


Could you please add a few code comments to this function explaining what it does? We're using a few abbreviations here that are a bit unclear.

kkaefer · 2018-01-18T00:50:31Z

src/mbgl/geometry/dem_data.hpp

+            assert(x >= -border);
+            assert(x < dim + border);
+            assert(y >= -border);
+            assert(y < dim + border);


Similar to above, these assertions aren't going to be run for Release builds.

I think that's ok in this case – per your comments in chat, these conditions should never be false under any circumstances given how this function is used and how dim and border are determined.

kkaefer · 2018-01-18T00:56:18Z

src/mbgl/renderer/layers/render_hillshade_layer.cpp

+
+        if (!bucket.hasData())
+            continue;
+        if (!bucket.isPrepared() && parameters.pass == RenderPass::Pass3D) {


Can we pull out the RenderPass check to avoid looping over all of these tiles in the first place if the pass isn't 3D?

there is a check at the top https://github.com/mapbox/mapbox-gl-native/pull/10642/files?diff=unified#diff-6caf1c70caa7f8af8b0900642e5773e2R59 is that what you mean?

kkaefer · 2018-01-18T00:56:37Z

src/mbgl/renderer/layers/render_raster_layer.cpp

@@ -153,3 +153,4 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source
 }

 } // namespace mbgl
+


Nit: additional whitespace

kkaefer · 2018-01-18T00:57:17Z

src/mbgl/renderer/sources/render_raster_dem_source.cpp

+        tileURLTemplates = tileset->tiles;
+
+        // TODO: this removes existing buckets, and will cause flickering.
+        // Should instead refresh tile data in place.


This still needs to be addressed ;)

this is copied directly from RenderRasterSource so I guess it hasn't been addressed there either 🤔

maybe we should address both in a follow up PR?

Ah okay, yeah, let's do this in a follow up PR if this is even still true.

kkaefer · 2018-01-18T01:01:07Z

src/mbgl/tile/raster_dem_tile.hpp

+class TileParameters;
+class HillshadeBucket;
+
+enum class DEMTileNeighbors : unsigned char {


Nit: Can we use uint8_t to be in line with how we use this type in other parts of the codebase?

kkaefer · 2018-01-18T01:05:35Z

src/mbgl/tile/tile_cache.cpp

+    }
+}
+
+std::unique_ptr<Tile> TileCache::pop(const OverscaledTileID& key) {


Did you check other uses of ::pop to make sure we're not accidentally changing existing behavior?

Yes, I replaced all preexisting calls to TileCache::get(old name for this pop function) with TileCache::pop and TileCache::get is only used to backfill raster-dem tiles

halset · 2018-01-19T22:20:50Z

I tried ca7203e on iOS and it crashes at z16 in ./src/mbgl/renderer/sources/render_raster_dem_source.cpp:81

        const uint16_t dim = std::pow(2, canonical.z);
        const uint32_t px = (canonical.x - 1 + dim) % dim;

When doing 2^16 and handling that as a 16 bit, it looks like the result dim is 0. At the next line there is a divide by this same 0.

mollymerp · 2018-01-20T00:52:31Z

oooh thanks for the catch @halset !!

1ec5 · 2018-01-22T18:59:56Z

platform/ios/docs/guides/For Style Authors.md

@@ -190,6 +190,7 @@ In style JSON | In the SDK
 `circle` | `MGLCircleStyleLayer`
 `fill` | `MGLFillStyleLayer`
 `fill-extrusion` | `MGLFillExtrusionStyleLayer`
+`hillshade` | `MGLHillshadeStyleLayer`


Unfortunately, darwin-style-code is unable to automate the entire process of adding a new layer type, so some changes are still needed before this layer type can be used on iOS and macOS:

Add the new files to the SDKs

Add the new classes to the documentation table of contents

Wrap the new layer type in an Objective-C object in the runtime styling API

Refine the new class’s documentation

Add an icon to represent this layer type in the sidebar of macosapp

Mention the new APIs in the changelogs

This can be tail work if necessary, since the builds are passing.

thanks for the heads up @1ec5 – I would prefer to do this in a follow up PR because this is already a giant set of changes if thats ok

ticketed #10991

mollymerp · 2018-01-22T21:57:32Z

@kkaefer @asheemmamoowala Unless there are any other changes you'd like me to make, I think this just needs the final ✅ 🙃

asheemmamoowala

All systems go 🚀

kkaefer · 2018-01-22T23:43:46Z

src/mbgl/tile/raster_dem_tile.cpp

+            dx -= dim;
+        }
+    }
+    const HillshadeBucket* borderBucket = borderTile.getBucket();


getBucket() can return nullptr if we have received a tile that is invalid or empty. In this case, the worker code eventually calls RasterDEMTile::onError or RasterDEMTile::onParsed respectively. The former doesn't explicitly set the bucket pointer, which means that it'll remain empty. The latter explicitly sets a nullptr (via std::move).

We should guard accessing this code, and just don't backfill for this particular tile that is missing.

@2x

add DEMPyramid class add raster-dem source and hillshade layer types update with layer-specific lighting properties fix build errors use 3dpass for hillshade prepare step fix DEM population, change border to int32 update shaders and fix rendering update gl-js sha and un-ignore hillshade render tests start backfill border logic remove unused dem pyramid code implement backfill border use bitmask to keep track of backfilled neighbors fix tests TileCache::get -> TileCache::pop, add new getter fix node build remove unnecessary std::move override/final onTileChanged update hillshade shaders android style code update hillshade shaders appease clang-tidy address review comments use enum for neighboring tiles enforce+update DEMTileNeighbors type add RasterDEMTile test clean up DEMPyramid define constructor for DEMPyramid test DEMPyramid DEMPyramid->DEMData return reference to DEMData instead of pointer refactor backfillBorder owner fix texture filter and wrap settings remove hardcoded tilesizes and allow for @2x tile requests address review comments make RasterDEMSource inherit from RasterSource (#10952) comment DEMData::backfillBorder guard against redoing backfill work for the borderTile add RasterDEMSource tests reenable all builds ios codegen remove Level class (#10964) cleanup and add hillshade to android style layer exceptions dim as uint32 guard against nullptr borderBucket

mollymerp added feature GL JS parity For feature parity with Mapbox GL JS in progress ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Dec 6, 2017

kkaefer added the Core The cross-platform C++ core, aka mbgl label Dec 13, 2017

mollymerp force-pushed the raster-hillshade branch from f54e959 to 1a005f2 Compare December 19, 2017 21:56

1ec5 mentioned this pull request Dec 20, 2017

Show the contour-label symbol in meters or feet #5018

Closed

4 tasks

asheemmamoowala reviewed Jan 3, 2018

View reviewed changes

asheemmamoowala suggested changes Jan 8, 2018

View reviewed changes

mollymerp force-pushed the raster-hillshade branch 2 times, most recently from 7c1493c to a02cb6c Compare January 9, 2018 23:28

asheemmamoowala reviewed Jan 9, 2018

View reviewed changes

asheemmamoowala reviewed Jan 10, 2018

View reviewed changes

mollymerp force-pushed the raster-hillshade branch from 423b673 to 226f1c6 Compare January 11, 2018 02:00

asheemmamoowala reviewed Jan 11, 2018

View reviewed changes

asheemmamoowala reviewed Jan 12, 2018

View reviewed changes

asheemmamoowala reviewed Jan 13, 2018

View reviewed changes

mollymerp force-pushed the raster-hillshade branch from 2de7850 to f5df2f3 Compare January 16, 2018 20:52

mollymerp force-pushed the raster-hillshade branch from b0fedf7 to c1d7217 Compare January 17, 2018 17:49

asheemmamoowala reviewed Jan 17, 2018

View reviewed changes

kkaefer reviewed Jan 18, 2018

View reviewed changes

mollymerp force-pushed the raster-hillshade branch from c1d7217 to 0bc33c9 Compare January 18, 2018 01:27

mollymerp mentioned this pull request Jan 18, 2018

make RasterDEMSource inherit from RasterSource #10952

Merged

mollymerp force-pushed the raster-hillshade branch from 0b491fa to 81d425c Compare January 19, 2018 02:10

mollymerp force-pushed the raster-hillshade branch 2 times, most recently from d329da8 to e648e72 Compare January 20, 2018 00:50

mollymerp force-pushed the raster-hillshade branch 5 times, most recently from 4accffb to eddcad8 Compare January 22, 2018 18:12

1ec5 reviewed Jan 22, 2018

View reviewed changes

mollymerp mentioned this pull request Jan 22, 2018

Add darwin style code for raster-dem and hillshade #10991

Closed

7 tasks

asheemmamoowala approved these changes Jan 22, 2018

View reviewed changes

kkaefer suggested changes Jan 22, 2018

View reviewed changes

mollymerp force-pushed the raster-hillshade branch from eddcad8 to a6a33c7 Compare January 23, 2018 00:00

kkaefer approved these changes Jan 23, 2018

View reviewed changes

mollymerp removed in progress ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Jan 23, 2018

mollymerp merged commit f329420 into master Jan 23, 2018

1ec5 mentioned this pull request Jan 24, 2018

Hook up hillshade style layers, raster DEM sources to iOS/macOS #11036

Merged

jfirebaugh deleted the raster-hillshade branch July 27, 2018 22:47

		@@ -6,6 +6,38 @@

		namespace mbgl {

		enum class DEMTileNeighbors {


		std::vector<OverscaledTileID> neighbors = {
		// left and right neighbor


		namespace mbgl {

		DEMData::DEMData(PremultipliedImage& image):

		@@ -153,3 +153,4 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source
		}

		} // namespace mbgl

[core] add raster-dem source type and hillshade layer type #10642

[core] add raster-dem source type and hillshade layer type #10642

Conversation

mollymerp commented Dec 6, 2017 • edited Loading

mollymerp commented Dec 20, 2017

asheemmamoowala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

asheemmamoowala Jan 3, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mollymerp commented Jan 16, 2018 • edited Loading

mollymerp commented Jan 17, 2018

asheemmamoowala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

halset commented Jan 19, 2018

mollymerp commented Jan 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mollymerp commented Jan 22, 2018

asheemmamoowala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mollymerp commented Dec 6, 2017 •

edited

Loading

asheemmamoowala Jan 3, 2018 •

edited

Loading

mollymerp commented Jan 16, 2018 •

edited

Loading