Terrain 3D

CHANGELOG.md

@@ -31,6 +31,8 @@
 - *...Add new stuff here...*
 - [core] Draw numbers and short uppercase codes upright in vertical CJK line labels ([#4565](https://github.com/maplibre/maplibre-native/issues/4565)), compat to [maplibre-gl-js#8205](https://github.com/maplibre/maplibre-gl-js/pull/8205).
 - [core] Fix `ImageSource` not rendering across world copies ([#4508](https://github.com/maplibre/maplibre-native/issues/4508)).
+- [core] Honour `tileSize` from a raster/raster-dem source's TileJSON, as maplibre-gl-js does. It was parsed off the wire and discarded, so a style entry that omitted or mis-stated the size tiled at the wrong zoom.
+- [core] Mesh 3D terrain at the tile size the DEM source selects tiles with, not the decoded DEM's pixel dimension. When the two disagreed the mesh covered a shallower zoom than the DEM loaded, every per-tile DEM lookup missed, and the terrain rendered flat off the placeholder DEM.
 - [core] Repaint data-driven symbol paint properties after feature-state updates.
 - [core] Accept alpha values in legacy comma-separated `hsl()` colors ([#4434](https://github.com/maplibre/maplibre-native/issues/4434)).
 - [core] Fix thread-unsafe headless OpenGL display singleton initialization [#4332](https://github.com/maplibre/maplibre-native/pull/4332)

CMakeLists.txt

@@ -184,6 +184,9 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layer_group.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/tile_layer_group.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layer_tweaker.cpp
+    ${PROJECT_SOURCE_DIR}/src/mln/renderer/render_terrain.cpp
+    ${PROJECT_SOURCE_DIR}/src/mln/renderer/dem_elevation_provider.cpp
+    ${PROJECT_SOURCE_DIR}/src/mln/renderer/texture_pool.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/background_layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/background_layer_tweaker.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/circle_layer_tweaker.cpp
@@ -208,6 +211,7 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/raster_layer_tweaker.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/symbol_layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/symbol_layer_tweaker.hpp
+    ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/terrain_layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/collision_layer_tweaker.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/renderer/layers/collision_layer_tweaker.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/shaders/shader_program_base.cpp
@@ -311,6 +315,7 @@ list(APPEND INCLUDE_FILES
     ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/rotation.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/source.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/source_options.hpp
+    ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/terrain.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/tileset.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/conversion/transition_options.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/expression/assertion.hpp
@@ -389,6 +394,8 @@ list(APPEND INCLUDE_FILES
     ${PROJECT_SOURCE_DIR}/include/mln/style/style_property.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/style.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/transition_options.hpp
+    ${PROJECT_SOURCE_DIR}/include/mln/style/terrain.hpp
+    ${PROJECT_SOURCE_DIR}/include/mln/style/terrain_observer.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/types.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/undefined.hpp
     ${PROJECT_SOURCE_DIR}/include/mln/style/variable_anchor_offset_collection.hpp
@@ -679,6 +686,8 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mln/storage/resource_transform.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/storage/response.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/collection.hpp
+    ${PROJECT_SOURCE_DIR}/src/mln/style/terrain.cpp
+    ${PROJECT_SOURCE_DIR}/src/mln/style/terrain_impl.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/color_ramp_property_value.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/constant.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/sprite.cpp
@@ -699,6 +708,7 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/source.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/source_options.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/stringify.hpp
+    ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/terrain.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/tileset.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/conversion/transition_options.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/style/custom_tile_loader.cpp
@@ -985,6 +995,8 @@ list(APPEND SRC_FILES
     ${PROJECT_SOURCE_DIR}/src/mln/util/tile_cover.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/util/tile_cover_impl.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/util/tile_cover_impl.hpp
+    ${PROJECT_SOURCE_DIR}/src/mln/util/tile_lod.cpp
+    ${PROJECT_SOURCE_DIR}/src/mln/util/tile_lod.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/util/tile_range.hpp
     ${PROJECT_SOURCE_DIR}/src/mln/util/default_style.cpp
     ${PROJECT_SOURCE_DIR}/src/mln/util/tile_server_options.cpp