core: Update Hillshade Algorithms and add Color-Relief Layer support (#3965)

This commit is contained in:
Andrew Calcutt
2026-02-25 20:50:06 -05:00
committed by GitHub
parent 9682e09ae4
commit 369af13ead
187 changed files with 8804 additions and 2352 deletions

View File

@@ -23,6 +23,7 @@ MLN_PUBLIC_GENERATED_STYLE_HEADERS = [
"include/mbgl/style/layers/fill_extrusion_layer.hpp",
"include/mbgl/style/layers/raster_layer.hpp",
"include/mbgl/style/layers/hillshade_layer.hpp",
"include/mbgl/style/layers/color_relief_layer.hpp",
"include/mbgl/style/layers/background_layer.hpp",
"include/mbgl/style/layers/location_indicator_layer.hpp",
"include/mbgl/style/light.hpp",
@@ -37,6 +38,7 @@ MLN_PRIVATE_GENERATED_STYLE_HEADERS = [
"src/mbgl/style/layers/fill_extrusion_layer_properties.hpp",
"src/mbgl/style/layers/raster_layer_properties.hpp",
"src/mbgl/style/layers/hillshade_layer_properties.hpp",
"src/mbgl/style/layers/color_relief_layer_properties.hpp",
"src/mbgl/style/layers/background_layer_properties.hpp",
"src/mbgl/style/layers/location_indicator_layer_properties.hpp",
]
@@ -58,6 +60,8 @@ MLN_GENERATED_STYLE_SOURCE = [
"src/mbgl/style/layers/raster_layer.cpp",
"src/mbgl/style/layers/hillshade_layer_properties.cpp",
"src/mbgl/style/layers/hillshade_layer.cpp",
"src/mbgl/style/layers/color_relief_layer_properties.cpp",
"src/mbgl/style/layers/color_relief_layer.cpp",
"src/mbgl/style/layers/background_layer_properties.cpp",
"src/mbgl/style/layers/background_layer.cpp",
"src/mbgl/style/layers/location_indicator_layer_properties.cpp",
@@ -95,6 +99,7 @@ MLN_GENERATED_OPENGL_SHADER_HEADERS = [
"include/mbgl/shaders/gl/heatmap_texture.hpp",
"include/mbgl/shaders/gl/hillshade_prepare.hpp",
"include/mbgl/shaders/gl/hillshade.hpp",
"include/mbgl/shaders/gl/color_relief.hpp",
"include/mbgl/shaders/gl/line_gradient.hpp",
"include/mbgl/shaders/gl/line_pattern.hpp",
"include/mbgl/shaders/gl/line_sdf.hpp",
@@ -161,6 +166,7 @@ MLN_CORE_SOURCE = [
"src/mbgl/layermanager/fill_layer_factory.cpp",
"src/mbgl/layermanager/heatmap_layer_factory.cpp",
"src/mbgl/layermanager/hillshade_layer_factory.cpp",
"src/mbgl/layermanager/color_relief_layer_factory.cpp",
"src/mbgl/layermanager/layer_factory.cpp",
"src/mbgl/layermanager/layer_manager.cpp",
"src/mbgl/layermanager/line_layer_factory.cpp",
@@ -237,6 +243,8 @@ MLN_CORE_SOURCE = [
"src/mbgl/renderer/layers/render_heatmap_layer.hpp",
"src/mbgl/renderer/layers/render_hillshade_layer.cpp",
"src/mbgl/renderer/layers/render_hillshade_layer.hpp",
"src/mbgl/renderer/layers/render_color_relief_layer.cpp",
"src/mbgl/renderer/layers/render_color_relief_layer.hpp",
"src/mbgl/renderer/layers/render_line_layer.cpp",
"src/mbgl/renderer/layers/render_line_layer.hpp",
"src/mbgl/renderer/layers/render_location_indicator_layer.cpp",
@@ -336,6 +344,7 @@ MLN_CORE_SOURCE = [
"src/mbgl/style/conversion/light.cpp",
"src/mbgl/style/conversion/position.cpp",
"src/mbgl/style/conversion/property_value.cpp",
"src/mbgl/style/conversion/hillshade_conversions.cpp",
"src/mbgl/style/conversion/rotation.cpp",
"src/mbgl/style/conversion/source.cpp",
"src/mbgl/style/conversion/source_options.cpp",
@@ -409,6 +418,8 @@ MLN_CORE_SOURCE = [
"src/mbgl/style/layers/heatmap_layer_impl.hpp",
"src/mbgl/style/layers/hillshade_layer_impl.cpp",
"src/mbgl/style/layers/hillshade_layer_impl.hpp",
"src/mbgl/style/layers/color_relief_layer_impl.cpp",
"src/mbgl/style/layers/color_relief_layer_impl.hpp",
"src/mbgl/style/layers/line_layer_impl.cpp",
"src/mbgl/style/layers/line_layer_impl.hpp",
"src/mbgl/style/layers/location_indicator_layer_impl.cpp",
@@ -652,6 +663,7 @@ MLN_CORE_HEADERS = [
"include/mbgl/layermanager/fill_layer_factory.hpp",
"include/mbgl/layermanager/heatmap_layer_factory.hpp",
"include/mbgl/layermanager/hillshade_layer_factory.hpp",
"include/mbgl/layermanager/color_relief_layer_factory.hpp",
"include/mbgl/layermanager/layer_factory.hpp",
"include/mbgl/layermanager/layer_manager.hpp",
"include/mbgl/layermanager/line_layer_factory.hpp",
@@ -912,6 +924,7 @@ MLN_DRAWABLES_SOURCE = [
"src/mbgl/gfx/dynamic_texture_atlas.cpp",
"src/mbgl/gfx/gpu_expression.cpp",
"src/mbgl/gfx/hillshade_prepare_drawable_data.hpp",
"src/mbgl/gfx/color_relief_drawable_data.hpp",
"src/mbgl/gfx/image_drawable_data.hpp",
"src/mbgl/gfx/line_drawable_data.hpp",
"src/mbgl/gfx/symbol_drawable_data.hpp",
@@ -927,6 +940,8 @@ MLN_DRAWABLES_SOURCE = [
"src/mbgl/renderer/layers/background_layer_tweaker.hpp",
"src/mbgl/renderer/layers/circle_layer_tweaker.cpp",
"src/mbgl/renderer/layers/circle_layer_tweaker.hpp",
"src/mbgl/renderer/layers/color_relief_layer_tweaker.cpp",
"src/mbgl/renderer/layers/color_relief_layer_tweaker.hpp",
"src/mbgl/renderer/layers/fill_layer_tweaker.cpp",
"src/mbgl/renderer/layers/fill_layer_tweaker.hpp",
"src/mbgl/renderer/layers/fill_extrusion_layer_tweaker.cpp",
@@ -987,6 +1002,7 @@ MLN_DRAWABLES_HEADERS = [
"include/mbgl/shaders/heatmap_layer_ubo.hpp",
"include/mbgl/shaders/heatmap_texture_layer_ubo.hpp",
"include/mbgl/shaders/hillshade_layer_ubo.hpp",
"include/mbgl/shaders/color_relief_layer_ubo.hpp",
"include/mbgl/shaders/hillshade_prepare_layer_ubo.hpp",
"include/mbgl/shaders/layer_ubo.hpp",
"include/mbgl/shaders/line_layer_ubo.hpp",
@@ -1063,6 +1079,7 @@ MLN_DRAWABLES_MTL_SOURCE = [
"src/mbgl/shaders/mtl/heatmap_texture.cpp",
"src/mbgl/shaders/mtl/hillshade.cpp",
"src/mbgl/shaders/mtl/hillshade_prepare.cpp",
"src/mbgl/shaders/mtl/color_relief.cpp",
"src/mbgl/shaders/mtl/line.cpp",
"src/mbgl/shaders/mtl/location_indicator.cpp",
"src/mbgl/shaders/mtl/raster.cpp",
@@ -1105,6 +1122,7 @@ MLN_DRAWABLES_MTL_HEADERS = [
"include/mbgl/shaders/mtl/heatmap_texture.hpp",
"include/mbgl/shaders/mtl/hillshade.hpp",
"include/mbgl/shaders/mtl/hillshade_prepare.hpp",
"include/mbgl/shaders/mtl/color_relief.hpp",
"include/mbgl/shaders/mtl/line.hpp",
"include/mbgl/shaders/mtl/location_indicator.hpp",
"include/mbgl/shaders/mtl/raster.hpp",
@@ -1150,6 +1168,7 @@ MLN_DRAWABLES_WEBGPU_SOURCE = [
"src/mbgl/shaders/webgpu/heatmap_texture.cpp",
"src/mbgl/shaders/webgpu/hillshade.cpp",
"src/mbgl/shaders/webgpu/hillshade_prepare.cpp",
"src/mbgl/shaders/webgpu/color_relief.cpp",
"src/mbgl/shaders/webgpu/line.cpp",
"src/mbgl/shaders/webgpu/location_indicator.cpp",
"src/mbgl/shaders/webgpu/raster.cpp",
@@ -1192,6 +1211,7 @@ MLN_DRAWABLES_WEBGPU_HEADERS = [
"include/mbgl/shaders/webgpu/heatmap_texture.hpp",
"include/mbgl/shaders/webgpu/hillshade.hpp",
"include/mbgl/shaders/webgpu/hillshade_prepare.hpp",
"include/mbgl/shaders/webgpu/color_relief.hpp",
"include/mbgl/shaders/webgpu/line.hpp",
"include/mbgl/shaders/webgpu/location_indicator.hpp",
"include/mbgl/shaders/webgpu/raster.hpp",