[not ready] client side hillshading with terrain-rgb raster tiles #4701

mollymerp · 2017-05-11T01:18:15Z

still very very rough here. will update this ticket soon w the to-do list before this is ready for review.

🗻

Launch Checklist

briefly describe the changes in this PR
write tests for all new functionality
document any changes to public APIs
post benchmark scores
manually test the debug page

andrewharvey · 2017-05-12T02:09:11Z

Would it make more sense to call the layer type hillshade? I think we should try to use terminology which fits in with future 3D terrain support. I've proposed some ideas about terminology over at #1489 (comment). Over there I've proposed using terrain as the source type for terrain-rgb tiles, and elevation as the layer type for 3D surface.

mollymerp · 2017-05-23T12:55:20Z

kkaefer · 2017-06-13T17:00:22Z

We could move the preparation step for terrain textures to the beginning of a frame to improve rendering performance.

Right now, the workflow of a frame is like this:

(main framebuffer is bound)
Clear main framebuffer (✅ first operation is clear -> no restore)
Render some layers
Render terrain layer
- For non-preprocessed tiles
  - Bind terrain framebuffer
  - Clear terrain framebuffer (✅ first operation is clear -> no restore)
  - Draw prepare step
  - Bind main framebuffer
- Draw preprocessed terrain tiles
Draw other layers (:warning: FBO restore)

When binding a framebuffer and rendering operations on it, the GPU has to restore the contents of the framebuffer. The driver can optimize that when we do a clear as the first drawing operation (since that discards the contents of the framebuffer). Therefore, drawing to the main framebuffer, then binding a different framebuffer, and rebinding the main framebuffer triggers a framebuffer load on the first draw call.

Instead, we could do all operations that require binding a separate framebuffer (computing the preprocessed textures) as the first thing when rendering a frame (i.e. before calling clear on the main framebuffer) and have the following order:

(main framebuffer is bound)
Preprocess all non-preprocessed terrain tiles (if any)
- Bind terrain framebuffer
- Clear terrain framebuffer (✅ first operation is clear -> no restore)
- Draw prepare step
- Bind main framebuffer
Clear main framebuffer (✅ first operation is clear -> no restore)
Render some layers
Render terrain layer
- Draw preprocessed terrain tiles
Draw other layers

kkaefer

It looks like there is still a lot of code for supporting the openness visualization that we can remove.

kkaefer · 2017-07-03T13:20:00Z

test/unit/style-spec/fixture/layers.output.json

@@ -56,11 +56,11 @@
    "line": 74
  },
  {
-    "message": "layers[12].type: expected one of [fill, line, symbol, circle, fill-extrusion, raster, background], invalid found",
+    "message": "layers[12].type: expected one of [fill, line, symbol, circle, fill-extrusion, raster, terrain, background], invalid found",


kkaefer · 2017-07-03T13:21:57Z

src/style/style_layer.js

@@ -346,7 +346,7 @@ const subclasses = {
    'fill': require('./style_layer/fill_style_layer'),
    'fill-extrusion': require('./style_layer/fill_extrusion_style_layer'),
    'line': require('./style_layer/line_style_layer'),
-    'symbol': require('./style_layer/symbol_style_layer')
+    'symbol': require('./style_layer/symbol_style_layer'),


Is that compatible with Safari?

kkaefer · 2017-07-03T13:23:53Z

src/source/source_cache.js

+            this._backfillDEM(tile);
+        } else {
+            this._source.fire('data', {dataType: 'source', tile: tile, coord: tile.coord});
+        }


Can we leave the call to this._source.fire('data', {dataType: 'source', tile: tile, coord: tile.coord}); at the root and just call backfillDEM additionally? backfillDEM calls the same function.

kkaefer · 2017-07-03T13:26:45Z

src/shaders/hillshade.fragment.glsl

+        gl_FragColor = accent_color * (1.0 - shade_color.a) + shade_color;
+    } else {
+        gl_FragColor = vec4(1.0, 0.0, 1.0, 1.0);
+    }


Before we merge this, we should remove all unused modes.

kkaefer · 2017-07-03T13:27:56Z

src/source/image_source.js

-        array.emplaceBack(this._tileCoords[2].x, this._tileCoords[2].y, maxInt16, maxInt16);
+        array.emplaceBack(this._tileCoords[1].x, this._tileCoords[1].y, EXTENT, 0);
+        array.emplaceBack(this._tileCoords[3].x, this._tileCoords[3].y, 0, EXTENT);
+        array.emplaceBack(this._tileCoords[2].x, this._tileCoords[2].y, EXTENT, EXTENT);


Can we factor out this change into a separate PR that we can merge beforehand? I think it makes sense to have this as a separate change since it affects to many parts of the code that are unrelated to hillshading.

yep – these changes are in #4770 and mapbox/mapbox-gl-native#9153, but they're blocked until text-pitch changes are merged into native

kkaefer · 2017-07-03T13:58:27Z

src/geo/dem_pyramid.js

+            case 1:
+                _xMax = _xMin + 1;
+                break;
+            }


This could break if dx < -1 or > 1

kkaefer · 2017-07-04T14:03:25Z

We'd likely need something like mapbox/mapbox-gl-native#9415 to prevent flickering from overlapping parent/child tiles.

add terrain layer type and associated required files build out DEM pyramid fix setter+getter read buffer process array buffer into texture attempt to draw offscreen texture for terrain-prepare shader calcs use framebuffer to gemerate terrain texture try to render ⛰️ rebase to use monorepo use browser canvas obj begin terrain-raster source scaffolding create DEM from raster source praise be!!! raster is a go 🙏

lint er

clean a lil

linty lint

more ☀️ tweaks

…eighboring tile data try using clipped extents to reduce seam flashes fix strategy for minimizing seams... sorrrrta works

…late slope and NEAREST interpolation"

clean up a lil and lint

clean up dead code and fix some accidental changes terrain --> hillshade: rename layer type clean up and revert accidental changes

mollymerp · 2017-09-14T01:57:06Z

this work is now tracked at #5286

mollymerp added api 📝 feature 🍏 under development labels May 11, 2017

mollymerp mentioned this pull request May 25, 2017

Client-side terrain rendering #3730

Closed

mourner mentioned this pull request May 25, 2017

Add "TIN" or heatmap layer type #3994

Closed

mollymerp force-pushed the terrain-rgb-rendering branch from bc9a507 to 7c8607f Compare May 26, 2017 13:36

mourner mentioned this pull request Jun 6, 2017

Normal map (normal) layer type #4790

Closed

mollymerp force-pushed the terrain-rgb-rendering branch 3 times, most recently from add7681 to 3efe4a8 Compare June 29, 2017 18:21

kkaefer reviewed Jul 3, 2017

View reviewed changes

Molly Lloyd added 15 commits July 5, 2017 17:42

get rid of tile seams ✂️

ee84ced

lint er

remove artifacts from vector tile terrain implementation

231041c

correct layer type, refactor tile cacheing a lil

7b5a3df

clean a lil

populate mip map levels + do resampling on a worker thread

0769e71

clean up DEM pyramid

5f0974f

add option to pad an extra layer of loaded tiles for DEM backfill

a27ecae

add neighboring tiles property for raster terrain tiles

0856d2e

remove path.join from terrain shaders

c9e58f1

use tile by tile backfill approach

9c81803

comment and modify shaders to boost slope magnitudes

2e6bcee

fix terrain render calls so rendering with other layers is possible

737fe59

fix style-spec validation

d820d61

add more debug options

0d6f769

linty lint

💡 property

54da010

Molly Lloyd added 16 commits July 5, 2017 17:43

ensure premultiply is off so terrain can render with symbol layers 😭

b4ac1d4

optimize backfillBorders to only backfill necessary pixels

eca87a8

use global light object for intensity and lighting angles

f59027a

more ☀️ tweaks

change tex pos scaling

48fe6bc

create buffer for when terrain tile is incompletely backfilled with n…

75cc87b

…eighboring tile data try using clipped extents to reduce seam flashes fix strategy for minimizing seams... sorrrrta works

properly transfer data from worker thread

587b44e

fix rendering artifacts by using a whole pixel value epsilon to calcu…

b03fee4

…late slope and NEAREST interpolation"

prepare terrain framebuffers before beginning render passes

3cc2163

fix light 🙈

8c02a05

🗑️ cleanup

d1f6d2e

clean up a lil and lint

remove openness calculation stuff

11d8b2e

add first render tests

59d21a2

remove properties replaced with global light obj from style-spec

9645e3f

clean up dead code and fix some accidental changes terrain --> hillshade: rename layer type clean up and revert accidental changes

mini-refactor getNeighboringTiles

c2bb657

RasterTerrainTileSource unit tests

72bbcb0

refactor based on PR feedback

c29d7b2

mollymerp force-pushed the terrain-rgb-rendering branch from 3efe4a8 to c29d7b2 Compare July 6, 2017 00:56

remove more code from openness calculations

066f8cc

kkaefer mentioned this pull request Jul 20, 2017

Port raster tile masking #5003

Closed

mollymerp mentioned this pull request Sep 14, 2017

add raster-dem source type and hillshade layer type #5286

Merged

19 tasks

mollymerp closed this Sep 14, 2017

mollymerp mentioned this pull request May 15, 2017

[style-spec] client-side hill-shading source/layer/properties #4711

Closed

jfirebaugh deleted the terrain-rgb-rendering branch February 22, 2018 20:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[not ready] client side hillshading with terrain-rgb raster tiles #4701

[not ready] client side hillshading with terrain-rgb raster tiles #4701

mollymerp commented May 11, 2017

andrewharvey commented May 12, 2017

mollymerp commented May 23, 2017 •

edited

Loading

kkaefer commented Jun 13, 2017

kkaefer left a comment

kkaefer Jul 3, 2017

kkaefer Jul 3, 2017

kkaefer Jul 3, 2017

kkaefer Jul 3, 2017

kkaefer Jul 3, 2017

mollymerp Jul 6, 2017 •

edited

Loading

kkaefer Jul 3, 2017

kkaefer commented Jul 4, 2017

mollymerp commented Sep 14, 2017

[not ready] client side hillshading with terrain-rgb raster tiles #4701

[not ready] client side hillshading with terrain-rgb raster tiles #4701

Conversation

mollymerp commented May 11, 2017

Launch Checklist

andrewharvey commented May 12, 2017

mollymerp commented May 23, 2017 • edited Loading

kkaefer commented Jun 13, 2017

kkaefer left a comment

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

mollymerp Jul 6, 2017 • edited Loading

Choose a reason for hiding this comment

kkaefer Jul 3, 2017

Choose a reason for hiding this comment

kkaefer commented Jul 4, 2017

mollymerp commented Sep 14, 2017

mollymerp commented May 23, 2017 •

edited

Loading

mollymerp Jul 6, 2017 •

edited

Loading