Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Render fill-extrusion layers #8431

Merged
merged 87 commits into from
Apr 27, 2017
Merged

Render fill-extrusion layers #8431

merged 87 commits into from
Apr 27, 2017

Commits on Apr 26, 2017

  1. [core] Generalize std::array<float, N> converter

    jfirebaugh authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    5c62307 View commit details
    Browse the repository at this point in the history
  2. initial WIP commit

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    d6a5137 View commit details
    Browse the repository at this point in the history
  3. wip commit 2

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    272ad93 View commit details
    Browse the repository at this point in the history
  4. [wip] rendering extrusions in glfw: still improperly depth testing + …

    …lighting only stubbed
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    e83c01c View commit details
    Browse the repository at this point in the history
  5. Change rendering from per-tile to per-tile vector (allowing layers to…

    … be grouped)
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    9bc5110 View commit details
    Browse the repository at this point in the history
  6. wip extrusion texture commit before rebase

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    84983de View commit details
    Browse the repository at this point in the history
  7. rebase success: wip; have extrusion texture preliminarily working; ne…

    …ed to fix depth testing, properly setting up renderbuffer, etc
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    21bfc15 View commit details
    Browse the repository at this point in the history
  8. wip: rendering to external texture/renderbuffers, but why are there s…

    …tripes 😭
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    cb2befd View commit details
    Browse the repository at this point in the history
  9. REVERT LATER: glfw settings

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    24effee View commit details
    Browse the repository at this point in the history
  10. Light (initial implementation, needs work)

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    afd5e63 View commit details
    Browse the repository at this point in the history
  11. Further light implementation details

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    5139e61 View commit details
    Browse the repository at this point in the history
  12. cleanup transform_state light placeholders

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4685e7b View commit details
    Browse the repository at this point in the history
  13. delete comment

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    ff52797 View commit details
    Browse the repository at this point in the history
  14. cmake changes: light

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    52cf6e1 View commit details
    Browse the repository at this point in the history
  15. fill_extrusion_bucket fixes

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    a3ad58b View commit details
    Browse the repository at this point in the history
  16. [stash]

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    eb2b725 View commit details
    Browse the repository at this point in the history
  17. abhorrently non-atomic commit in which most things work

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    962bf82 View commit details
    Browse the repository at this point in the history
  18. [ci skip] Update renderbuffer storage type, start cleanups, use evalu…

    …ated fill-extrusion-opacity
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    3d10230 View commit details
    Browse the repository at this point in the history
  19. * Add light defaults

    * Fix extrusion texture paint properties argument so as not to attempt to use a non-uploaded buffer
    * TEMP/TODO: workaround for style deleting needed tiles in RenderData rework
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    f2cf9e7 View commit details
    Browse the repository at this point in the history
  20. Rebased shaders

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    5011ff3 View commit details
    Browse the repository at this point in the history
  21. Implement transitions for light properties.

    * These may be more complicated than necessary -- will now try to whittle down
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    ea92809 View commit details
    Browse the repository at this point in the history
  22. Add fill-extrusion properties to darwin overrides files

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    43dfd55 View commit details
    Browse the repository at this point in the history
  23. Reconcile changes from rebase

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    ab29fcc View commit details
    Browse the repository at this point in the history
  24. Use GL_DEPTH_COMPONENT rather than GL_DEPTH_COMPONENT16 to allow for …

    …implementation-specific depth resolutions (fixes stripes/zigzags)
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    de9fcdf View commit details
    Browse the repository at this point in the history
  25. Update darwin overrides + generated code

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    3524e4f View commit details
    Browse the repository at this point in the history
  26. Render fill-extrusion-pattern

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    1f21d53 View commit details
    Browse the repository at this point in the history
  27. unit test: StyleConversion.Light

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    9fedd0a View commit details
    Browse the repository at this point in the history
  28. unit test: Position.Calculations

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    b04bd2c View commit details
    Browse the repository at this point in the history
  29. Rearrange mat3 translation so no include/ files depend on src/ header…

    …s after rebase
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    907ddc2 View commit details
    Browse the repository at this point in the history
  30. Cleanups (TODOs, unused includes, formatting

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    63cbf82 View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    de9625d View commit details
    Browse the repository at this point in the history
  32. Define DepthComponent as GL/GLES-dependent

    * GLES ES2 supports only GL_DEPTH_COMPONENT16 as a valid RenderbufferStorage internalformat (though GLES ES3 will support 16, 24 and 32F)
    * OpenGL supports GL_DEPTH_COMPONENT, which determines its own size as needed. This is necessary as 16 bits seems to not be high enough resolution for desktop implementations
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    20828e4 View commit details
    Browse the repository at this point in the history
  33. undo changes in glfw/main

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    3d46bbf View commit details
    Browse the repository at this point in the history
  34. fix latitude in transform_state after rebase

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    9c45768 View commit details
    Browse the repository at this point in the history
  35. Only add RenderTiles to order if they have data available

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    286af03 View commit details
    Browse the repository at this point in the history
  36. Ran android-style-code make target

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    0dd79a3 View commit details
    Browse the repository at this point in the history
  37. Amend position test error message based on generalized array converte…

    …r rebase
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    fb6547c View commit details
    Browse the repository at this point in the history
  38. Per review:

    * Split Position conversion into its own file
    * Add light transition parsing + tests
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    7e6a310 View commit details
    Browse the repository at this point in the history
  39. Per review:

    Refactor UnevaluatedPaintProperty + UnevaluatedLightProperty into a separate reusable header, TransitioningProperty
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    0813008 View commit details
    Browse the repository at this point in the history
  40. Per review:

    * Move mbgl/util/position -> mbgl/style/position
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    9a8e5e1 View commit details
    Browse the repository at this point in the history
  41. Per review:

    * Clean up position.hpp
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    715ee12 View commit details
    Browse the repository at this point in the history
  42. Fix broken Position tests from constructor change

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    7423217 View commit details
    Browse the repository at this point in the history
  43. [android] wire up the fill extrusion layer

    ivovandongen authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    97a7472 View commit details
    Browse the repository at this point in the history
  44. [android] add test activity for fill extrusion layer

    ivovandongen authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    61815c7 View commit details
    Browse the repository at this point in the history
  45. Update ios targets

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    99fec2f View commit details
    Browse the repository at this point in the history
  46. Revert glfw formatting

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4b8fd3a View commit details
    Browse the repository at this point in the history
  47. Per review:

    * Remove color renderbuffer from offscreen texture (+ RGBA4 format addition)
    * Move gl::TextureUnit argument from OffscreenTexture constructor to bindRenderbuffers
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    d196d1d View commit details
    Browse the repository at this point in the history
  48. Per review:

    * Formatting + programs cleanup
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    2b28ff5 View commit details
    Browse the repository at this point in the history
  49. Per review:

    * Program cleanup
    * Rename tileTriangleIndexBuffer to quadTriangleIndexBuffer so as to generalize for reuse + remove extrusionTextureTriangleIndexBuffer
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    42fa99f View commit details
    Browse the repository at this point in the history
  50. Per review:

    * Use Light::Evaluated to initialize FillExtrusionUniforms + FillExtrusionPatternUniforms
    * painter_fill_extrusion.cpp reindentation
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    606924c View commit details
    Browse the repository at this point in the history
  51. Per review:

    * Turn unnecessary lambda fns into regular fns in position.test.cpp
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    ac03d8c View commit details
    Browse the repository at this point in the history
  52. [ios, macos] Added MGLFillExtrusionStyleLayer to projects

    Deleted a copy of MGLFillExtrusionStyleLayerTests.mm that was orphaned in platform/ios/test/. Added the real, auto-generated copy to the iOS project. Added all the files associated with fill extrusion style layers to the macOS project.
    1ec5 authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    8c2d7c1 View commit details
    Browse the repository at this point in the history
  53. [ios, macos] Fixed fill extrusion imports

    Imported MGLFillExtrusionStyleLayer.h into the umbrella header and MGLStyle.mm. Train-cased an mbgl file name.
    1ec5 authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    bf9158c View commit details
    Browse the repository at this point in the history
  54. [ios, macos] Added MGLFillExtrusionStyleLayer example

    Added a code example to MGLFillExtrusionStyleLayer to unbreak the darwin-style-code make target.
    1ec5 authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    a4ff7ed View commit details
    Browse the repository at this point in the history
  55. [ios, macos] Updated changelogs

    Mentioned 3D extrusion in the changelogs.
    1ec5 authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4db2f48 View commit details
    Browse the repository at this point in the history
  56. Per review:

    * Simplify CascadingLightProperty and rename (nothing cascades)
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    681878f View commit details
    Browse the repository at this point in the history
  57. Return early from rings with 0 vertices

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    14a6327 View commit details
    Browse the repository at this point in the history
  58. Per review:

    * Reintroduce cascade params + rework light
    * TODO: rename cascade->? (raw?); potentially add proper value/transition setters/getters
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    ab202aa View commit details
    Browse the repository at this point in the history
  59. Split light.hpp into public and private implementation

    jfirebaugh authored and Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    bad6036 View commit details
    Browse the repository at this point in the history
  60. Review followups

    * Add Map#setLight
    * Add TransitioningLight#hasTransition for transitionable light
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    c99d816 View commit details
    Browse the repository at this point in the history
  61. Review followups

    * Add Map#getLight
    * Don't rename Transitioning (fix compiling error)
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4088d0c View commit details
    Browse the repository at this point in the history
  62. Rebase resolutions:

    * Update mapbox-gl-js
      * According platform-specific generated code updates
    * Update test/style/conversion/light.test.cpp based on Light refactor
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    76d661e View commit details
    Browse the repository at this point in the history
  63. Rebase follow-ups:

    * cmake + shaders prelude missed in last rebase commit (?)
    * tweak tile_cover.test.cpp tile order to account for transform_state changes
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    e7b962c View commit details
    Browse the repository at this point in the history
  64. :thinking_face: don't think these cmake changes are intended

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    01fb6bc View commit details
    Browse the repository at this point in the history
  65. Try offsetting camera options for better-defined tile cover

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    b4829a8 View commit details
    Browse the repository at this point in the history
  66. /s/FillExtrusion/Fill extrusion/ in darwin docs

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    4355ba9 View commit details
    Browse the repository at this point in the history
  67. Manage light as unique_ptr of style

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    2f03838 View commit details
    Browse the repository at this point in the history
  68. Remove debug styles accidentally added

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    d7f03b9 View commit details
    Browse the repository at this point in the history
  69. Return regular ptr from Map#getLight

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    d487445 View commit details
    Browse the repository at this point in the history
  70. Use spherical coordinates for interpolation

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    806734f View commit details
    Browse the repository at this point in the history
  71. Apply changes from 7ddca3b (rebased) for FillExtrusion layers

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    f62e820 View commit details
    Browse the repository at this point in the history
  72. Add DepthComponent24 if supported in GLES extension

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    f7fb7e5 View commit details
    Browse the repository at this point in the history
  73. Use existing getMetersPerPixelAtLatitude projection method

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    c0fa720 View commit details
    Browse the repository at this point in the history
  74. Formatting: indentation

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    82cb69f View commit details
    Browse the repository at this point in the history
  75. Per review: rather than thread Style references throughout render pip…

    …eline, copy evaluatedLight to Painter
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    0bb28cf View commit details
    Browse the repository at this point in the history
  76. Uncomment GLES2 Depth24 preprocessor directive

    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    1b9dee7 View commit details
    Browse the repository at this point in the history
  77. Fall back to using DepthStencil for extrusion texture on GL ES device…

    …s if 24-bit depth component isn't supported
    
    * Simplify: use DEPTH_COMPONENT24 as DepthComponent and remove DepthComponent24, as we'll never use DEPTH_COMPONENT16
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    b52aa9d View commit details
    Browse the repository at this point in the history
  78. Limit near Z fragments to 100 to preserve depth precision in the rest…

    … of the field; give up on 24-bit dreams
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    5a8ef68 View commit details
    Browse the repository at this point in the history
  79. Fix for previous commit: calculate a projection matrix just for the f…

    …ill-extrusion layer with a further near clip plane, and leave the global projection matrix alone
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    72278bf View commit details
    Browse the repository at this point in the history
  80. Simplify OffscreenTexture: use DepthComponent (as defined by preproce…

    …ssor conditional in types.hpp) in all cases
    Lauren Budorick committed Apr 26, 2017
    Configuration menu
    Copy the full SHA
    086fa8d View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. Rebase conflict resolution

    Lauren Budorick committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    764576f View commit details
    Browse the repository at this point in the history
  2. ? redundant style.hpp in cmake

    Lauren Budorick committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    4a749c0 View commit details
    Browse the repository at this point in the history
  3. Store both normal tile matrix + near-clipped matrix in RenderTiles to…

    … avoid setting and re-setting matrix
    Lauren Budorick committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    b22e8aa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    695da93 View commit details
    Browse the repository at this point in the history
  5. Update SHA after merging mapbox/mapbox-gl-js#4519

    Lauren Budorick committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    bf52d28 View commit details
    Browse the repository at this point in the history
  6. Update gl-js SHA

    Lauren Budorick committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    30df15b View commit details
    Browse the repository at this point in the history
  7. Update gl-js SHA

    jfirebaugh committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    b450c4c View commit details
    Browse the repository at this point in the history