@antv/l7-layers 2.20.5 → 2.20.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/canvas/index.d.ts +3 -3
- package/es/citybuliding/models/build.d.ts +7 -12
- package/es/citybuliding/models/build.js +22 -11
- package/es/citybuliding/shaders/build_frag.glsl +26 -23
- package/es/citybuliding/shaders/build_vert.glsl +24 -16
- package/es/core/BaseLayer.d.ts +14 -2
- package/es/core/BaseLayer.js +53 -9
- package/es/core/BaseModel.d.ts +1 -1
- package/es/core/BaseModel.js +41 -15
- package/es/core/CommonStyleAttribute.d.ts +4 -2
- package/es/core/CommonStyleAttribute.js +3 -0
- package/es/core/LayerPickService.d.ts +1 -1
- package/es/core/TextureService.d.ts +2 -2
- package/es/core/interface.d.ts +7 -3
- package/es/core/interface.js +0 -1
- package/es/core/line_trangluation.d.ts +1 -1
- package/es/core/shape/arrow.d.ts +1 -1
- package/es/core/shape/extrude.d.ts +1 -1
- package/es/core/triangulation.d.ts +1 -1
- package/es/core/triangulation.js +13 -7
- package/es/core/utils.js +1 -1
- package/es/earth/index.d.ts +1 -1
- package/es/earth/models/atmosphere.d.ts +8 -2
- package/es/earth/models/atmosphere.js +15 -8
- package/es/earth/models/base.d.ts +8 -2
- package/es/earth/models/base.js +21 -12
- package/es/earth/models/bloomsphere.d.ts +8 -2
- package/es/earth/models/bloomsphere.js +15 -8
- package/es/earth/shaders/{atmosphere_frag.glsl → atmosphere/atmosphere_frag.glsl} +9 -6
- package/es/earth/shaders/atmosphere/atmosphere_vert.glsl +22 -0
- package/es/earth/shaders/base/base_frag.glsl +11 -0
- package/es/earth/shaders/base/base_vert.glsl +52 -0
- package/es/earth/shaders/bloomshpere/bloomsphere_frag.glsl +16 -0
- package/es/earth/shaders/bloomshpere/bloomsphere_vert.glsl +19 -0
- package/es/geometry/index.d.ts +2 -2
- package/es/geometry/models/billboard.d.ts +8 -1
- package/es/geometry/models/billboard.js +26 -11
- package/es/geometry/models/plane.d.ts +8 -1
- package/es/geometry/models/plane.js +23 -6
- package/es/geometry/models/sprite.d.ts +12 -2
- package/es/geometry/models/sprite.js +44 -18
- package/es/geometry/shaders/billboard_frag.glsl +11 -6
- package/es/geometry/shaders/billboard_vert.glsl +12 -15
- package/es/geometry/shaders/plane_frag.glsl +14 -10
- package/es/geometry/shaders/plane_vert.glsl +11 -10
- package/es/geometry/shaders/sprite_frag.glsl +11 -7
- package/es/geometry/shaders/sprite_vert.glsl +10 -9
- package/es/heatmap/index.d.ts +3 -3
- package/es/heatmap/models/grid.d.ts +8 -1
- package/es/heatmap/models/grid.js +25 -12
- package/es/heatmap/models/grid3d.d.ts +8 -1
- package/es/heatmap/models/grid3d.js +29 -13
- package/es/heatmap/models/heatmap.d.ts +6 -4
- package/es/heatmap/models/heatmap.js +123 -75
- package/es/heatmap/models/hexagon.d.ts +8 -1
- package/es/heatmap/models/hexagon.js +25 -12
- package/es/heatmap/shaders/grid/grid_frag.glsl +8 -0
- package/es/heatmap/shaders/{grid_vert.glsl → grid/grid_vert.glsl} +15 -15
- package/es/heatmap/shaders/grid3d/grid_3d_frag.glsl +8 -0
- package/{lib/heatmap/shaders/hexagon_3d_vert.glsl → es/heatmap/shaders/grid3d/grid_3d_vert.glsl} +13 -16
- package/es/heatmap/shaders/heatmap/heatmap_3d_frag.glsl +24 -0
- package/es/heatmap/shaders/{heatmap_3d_vert.glsl → heatmap/heatmap_3d_vert.glsl} +19 -9
- package/es/heatmap/shaders/heatmap/heatmap_frag.glsl +52 -0
- package/es/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl +16 -0
- package/{lib/heatmap/shaders → es/heatmap/shaders/heatmap}/heatmap_framebuffer_vert.glsl +14 -9
- package/es/heatmap/shaders/heatmap/heatmap_vert.glsl +19 -0
- package/es/heatmap/shaders/hexagon/hexagon_frag.glsl +8 -0
- package/es/heatmap/shaders/{hexagon_vert.glsl → hexagon/hexagon_vert.glsl} +12 -13
- package/es/image/index.d.ts +2 -2
- package/es/image/models/image.d.ts +9 -2
- package/es/image/models/image.js +83 -44
- package/es/image/shaders/image_frag.glsl +34 -7
- package/es/image/shaders/image_vert.glsl +11 -5
- package/es/line/index.d.ts +4 -4
- package/es/line/index.js +2 -1
- package/es/line/models/arc.d.ts +8 -3
- package/es/line/models/arc.js +57 -76
- package/es/line/models/arc_3d.d.ts +8 -3
- package/es/line/models/arc_3d.js +46 -57
- package/es/line/models/flow.d.ts +8 -2
- package/es/line/models/flow.js +14 -12
- package/es/line/models/great_circle.d.ts +8 -3
- package/es/line/models/great_circle.js +40 -29
- package/es/line/models/index.d.ts +1 -1
- package/es/line/models/index.js +3 -6
- package/es/line/models/line.d.ts +8 -3
- package/es/line/models/line.js +67 -140
- package/es/line/models/{simpleLine.d.ts → simple_line.d.ts} +8 -2
- package/es/line/models/simple_line.js +204 -0
- package/es/line/models/wall.d.ts +8 -3
- package/es/line/models/wall.js +35 -27
- package/es/line/shaders/{line_arc_frag.glsl → arc/line_arc_frag.glsl} +36 -26
- package/es/line/shaders/{line_arc_vert.glsl → arc/line_arc_vert.glsl} +52 -22
- package/es/line/shaders/{line_arc_3d_frag.glsl → arc3d/line_arc_3d_frag.glsl} +32 -24
- package/{lib/line/shaders → es/line/shaders/arc3d}/line_arc_3d_vert.glsl +37 -27
- package/es/line/shaders/flow/flow_line_frag.glsl +5 -4
- package/es/line/shaders/flow/flow_line_vert.glsl +17 -18
- package/es/line/shaders/{line_arc_great_circle_frag.glsl → greatCircle/line_arc_great_circle_frag.glsl} +30 -30
- package/{lib/line/shaders → es/line/shaders/greatCircle}/line_arc_great_circle_vert.glsl +43 -40
- package/es/line/shaders/{line_frag.glsl → line/line_frag.glsl} +55 -28
- package/es/line/shaders/line/line_vert.glsl +114 -0
- package/es/line/shaders/simple/simpleline_frag.glsl +27 -3
- package/es/line/shaders/simple/simpleline_vert.glsl +20 -20
- package/es/line/shaders/wall/wall_frag.glsl +31 -26
- package/es/line/shaders/wall/wall_vert.glsl +29 -22
- package/es/mask/index.d.ts +2 -2
- package/es/mask/models/fill.d.ts +1 -1
- package/es/plugins/DataMappingPlugin.d.ts +1 -1
- package/es/plugins/DataMappingPlugin.js +1 -3
- package/es/plugins/DataSourcePlugin.d.ts +1 -1
- package/es/plugins/FeatureScalePlugin.d.ts +1 -1
- package/es/plugins/FeatureScalePlugin.js +14 -3
- package/es/plugins/LayerAnimateStylePlugin.d.ts +1 -1
- package/es/plugins/LayerMaskPlugin.d.ts +1 -1
- package/es/plugins/LayerModelPlugin.d.ts +1 -1
- package/es/plugins/LayerStylePlugin.d.ts +1 -1
- package/es/plugins/LightingPlugin.d.ts +1 -1
- package/es/plugins/MultiPassRendererPlugin.d.ts +1 -1
- package/es/plugins/PixelPickingPlugin.d.ts +6 -2
- package/es/plugins/PixelPickingPlugin.js +36 -49
- package/es/plugins/RegisterStyleAttributePlugin.d.ts +1 -1
- package/es/plugins/ShaderUniformPlugin.d.ts +1 -1
- package/es/plugins/ShaderUniformPlugin.js +11 -6
- package/es/plugins/UpdateModelPlugin.d.ts +1 -1
- package/es/plugins/UpdateStyleAttributePlugin.d.ts +1 -1
- package/es/point/index.d.ts +2 -2
- package/es/point/index.js +1 -0
- package/es/point/models/billboard_point.d.ts +9 -3
- package/es/point/models/billboard_point.js +18 -18
- package/es/point/models/earthExtrude.d.ts +7 -12
- package/es/point/models/earthExtrude.js +21 -13
- package/es/point/models/earthFill.d.ts +8 -3
- package/es/point/models/earthFill.js +18 -30
- package/es/point/models/extrude.d.ts +1 -4
- package/es/point/models/extrude.js +2 -11
- package/es/point/models/fill.d.ts +8 -2
- package/es/point/models/fill.js +33 -84
- package/es/point/models/{fillmage.d.ts → fillImage.d.ts} +8 -2
- package/es/point/models/{fillmage.js → fillImage.js} +23 -15
- package/es/point/models/image.d.ts +8 -1
- package/es/point/models/image.js +31 -17
- package/es/point/models/index.js +1 -1
- package/es/point/models/normal.d.ts +9 -3
- package/es/point/models/normal.js +13 -30
- package/es/point/models/radar.d.ts +8 -2
- package/es/point/models/radar.js +23 -45
- package/es/point/models/text.d.ts +9 -2
- package/es/point/models/text.js +31 -32
- package/{lib/point/shaders → es/point/shaders/billboard}/billboard_point_frag.glsl +17 -13
- package/{lib/point/shaders → es/point/shaders/billboard}/billboard_point_vert.glsl +13 -14
- package/es/point/shaders/earthExtrude/earthExtrude_frag.glsl +36 -0
- package/{lib/point/shaders/earth/extrude_vert.glsl → es/point/shaders/earthExtrude/earthExtrude_vert.glsl} +25 -22
- package/{lib/point/shaders/earth/fill_frag.glsl → es/point/shaders/earthFill/earthFill_frag.glsl} +20 -18
- package/{lib/point/shaders/earth/fill_vert.glsl → es/point/shaders/earthFill/earthFill_vert.glsl} +17 -22
- package/es/point/shaders/extrude/extrude_vert.glsl +0 -3
- package/{lib/point/shaders → es/point/shaders/fill}/fill_frag.glsl +18 -1
- package/es/point/shaders/{fill_vert.glsl → fill/fill_vert.glsl} +5 -4
- package/es/point/shaders/fillImage/fillImage_frag.glsl +24 -0
- package/{lib/point/shaders/image → es/point/shaders/fillImage}/fillImage_vert.glsl +15 -17
- package/es/point/shaders/image/image_frag.glsl +42 -0
- package/{lib/point/shaders → es/point/shaders/image}/image_vert.glsl +14 -13
- package/es/point/shaders/radar/radar_frag.glsl +19 -14
- package/es/point/shaders/radar/radar_vert.glsl +21 -24
- package/es/point/shaders/text/text_frag.glsl +44 -0
- package/es/point/shaders/{text_vert.glsl → text/text_vert.glsl} +19 -17
- package/es/point/shape/extrude.d.ts +1 -1
- package/es/polygon/index.d.ts +2 -2
- package/es/polygon/models/extrude.d.ts +9 -9
- package/es/polygon/models/extrude.js +38 -15
- package/es/polygon/models/extrusion.d.ts +8 -1
- package/es/polygon/models/extrusion.js +24 -7
- package/es/polygon/models/fill.d.ts +9 -4
- package/es/polygon/models/fill.js +26 -13
- package/es/polygon/models/ocean.d.ts +9 -7
- package/es/polygon/models/ocean.js +30 -14
- package/es/polygon/models/water.d.ts +9 -4
- package/es/polygon/models/water.js +26 -10
- package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl +14 -14
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +17 -15
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +18 -18
- package/es/polygon/shaders/extrude/polygon_extrude_vert.glsl +18 -24
- package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +19 -15
- package/es/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +20 -24
- package/es/polygon/shaders/extrusion/polygon_extrusion_frag.glsl +4 -8
- package/es/polygon/shaders/extrusion/polygon_extrusion_vert.glsl +7 -16
- package/es/polygon/shaders/fill/fill_frag.glsl +7 -0
- package/es/polygon/shaders/fill/fill_linear_frag.glsl +20 -0
- package/{lib/polygon/shaders/polygon_linear_vert.glsl → es/polygon/shaders/fill/fill_linear_vert.glsl} +12 -11
- package/es/polygon/shaders/{polygon_vert.glsl → fill/fill_vert.glsl} +6 -6
- package/es/polygon/shaders/{water/polygon_ocean_frag.glsl → ocean/ocean_frag.glsl} +13 -13
- package/es/polygon/shaders/ocean/ocean_vert.glsl +22 -0
- package/es/polygon/shaders/water/polygon_water_frag.glsl +14 -12
- package/es/polygon/shaders/water/polygon_water_vert.glsl +10 -10
- package/es/raster/buffers/triangulation.d.ts +1 -1
- package/es/raster/index.d.ts +2 -2
- package/es/raster/models/raster.d.ts +9 -8
- package/es/raster/models/raster.js +54 -38
- package/es/raster/models/rasterRgb.d.ts +9 -7
- package/es/raster/models/rasterRgb.js +36 -19
- package/es/raster/models/rasterTerrainRgb.d.ts +1 -1
- package/es/raster/models/rasterTerrainRgb.js +2 -2
- package/es/raster/shaders/raster/raster_2d_frag.glsl +34 -0
- package/es/raster/shaders/raster/raster_2d_vert.glsl +21 -0
- package/es/raster/shaders/rgb/raster_rgb_frag.glsl +26 -0
- package/es/raster/shaders/rgb/raster_rgb_vert.glsl +21 -0
- package/es/tile/core/BaseLayer.d.ts +2 -2
- package/es/tile/core/TileDebugLayer.d.ts +1 -1
- package/es/tile/interaction/getRasterData.d.ts +2 -2
- package/es/tile/interaction/utils.d.ts +1 -1
- package/es/tile/interface.d.ts +2 -2
- package/es/tile/service/TileLayerService.d.ts +2 -2
- package/es/tile/service/TilePickService.d.ts +2 -2
- package/es/tile/service/TileSourceService.d.ts +1 -1
- package/es/tile/tile/Tile.d.ts +2 -3
- package/es/tile/tile/VectorTile.d.ts +1 -1
- package/es/tile/tile/index.d.ts +1 -1
- package/es/tile/utils/constants.js +1 -1
- package/es/tile/utils/utils.d.ts +1 -1
- package/es/utils/blend.d.ts +1 -1
- package/es/utils/multiPassRender.d.ts +1 -1
- package/es/utils/stencil.d.ts +1 -1
- package/es/wind/index.d.ts +3 -3
- package/es/wind/models/wind.d.ts +1 -1
- package/lib/citybuliding/models/build.js +22 -11
- package/lib/citybuliding/shaders/build_frag.glsl +26 -23
- package/lib/citybuliding/shaders/build_vert.glsl +24 -16
- package/lib/core/BaseLayer.js +53 -9
- package/lib/core/BaseModel.js +41 -15
- package/lib/core/CommonStyleAttribute.js +3 -0
- package/lib/core/triangulation.js +12 -6
- package/lib/core/utils.js +1 -1
- package/lib/earth/models/atmosphere.js +15 -8
- package/lib/earth/models/base.js +21 -12
- package/lib/earth/models/bloomsphere.js +15 -8
- package/lib/earth/shaders/{atmosphere_frag.glsl → atmosphere/atmosphere_frag.glsl} +9 -6
- package/lib/earth/shaders/atmosphere/atmosphere_vert.glsl +22 -0
- package/lib/earth/shaders/base/base_frag.glsl +11 -0
- package/lib/earth/shaders/base/base_vert.glsl +52 -0
- package/lib/earth/shaders/bloomshpere/bloomsphere_frag.glsl +16 -0
- package/lib/earth/shaders/bloomshpere/bloomsphere_vert.glsl +19 -0
- package/lib/geometry/models/billboard.js +26 -11
- package/lib/geometry/models/plane.js +23 -6
- package/lib/geometry/models/sprite.js +44 -18
- package/lib/geometry/shaders/billboard_frag.glsl +11 -6
- package/lib/geometry/shaders/billboard_vert.glsl +12 -15
- package/lib/geometry/shaders/plane_frag.glsl +14 -10
- package/lib/geometry/shaders/plane_vert.glsl +11 -10
- package/lib/geometry/shaders/sprite_frag.glsl +11 -7
- package/lib/geometry/shaders/sprite_vert.glsl +10 -9
- package/lib/heatmap/models/grid.js +25 -12
- package/lib/heatmap/models/grid3d.js +29 -13
- package/lib/heatmap/models/heatmap.js +122 -74
- package/lib/heatmap/models/hexagon.js +25 -12
- package/lib/heatmap/shaders/grid/grid_frag.glsl +8 -0
- package/lib/heatmap/shaders/{grid_vert.glsl → grid/grid_vert.glsl} +15 -15
- package/lib/heatmap/shaders/grid3d/grid_3d_frag.glsl +8 -0
- package/{es/heatmap/shaders/hexagon_3d_vert.glsl → lib/heatmap/shaders/grid3d/grid_3d_vert.glsl} +13 -16
- package/lib/heatmap/shaders/heatmap/heatmap_3d_frag.glsl +24 -0
- package/lib/heatmap/shaders/{heatmap_3d_vert.glsl → heatmap/heatmap_3d_vert.glsl} +19 -9
- package/lib/heatmap/shaders/heatmap/heatmap_frag.glsl +52 -0
- package/lib/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl +16 -0
- package/{es/heatmap/shaders → lib/heatmap/shaders/heatmap}/heatmap_framebuffer_vert.glsl +14 -9
- package/lib/heatmap/shaders/heatmap/heatmap_vert.glsl +19 -0
- package/lib/heatmap/shaders/hexagon/hexagon_frag.glsl +8 -0
- package/lib/heatmap/shaders/{hexagon_vert.glsl → hexagon/hexagon_vert.glsl} +12 -13
- package/lib/image/models/image.js +83 -44
- package/lib/image/shaders/image_frag.glsl +34 -7
- package/lib/image/shaders/image_vert.glsl +11 -5
- package/lib/line/index.js +2 -1
- package/lib/line/models/arc.js +57 -76
- package/lib/line/models/arc_3d.js +47 -59
- package/lib/line/models/flow.js +14 -12
- package/lib/line/models/great_circle.js +40 -29
- package/lib/line/models/index.js +4 -7
- package/lib/line/models/line.js +67 -142
- package/lib/line/models/{simpleLine.js → simple_line.js} +84 -74
- package/lib/line/models/wall.js +35 -27
- package/lib/line/shaders/{line_arc_frag.glsl → arc/line_arc_frag.glsl} +36 -26
- package/lib/line/shaders/{line_arc_vert.glsl → arc/line_arc_vert.glsl} +52 -22
- package/lib/line/shaders/{line_arc_3d_frag.glsl → arc3d/line_arc_3d_frag.glsl} +32 -24
- package/{es/line/shaders → lib/line/shaders/arc3d}/line_arc_3d_vert.glsl +37 -27
- package/lib/line/shaders/flow/flow_line_frag.glsl +5 -4
- package/lib/line/shaders/flow/flow_line_vert.glsl +17 -18
- package/lib/line/shaders/{line_arc_great_circle_frag.glsl → greatCircle/line_arc_great_circle_frag.glsl} +30 -30
- package/{es/line/shaders → lib/line/shaders/greatCircle}/line_arc_great_circle_vert.glsl +43 -40
- package/lib/line/shaders/{line_frag.glsl → line/line_frag.glsl} +55 -28
- package/lib/line/shaders/line/line_vert.glsl +114 -0
- package/lib/line/shaders/simple/simpleline_frag.glsl +27 -3
- package/lib/line/shaders/simple/simpleline_vert.glsl +20 -20
- package/lib/line/shaders/wall/wall_frag.glsl +31 -26
- package/lib/line/shaders/wall/wall_vert.glsl +29 -22
- package/lib/plugins/DataMappingPlugin.js +1 -3
- package/lib/plugins/FeatureScalePlugin.js +14 -3
- package/lib/plugins/PixelPickingPlugin.js +35 -48
- package/lib/plugins/ShaderUniformPlugin.js +11 -6
- package/lib/point/index.js +1 -0
- package/lib/point/models/billboard_point.js +18 -18
- package/lib/point/models/earthExtrude.js +21 -13
- package/lib/point/models/earthFill.js +18 -30
- package/lib/point/models/extrude.js +2 -11
- package/lib/point/models/fill.js +33 -84
- package/lib/point/models/{fillmage.js → fillImage.js} +24 -17
- package/lib/point/models/image.js +31 -17
- package/lib/point/models/index.js +2 -2
- package/lib/point/models/normal.js +13 -30
- package/lib/point/models/radar.js +23 -45
- package/lib/point/models/text.js +31 -32
- package/{es/point/shaders → lib/point/shaders/billboard}/billboard_point_frag.glsl +17 -13
- package/{es/point/shaders → lib/point/shaders/billboard}/billboard_point_vert.glsl +13 -14
- package/lib/point/shaders/earthExtrude/earthExtrude_frag.glsl +36 -0
- package/{es/point/shaders/earth/extrude_vert.glsl → lib/point/shaders/earthExtrude/earthExtrude_vert.glsl} +25 -22
- package/{es/point/shaders/earth/fill_frag.glsl → lib/point/shaders/earthFill/earthFill_frag.glsl} +20 -18
- package/{es/point/shaders/earth/fill_vert.glsl → lib/point/shaders/earthFill/earthFill_vert.glsl} +17 -22
- package/lib/point/shaders/extrude/extrude_vert.glsl +0 -3
- package/{es/point/shaders → lib/point/shaders/fill}/fill_frag.glsl +18 -1
- package/lib/point/shaders/{fill_vert.glsl → fill/fill_vert.glsl} +5 -4
- package/lib/point/shaders/fillImage/fillImage_frag.glsl +24 -0
- package/{es/point/shaders/image → lib/point/shaders/fillImage}/fillImage_vert.glsl +15 -17
- package/lib/point/shaders/image/image_frag.glsl +42 -0
- package/{es/point/shaders → lib/point/shaders/image}/image_vert.glsl +14 -13
- package/lib/point/shaders/radar/radar_frag.glsl +19 -14
- package/lib/point/shaders/radar/radar_vert.glsl +21 -24
- package/lib/point/shaders/text/text_frag.glsl +44 -0
- package/lib/point/shaders/{text_vert.glsl → text/text_vert.glsl} +19 -17
- package/lib/polygon/models/extrude.js +38 -15
- package/lib/polygon/models/extrusion.js +24 -7
- package/lib/polygon/models/fill.js +26 -13
- package/lib/polygon/models/ocean.js +30 -14
- package/lib/polygon/models/water.js +26 -10
- package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl +14 -14
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +17 -15
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +18 -18
- package/lib/polygon/shaders/extrude/polygon_extrude_vert.glsl +18 -24
- package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +19 -15
- package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +20 -24
- package/lib/polygon/shaders/extrusion/polygon_extrusion_frag.glsl +4 -8
- package/lib/polygon/shaders/extrusion/polygon_extrusion_vert.glsl +7 -16
- package/lib/polygon/shaders/fill/fill_frag.glsl +7 -0
- package/lib/polygon/shaders/fill/fill_linear_frag.glsl +20 -0
- package/{es/polygon/shaders/polygon_linear_vert.glsl → lib/polygon/shaders/fill/fill_linear_vert.glsl} +12 -11
- package/lib/polygon/shaders/{polygon_vert.glsl → fill/fill_vert.glsl} +6 -6
- package/lib/polygon/shaders/{water/polygon_ocean_frag.glsl → ocean/ocean_frag.glsl} +13 -13
- package/lib/polygon/shaders/ocean/ocean_vert.glsl +22 -0
- package/lib/polygon/shaders/water/polygon_water_frag.glsl +14 -12
- package/lib/polygon/shaders/water/polygon_water_vert.glsl +10 -10
- package/lib/raster/models/raster.js +54 -38
- package/lib/raster/models/rasterRgb.js +36 -19
- package/lib/raster/models/rasterTerrainRgb.js +2 -2
- package/lib/raster/shaders/raster/raster_2d_frag.glsl +34 -0
- package/lib/raster/shaders/raster/raster_2d_vert.glsl +21 -0
- package/lib/raster/shaders/rgb/raster_rgb_frag.glsl +26 -0
- package/lib/raster/shaders/rgb/raster_rgb_vert.glsl +21 -0
- package/lib/tile/utils/constants.js +1 -1
- package/package.json +7 -7
- package/es/earth/shaders/atmosphere_vert.glsl +0 -26
- package/es/earth/shaders/base_frag.glsl +0 -13
- package/es/earth/shaders/base_vert.glsl +0 -52
- package/es/earth/shaders/bloomsphere_frag.glsl +0 -15
- package/es/earth/shaders/bloomsphere_vert.glsl +0 -20
- package/es/heatmap/shaders/heatmap_3d_frag.glsl +0 -14
- package/es/heatmap/shaders/heatmap_frag.glsl +0 -47
- package/es/heatmap/shaders/heatmap_framebuffer_frag.glsl +0 -10
- package/es/heatmap/shaders/heatmap_vert.glsl +0 -10
- package/es/heatmap/shaders/hexagon_frag.glsl +0 -12
- package/es/line/models/earthArc_3d.d.ts +0 -17
- package/es/line/models/earthArc_3d.js +0 -285
- package/es/line/models/linearline.d.ts +0 -11
- package/es/line/models/linearline.js +0 -241
- package/es/line/models/simpleLine.js +0 -194
- package/es/line/shaders/arc_chunks.vert.glsl +0 -21
- package/es/line/shaders/dash/arc_dash_frag.glsl +0 -21
- package/es/line/shaders/dash/arc_dash_vert.glsl +0 -102
- package/es/line/shaders/dash/line_dash_frag.glsl +0 -27
- package/es/line/shaders/dash/line_dash_vert.glsl +0 -82
- package/es/line/shaders/line_arc2d_vert.glsl +0 -114
- package/es/line/shaders/line_bezier_vert.glsl +0 -85
- package/es/line/shaders/line_vert.glsl +0 -165
- package/es/line/shaders/linear/arc3d_linear_frag.glsl +0 -32
- package/es/line/shaders/linear/arc3d_linear_vert.glsl +0 -161
- package/es/line/shaders/linear/arc_linear_frag.glsl +0 -10
- package/es/line/shaders/linear/arc_linear_vert.glsl +0 -98
- package/es/line/shaders/linear/line_linear_frag.glsl +0 -25
- package/es/line/shaders/linearLine/line_linear_frag.glsl +0 -8
- package/es/line/shaders/linearLine/line_linear_vert.glsl +0 -93
- package/es/line/shaders/simple/simpleline_linear_frag.glsl +0 -8
- package/es/point/shaders/animate/wave_frag.glsl +0 -55
- package/es/point/shaders/earth/extrude_frag.glsl +0 -32
- package/es/point/shaders/image/fillImage_frag.glsl +0 -18
- package/es/point/shaders/image_frag.glsl +0 -37
- package/es/point/shaders/text_frag.glsl +0 -39
- package/es/polygon/shaders/polygon_frag.glsl +0 -7
- package/es/polygon/shaders/polygon_linear_frag.glsl +0 -15
- package/es/polygon/shaders/water/polygon_ocean_vert.glsl +0 -16
- package/es/raster/shaders/raster_2d_frag.glsl +0 -32
- package/es/raster/shaders/raster_2d_vert.glsl +0 -13
- package/es/raster/shaders/raster_frag.glsl +0 -11
- package/es/raster/shaders/raster_rgb_frag.glsl +0 -20
- package/es/raster/shaders/raster_vert.glsl +0 -34
- package/lib/earth/shaders/atmosphere_vert.glsl +0 -26
- package/lib/earth/shaders/base_frag.glsl +0 -13
- package/lib/earth/shaders/base_vert.glsl +0 -52
- package/lib/earth/shaders/bloomsphere_frag.glsl +0 -15
- package/lib/earth/shaders/bloomsphere_vert.glsl +0 -20
- package/lib/heatmap/shaders/heatmap_3d_frag.glsl +0 -14
- package/lib/heatmap/shaders/heatmap_frag.glsl +0 -47
- package/lib/heatmap/shaders/heatmap_framebuffer_frag.glsl +0 -10
- package/lib/heatmap/shaders/heatmap_vert.glsl +0 -10
- package/lib/heatmap/shaders/hexagon_frag.glsl +0 -12
- package/lib/line/models/earthArc_3d.js +0 -291
- package/lib/line/models/linearline.js +0 -247
- package/lib/line/shaders/arc_chunks.vert.glsl +0 -21
- package/lib/line/shaders/dash/arc_dash_frag.glsl +0 -21
- package/lib/line/shaders/dash/arc_dash_vert.glsl +0 -102
- package/lib/line/shaders/dash/line_dash_frag.glsl +0 -27
- package/lib/line/shaders/dash/line_dash_vert.glsl +0 -82
- package/lib/line/shaders/line_arc2d_vert.glsl +0 -114
- package/lib/line/shaders/line_bezier_vert.glsl +0 -85
- package/lib/line/shaders/line_vert.glsl +0 -165
- package/lib/line/shaders/linear/arc3d_linear_frag.glsl +0 -32
- package/lib/line/shaders/linear/arc3d_linear_vert.glsl +0 -161
- package/lib/line/shaders/linear/arc_linear_frag.glsl +0 -10
- package/lib/line/shaders/linear/arc_linear_vert.glsl +0 -98
- package/lib/line/shaders/linear/line_linear_frag.glsl +0 -25
- package/lib/line/shaders/linearLine/line_linear_frag.glsl +0 -8
- package/lib/line/shaders/linearLine/line_linear_vert.glsl +0 -93
- package/lib/line/shaders/simple/simpleline_linear_frag.glsl +0 -8
- package/lib/point/shaders/animate/wave_frag.glsl +0 -55
- package/lib/point/shaders/earth/extrude_frag.glsl +0 -32
- package/lib/point/shaders/image/fillImage_frag.glsl +0 -18
- package/lib/point/shaders/image_frag.glsl +0 -37
- package/lib/point/shaders/text_frag.glsl +0 -39
- package/lib/polygon/shaders/polygon_frag.glsl +0 -7
- package/lib/polygon/shaders/polygon_linear_frag.glsl +0 -15
- package/lib/polygon/shaders/water/polygon_ocean_vert.glsl +0 -16
- package/lib/raster/shaders/raster_2d_frag.glsl +0 -32
- package/lib/raster/shaders/raster_2d_vert.glsl +0 -13
- package/lib/raster/shaders/raster_frag.glsl +0 -11
- package/lib/raster/shaders/raster_rgb_frag.glsl +0 -20
- package/lib/raster/shaders/raster_vert.glsl +0 -34
- /package/es/point/shaders/{normal_frag.glsl → normal/normal_frag.glsl} +0 -0
- /package/es/point/shaders/{normal_vert.glsl → normal/normal_vert.glsl} +0 -0
- /package/es/raster/shaders/{raster_terrain_rgb_frag.glsl → terrain/terrain_rgb_frag.glsl} +0 -0
- /package/es/raster/shaders/{rater_terrain_rgb_vert.glsl → terrain/terrain_rgb_vert.glsl} +0 -0
- /package/lib/point/shaders/{normal_frag.glsl → normal/normal_frag.glsl} +0 -0
- /package/lib/point/shaders/{normal_vert.glsl → normal/normal_vert.glsl} +0 -0
- /package/lib/raster/shaders/{raster_terrain_rgb_frag.glsl → terrain/terrain_rgb_frag.glsl} +0 -0
- /package/lib/raster/shaders/{rater_terrain_rgb_vert.glsl → terrain/terrain_rgb_vert.glsl} +0 -0
|
@@ -1,102 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
attribute vec4 a_Color;
|
|
3
|
-
attribute vec3 a_Position;
|
|
4
|
-
attribute vec4 a_Instance;
|
|
5
|
-
attribute float a_Size;
|
|
6
|
-
uniform mat4 u_ModelMatrix;
|
|
7
|
-
|
|
8
|
-
uniform float segmentNumber;
|
|
9
|
-
varying vec4 v_color;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
uniform vec4 u_dash_array: [10.0, 5., 0, 0];
|
|
13
|
-
uniform float u_lineDir: 1.0;
|
|
14
|
-
varying vec4 v_dash_array;
|
|
15
|
-
varying float v_distance_ratio;
|
|
16
|
-
#pragma include "projection"
|
|
17
|
-
#pragma include "project"
|
|
18
|
-
#pragma include "picking"
|
|
19
|
-
|
|
20
|
-
float bezier3(vec3 arr, float t) {
|
|
21
|
-
float ut = 1. - t;
|
|
22
|
-
return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
|
|
23
|
-
}
|
|
24
|
-
vec2 midPoint(vec2 source, vec2 target, float arcThetaOffset) {
|
|
25
|
-
vec2 center = target - source;
|
|
26
|
-
float r = length(center);
|
|
27
|
-
float theta = atan(center.y, center.x);
|
|
28
|
-
float thetaOffset = arcThetaOffset;
|
|
29
|
-
float r2 = r / 2.0 / cos(thetaOffset);
|
|
30
|
-
float theta2 = theta + thetaOffset;
|
|
31
|
-
vec2 mid = vec2(r2*cos(theta2) + source.x, r2*sin(theta2) + source.y);
|
|
32
|
-
if(u_lineDir == 1.0) { // 正向
|
|
33
|
-
return mid;
|
|
34
|
-
} else { // 逆向
|
|
35
|
-
// (mid + vmin)/2 = (s + t)/2
|
|
36
|
-
vec2 vmid = source + target - mid;
|
|
37
|
-
return vmid;
|
|
38
|
-
}
|
|
39
|
-
// return mid;
|
|
40
|
-
}
|
|
41
|
-
float getSegmentRatio(float index) {
|
|
42
|
-
// dash: index / (segmentNumber - 1.);
|
|
43
|
-
// normal: smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
|
|
44
|
-
return index / (segmentNumber - 1.);
|
|
45
|
-
}
|
|
46
|
-
vec2 interpolate (vec2 source, vec2 target, float t, float arcThetaOffset) {
|
|
47
|
-
// if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
|
|
48
|
-
vec2 mid = midPoint(source, target, arcThetaOffset);
|
|
49
|
-
vec3 x = vec3(source.x, mid.x, target.x);
|
|
50
|
-
vec3 y = vec3(source.y, mid.y, target.y);
|
|
51
|
-
return vec2(bezier3(x ,t), bezier3(y,t));
|
|
52
|
-
}
|
|
53
|
-
vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
|
|
54
|
-
// normalized direction of the line
|
|
55
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
56
|
-
// rotate by 90 degrees
|
|
57
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
58
|
-
vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
|
|
59
|
-
return offset;
|
|
60
|
-
}
|
|
61
|
-
vec2 getNormal(vec2 line_clipspace, float offset_direction) {
|
|
62
|
-
// normalized direction of the line
|
|
63
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
64
|
-
// rotate by 90 degrees
|
|
65
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
66
|
-
return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
void main() {
|
|
70
|
-
v_color = vec4(a_Color.xyz, a_Color.w * opacity);
|
|
71
|
-
|
|
72
|
-
vec2 source = a_Instance.rg; // 起始点
|
|
73
|
-
vec2 target = a_Instance.ba; // 终点
|
|
74
|
-
float segmentIndex = a_Position.x;
|
|
75
|
-
float segmentRatio = getSegmentRatio(segmentIndex);
|
|
76
|
-
|
|
77
|
-
float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
|
|
78
|
-
float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
|
|
79
|
-
|
|
80
|
-
vec2 s = source;
|
|
81
|
-
vec2 t = target;
|
|
82
|
-
|
|
83
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
|
|
84
|
-
s = unProjCustomCoord(source);
|
|
85
|
-
t = unProjCustomCoord(target);
|
|
86
|
-
}
|
|
87
|
-
float total_Distance = pixelDistance(s, t) / 2.0 * PI;
|
|
88
|
-
v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / total_Distance;
|
|
89
|
-
|
|
90
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
91
|
-
|
|
92
|
-
vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
|
|
93
|
-
vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
|
|
97
|
-
|
|
98
|
-
gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
|
|
99
|
-
|
|
100
|
-
gl_PointSize = 5.0;
|
|
101
|
-
setPickingColor(a_PickingColor);
|
|
102
|
-
}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
#define LineTypeSolid 0.0
|
|
2
|
-
varying vec4 v_color;
|
|
3
|
-
|
|
4
|
-
// dash
|
|
5
|
-
varying vec4 v_dash_array;
|
|
6
|
-
varying float v_d_distance_ratio;
|
|
7
|
-
|
|
8
|
-
#pragma include "picking"
|
|
9
|
-
|
|
10
|
-
uniform float u_time;
|
|
11
|
-
uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
|
|
12
|
-
|
|
13
|
-
// [animate, duration, interval, trailLength],
|
|
14
|
-
void main() {
|
|
15
|
-
|
|
16
|
-
gl_FragColor = v_color;
|
|
17
|
-
|
|
18
|
-
float dashLength = mod(v_d_distance_ratio, v_dash_array.x + v_dash_array.y + v_dash_array.z + v_dash_array.w);
|
|
19
|
-
if(dashLength < v_dash_array.x || (dashLength > (v_dash_array.x + v_dash_array.y) && dashLength < v_dash_array.x + v_dash_array.y + v_dash_array.z)) {
|
|
20
|
-
// 实线部分
|
|
21
|
-
} else {
|
|
22
|
-
// 虚线部分
|
|
23
|
-
discard;
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
gl_FragColor = filterColor(gl_FragColor);
|
|
27
|
-
}
|
|
@@ -1,82 +0,0 @@
|
|
|
1
|
-
#define LineTypeSolid 0.0
|
|
2
|
-
#define LineTypeDash 1.0
|
|
3
|
-
#define Animate 0.0
|
|
4
|
-
|
|
5
|
-
attribute float a_Miter;
|
|
6
|
-
attribute vec4 a_Color;
|
|
7
|
-
attribute vec2 a_Size;
|
|
8
|
-
attribute vec3 a_Normal;
|
|
9
|
-
attribute vec3 a_Position;
|
|
10
|
-
|
|
11
|
-
attribute vec2 a_iconMapUV;
|
|
12
|
-
|
|
13
|
-
// dash line
|
|
14
|
-
attribute float a_Total_Distance;
|
|
15
|
-
attribute vec2 a_DistanceAndIndex;
|
|
16
|
-
uniform float u_raisingHeight: 0.0;
|
|
17
|
-
uniform float u_heightfixed: 0.0;
|
|
18
|
-
|
|
19
|
-
uniform mat4 u_ModelMatrix;
|
|
20
|
-
|
|
21
|
-
uniform vec4 u_dash_array: [10.0, 5., 0, 0];
|
|
22
|
-
|
|
23
|
-
uniform float u_vertexScale: 1.0;
|
|
24
|
-
|
|
25
|
-
#pragma include "projection"
|
|
26
|
-
#pragma include "picking"
|
|
27
|
-
|
|
28
|
-
varying vec4 v_color;
|
|
29
|
-
varying vec4 v_dash_array;
|
|
30
|
-
varying float v_d_distance_ratio;
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
void main() {
|
|
34
|
-
|
|
35
|
-
v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / a_Total_Distance;
|
|
36
|
-
v_color = vec4(a_Color.xyz, a_Color.w * opacity);
|
|
37
|
-
|
|
38
|
-
vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
|
|
39
|
-
vec2 offset = project_pixel(size.xy);
|
|
40
|
-
v_d_distance_ratio = a_DistanceAndIndex.x / a_Total_Distance;
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
|
|
44
|
-
|
|
45
|
-
float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况 vertex height
|
|
46
|
-
float lineHeight = a_Size.y; // size 第二个参数代表的高度 [linewidth, lineheight]
|
|
47
|
-
|
|
48
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
|
|
49
|
-
lineHeight *= 0.2; // 保持和 amap/mapbox 一致的效果
|
|
50
|
-
h *= 0.2;
|
|
51
|
-
if(u_heightfixed < 1.0) {
|
|
52
|
-
lineHeight = project_pixel(a_Size.y);
|
|
53
|
-
}
|
|
54
|
-
gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));
|
|
55
|
-
} else {
|
|
56
|
-
// mapbox - amap
|
|
57
|
-
|
|
58
|
-
// 兼容 mapbox 在线高度上的效果表现基本一致
|
|
59
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
|
|
60
|
-
// mapbox
|
|
61
|
-
// 保持高度相对不变
|
|
62
|
-
float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
|
|
63
|
-
h *= mapboxZoomScale;
|
|
64
|
-
h += u_raisingHeight * mapboxZoomScale;
|
|
65
|
-
if(u_heightfixed > 0.0) {
|
|
66
|
-
lineHeight *= mapboxZoomScale;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
} else {
|
|
70
|
-
// amap
|
|
71
|
-
h += u_raisingHeight;
|
|
72
|
-
// lineHeight 顶点偏移高度
|
|
73
|
-
if(u_heightfixed < 1.0) {
|
|
74
|
-
lineHeight *= pow(2.0, 20.0 - u_Zoom);
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
setPickingColor(a_PickingColor);
|
|
82
|
-
}
|
|
@@ -1,114 +0,0 @@
|
|
|
1
|
-
#define LineTypeSolid 0.0
|
|
2
|
-
#define LineTypeDash 1.0
|
|
3
|
-
#define Animate 0.0
|
|
4
|
-
attribute vec4 a_Color;
|
|
5
|
-
attribute vec3 a_Position;
|
|
6
|
-
attribute vec4 a_Instance;
|
|
7
|
-
attribute float a_Size;
|
|
8
|
-
uniform mat4 u_ModelMatrix;
|
|
9
|
-
uniform float segmentNumber;
|
|
10
|
-
uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
|
|
11
|
-
varying vec4 v_color;
|
|
12
|
-
varying vec2 v_normal;
|
|
13
|
-
|
|
14
|
-
varying float v_distance_ratio;
|
|
15
|
-
uniform float u_line_type: 0.0;
|
|
16
|
-
uniform vec4 u_dash_array: [10.0, 5., 0, 0];
|
|
17
|
-
varying vec4 v_dash_array;
|
|
18
|
-
|
|
19
|
-
#pragma include "projection"
|
|
20
|
-
#pragma include "project"
|
|
21
|
-
#pragma include "picking"
|
|
22
|
-
|
|
23
|
-
float maps (float value, float start1, float stop1, float start2, float stop2) {
|
|
24
|
-
return start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
float getSegmentRatio(float index) {
|
|
28
|
-
return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
float paraboloid(vec2 source, vec2 target, float ratio) {
|
|
32
|
-
vec2 x = mix(source, target, ratio);
|
|
33
|
-
vec2 center = mix(source, target, 0.5);
|
|
34
|
-
float dSourceCenter = distance(source, center);
|
|
35
|
-
float dXCenter = distance(x, center);
|
|
36
|
-
return (dSourceCenter + dXCenter) * (dSourceCenter - dXCenter);
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
vec3 getPos(vec2 source, vec2 target, float segmentRatio) {
|
|
40
|
-
float vertex_height = paraboloid(source, target, segmentRatio);
|
|
41
|
-
|
|
42
|
-
return vec3(
|
|
43
|
-
mix(source, target, segmentRatio),
|
|
44
|
-
sqrt(max(0.0, vertex_height))
|
|
45
|
-
);
|
|
46
|
-
}
|
|
47
|
-
vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
|
|
48
|
-
// normalized direction of the line
|
|
49
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
50
|
-
// rotate by 90 degrees
|
|
51
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
52
|
-
vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
|
|
53
|
-
return offset * vec2(1.0, -1.0);
|
|
54
|
-
}
|
|
55
|
-
vec2 getNormal(vec2 line_clipspace, float offset_direction) {
|
|
56
|
-
// normalized direction of the line
|
|
57
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
58
|
-
// rotate by 90 degrees
|
|
59
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
60
|
-
return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
|
|
61
|
-
}
|
|
62
|
-
float getAngularDist (vec2 source, vec2 target) {
|
|
63
|
-
vec2 delta = source - target;
|
|
64
|
-
vec2 sin_half_delta = sin(delta / 2.0);
|
|
65
|
-
float a =
|
|
66
|
-
sin_half_delta.y * sin_half_delta.y +
|
|
67
|
-
cos(source.y) * cos(target.y) *
|
|
68
|
-
sin_half_delta.x * sin_half_delta.x;
|
|
69
|
-
return 2.0 * atan(sqrt(a), sqrt(1.0 - a));
|
|
70
|
-
}
|
|
71
|
-
vec2 interpolate (vec2 source, vec2 target, float angularDist, float t) {
|
|
72
|
-
// if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
|
|
73
|
-
if(abs(angularDist - PI) < 0.001) {
|
|
74
|
-
return (1.0 - t) * source + t * target;
|
|
75
|
-
}
|
|
76
|
-
float a = sin((1.0 - t) * angularDist) / sin(angularDist);
|
|
77
|
-
float b = sin(t * angularDist) / sin(angularDist);
|
|
78
|
-
vec2 sin_source = sin(source);
|
|
79
|
-
vec2 cos_source = cos(source);
|
|
80
|
-
vec2 sin_target = sin(target);
|
|
81
|
-
vec2 cos_target = cos(target);
|
|
82
|
-
float x = a * cos_source.y * cos_source.x + b * cos_target.y * cos_target.x;
|
|
83
|
-
float y = a * cos_source.y * sin_source.x + b * cos_target.y * sin_target.x;
|
|
84
|
-
float z = a * sin_source.y + b * sin_target.y;
|
|
85
|
-
return vec2(atan(y, x), atan(z, sqrt(x * x + y * y)));
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
void main() {
|
|
89
|
-
v_color = a_Color;
|
|
90
|
-
vec2 source = radians(a_Instance.rg);
|
|
91
|
-
vec2 target = radians(a_Instance.ba);
|
|
92
|
-
float angularDist = getAngularDist(source, target);
|
|
93
|
-
float segmentIndex = a_Position.x;
|
|
94
|
-
float segmentRatio = getSegmentRatio(segmentIndex);
|
|
95
|
-
float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
|
|
96
|
-
if(u_line_type == LineTypeDash) {
|
|
97
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
98
|
-
float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba);
|
|
99
|
-
v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
|
|
100
|
-
}
|
|
101
|
-
if(u_animate.x == Animate) {
|
|
102
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
103
|
-
}
|
|
104
|
-
float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
|
|
105
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
106
|
-
vec4 curr = project_position(vec4(degrees(interpolate(source, target, angularDist, segmentRatio)), 0.0, 1.0));
|
|
107
|
-
vec4 next = project_position(vec4(degrees(interpolate(source, target, angularDist, nextSegmentRatio)), 0.0, 1.0));
|
|
108
|
-
v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
|
|
109
|
-
vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
|
|
110
|
-
// vec4 project_pos = project_position(vec4(curr.xy, 0, 1.0));
|
|
111
|
-
gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, curr.z, 1.0));
|
|
112
|
-
setPickingColor(a_PickingColor);
|
|
113
|
-
}
|
|
114
|
-
|
|
@@ -1,85 +0,0 @@
|
|
|
1
|
-
#define LineTypeSolid 0.0
|
|
2
|
-
#define LineTypeDash 1.0
|
|
3
|
-
#define Animate 0.0
|
|
4
|
-
attribute vec4 a_Color;
|
|
5
|
-
attribute vec3 a_Position;
|
|
6
|
-
attribute vec4 a_Instance;
|
|
7
|
-
attribute float a_Size;
|
|
8
|
-
uniform mat4 u_ModelMatrix;
|
|
9
|
-
uniform float segmentNumber;
|
|
10
|
-
uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
|
|
11
|
-
varying vec4 v_color;
|
|
12
|
-
varying vec2 v_normal;
|
|
13
|
-
|
|
14
|
-
varying float v_distance_ratio;
|
|
15
|
-
uniform float u_line_type: 0.0;
|
|
16
|
-
uniform vec4 u_dash_array: [10.0, 5., 0, 0];
|
|
17
|
-
varying vec4 v_dash_array;
|
|
18
|
-
#pragma include "projection"
|
|
19
|
-
#pragma include "project"
|
|
20
|
-
#pragma include "picking"
|
|
21
|
-
|
|
22
|
-
float bezier3(vec3 arr, float t) {
|
|
23
|
-
float ut = 1. - t;
|
|
24
|
-
return (arr.x * ut + arr.y * t) * ut + (arr.y * ut + arr.z * t) * t;
|
|
25
|
-
}
|
|
26
|
-
vec2 midPoint(vec2 source, vec2 target) {
|
|
27
|
-
vec2 center = target - source;
|
|
28
|
-
float r = length(center);
|
|
29
|
-
float theta = atan(center.y, center.x);
|
|
30
|
-
float thetaOffset = 0.314;
|
|
31
|
-
float r2 = r / 2.0 / cos(thetaOffset);
|
|
32
|
-
float theta2 = theta + thetaOffset;
|
|
33
|
-
vec2 mid = vec2(r2*cos(theta2) + source.x, r2*sin(theta2) + source.y);
|
|
34
|
-
return mid;
|
|
35
|
-
}
|
|
36
|
-
float getSegmentRatio(float index) {
|
|
37
|
-
return smoothstep(0.0, 1.0, index / (segmentNumber - 1.));
|
|
38
|
-
}
|
|
39
|
-
vec2 interpolate (vec2 source, vec2 target, float t) {
|
|
40
|
-
// if the angularDist is PI, linear interpolation is applied. otherwise, use spherical interpolation
|
|
41
|
-
vec2 mid = midPoint(source, target);
|
|
42
|
-
vec3 x = vec3(source.x, mid.x, target.x);
|
|
43
|
-
vec3 y = vec3(source.y, mid.y, target.y);
|
|
44
|
-
return vec2(bezier3(x ,t), bezier3(y,t));
|
|
45
|
-
}
|
|
46
|
-
vec2 getExtrusionOffset(vec2 line_clipspace, float offset_direction) {
|
|
47
|
-
// normalized direction of the line
|
|
48
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
49
|
-
// rotate by 90 degrees
|
|
50
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
51
|
-
vec2 offset = dir_screenspace * offset_direction * setPickingSize(a_Size) / 2.0;
|
|
52
|
-
return offset * vec2(1.0, -1.0);
|
|
53
|
-
}
|
|
54
|
-
vec2 getNormal(vec2 line_clipspace, float offset_direction) {
|
|
55
|
-
// normalized direction of the line
|
|
56
|
-
vec2 dir_screenspace = normalize(line_clipspace);
|
|
57
|
-
// rotate by 90 degrees
|
|
58
|
-
dir_screenspace = vec2(-dir_screenspace.y, dir_screenspace.x);
|
|
59
|
-
return reverse_offset_normal(vec3(dir_screenspace,1.0)).xy * sign(offset_direction);
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
void main() {
|
|
63
|
-
v_color = a_Color;
|
|
64
|
-
vec2 source = a_Instance.rg;
|
|
65
|
-
vec2 target = a_Instance.ba;
|
|
66
|
-
float segmentIndex = a_Position.x;
|
|
67
|
-
float segmentRatio = getSegmentRatio(segmentIndex);
|
|
68
|
-
float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
|
|
69
|
-
float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
|
|
70
|
-
if(u_line_type == LineTypeDash) {
|
|
71
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
72
|
-
float total_Distance = pixelDistance(a_Instance.rg, a_Instance.ba) / 2.0 * PI;
|
|
73
|
-
v_dash_array = pow(2.0, 20.0 - u_Zoom) * u_dash_array / (total_Distance / segmentNumber * segmentIndex);
|
|
74
|
-
}
|
|
75
|
-
if(u_animate.x == Animate) {
|
|
76
|
-
v_distance_ratio = segmentIndex / segmentNumber;
|
|
77
|
-
}
|
|
78
|
-
vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio), 0.0, 1.0));
|
|
79
|
-
vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio), 0.0, 1.0));
|
|
80
|
-
v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
|
|
81
|
-
vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));
|
|
82
|
-
|
|
83
|
-
gl_Position = project_common_position_to_clipspace_v2(vec4(curr.xy + offset, 0, 1.0));
|
|
84
|
-
setPickingColor(a_PickingColor);
|
|
85
|
-
}
|
|
@@ -1,165 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
#define Animate 0.0
|
|
3
|
-
|
|
4
|
-
attribute float a_Miter;
|
|
5
|
-
attribute vec4 a_Color;
|
|
6
|
-
attribute vec2 a_Size;
|
|
7
|
-
attribute vec3 a_Normal;
|
|
8
|
-
attribute vec3 a_Position;
|
|
9
|
-
|
|
10
|
-
attribute vec2 a_iconMapUV;
|
|
11
|
-
|
|
12
|
-
// dash line
|
|
13
|
-
attribute float a_Total_Distance;
|
|
14
|
-
attribute vec2 a_DistanceAndIndex;
|
|
15
|
-
|
|
16
|
-
uniform mat4 u_ModelMatrix;
|
|
17
|
-
|
|
18
|
-
uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
|
|
19
|
-
uniform float u_icon_step: 100;
|
|
20
|
-
|
|
21
|
-
uniform float u_heightfixed: 0.0;
|
|
22
|
-
uniform float u_vertexScale: 1.0;
|
|
23
|
-
uniform float u_raisingHeight: 0.0;
|
|
24
|
-
|
|
25
|
-
#pragma include "projection"
|
|
26
|
-
#pragma include "picking"
|
|
27
|
-
|
|
28
|
-
varying vec4 v_color;
|
|
29
|
-
varying vec4 v_stroke;
|
|
30
|
-
|
|
31
|
-
// texV 线图层 - 贴图部分的 v 坐标(线的宽度方向)
|
|
32
|
-
varying vec2 v_iconMapUV;
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
uniform float u_linearColor: 0;
|
|
36
|
-
uniform float u_arrow: 0.0;
|
|
37
|
-
uniform float u_arrowHeight: 3.0;
|
|
38
|
-
uniform float u_arrowWidth: 2.0;
|
|
39
|
-
uniform float u_tailWidth: 1.0;
|
|
40
|
-
|
|
41
|
-
varying vec4 v_texture_data;
|
|
42
|
-
|
|
43
|
-
vec2 calculateArrow(vec2 offset) {
|
|
44
|
-
/*
|
|
45
|
-
* 在支持箭头的时候,第二、第三组顶点是额外插入用于构建顶点的
|
|
46
|
-
*/
|
|
47
|
-
float arrowFlag = -1.0;
|
|
48
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
|
|
49
|
-
// 高德 2.0 的旋转角度不同
|
|
50
|
-
arrowFlag = 1.0;
|
|
51
|
-
}
|
|
52
|
-
float pi = arrowFlag * 3.1415926/2.;
|
|
53
|
-
if(a_Miter < 0.) {
|
|
54
|
-
// 根据线的两侧偏移不同、旋转的方向相反
|
|
55
|
-
pi = -pi;
|
|
56
|
-
}
|
|
57
|
-
highp float angle_sin = sin(pi);
|
|
58
|
-
highp float angle_cos = cos(pi);
|
|
59
|
-
// 计算垂直与线方向的旋转矩阵
|
|
60
|
-
mat2 rotation_matrix = mat2(angle_cos, -1.0 * angle_sin, angle_sin, angle_cos);
|
|
61
|
-
float arrowWidth = u_arrowWidth;
|
|
62
|
-
float arrowHeight = u_arrowHeight;
|
|
63
|
-
|
|
64
|
-
vec2 arrowOffset = vec2(0.0);
|
|
65
|
-
/*
|
|
66
|
-
* a_DistanceAndIndex.y 用于标记当前顶点属于哪一组(两个顶点一组,构成线的其实是矩形,最简需要四个顶点、两组顶点构成)
|
|
67
|
-
*/
|
|
68
|
-
if(a_DistanceAndIndex.y == 0.0) {
|
|
69
|
-
// 箭头尖部
|
|
70
|
-
offset = vec2(0.0);
|
|
71
|
-
} else if(a_DistanceAndIndex.y == 1.0) {
|
|
72
|
-
// 箭头两侧
|
|
73
|
-
arrowOffset = rotation_matrix*(offset * arrowHeight);
|
|
74
|
-
offset += arrowOffset; // 沿线偏移
|
|
75
|
-
offset = offset * arrowWidth; // 垂直线向外偏移(是构建箭头两侧的顶点)
|
|
76
|
-
} else if(a_DistanceAndIndex.y == 2.0 || a_DistanceAndIndex.y == 3.0 || a_DistanceAndIndex.y == 4.0) {
|
|
77
|
-
// 偏移其余的点位(将长度让位给箭头)
|
|
78
|
-
arrowOffset = rotation_matrix*(offset * arrowHeight) * arrowWidth;
|
|
79
|
-
offset += arrowOffset;// 沿线偏移
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
return offset;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
void main() {
|
|
86
|
-
// cal style mapping - 数据纹理映射部分的计算
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
float d_texPixelLen; // 贴图的像素长度,根据地图层级缩放
|
|
90
|
-
|
|
91
|
-
v_iconMapUV = a_iconMapUV;
|
|
92
|
-
d_texPixelLen = project_float_pixel(u_icon_step);
|
|
93
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
|
|
94
|
-
d_texPixelLen *= 10.0;
|
|
95
|
-
}
|
|
96
|
-
|
|
97
|
-
v_color = a_Color;
|
|
98
|
-
v_color.a *= opacity;
|
|
99
|
-
v_stroke = stroke;
|
|
100
|
-
|
|
101
|
-
vec3 size = a_Miter * setPickingSize(a_Size.x) * reverse_offset_normal(a_Normal);
|
|
102
|
-
|
|
103
|
-
vec2 offset = project_pixel(size.xy);
|
|
104
|
-
|
|
105
|
-
float lineDistance = a_DistanceAndIndex.x;
|
|
106
|
-
float currentLinePointRatio = lineDistance / a_Total_Distance;
|
|
107
|
-
|
|
108
|
-
if(u_arrow > 0.0) {
|
|
109
|
-
// 计算箭头
|
|
110
|
-
offset = calculateArrow(offset);
|
|
111
|
-
|
|
112
|
-
if(a_DistanceAndIndex.y > 4.0) {
|
|
113
|
-
offset *= mix(1.0, u_tailWidth, currentLinePointRatio);
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
float lineOffsetWidth = length(offset + offset * sign(a_Miter)); // 线横向偏移的距离(向两侧偏移的和)
|
|
118
|
-
float linePixelSize = project_pixel(a_Size.x) * 2.0; // 定点位置偏移,按地图等级缩放后的距离 单侧 * 2
|
|
119
|
-
float texV = lineOffsetWidth/linePixelSize; // 线图层贴图部分的 v 坐标值
|
|
120
|
-
|
|
121
|
-
v_texture_data = vec4(currentLinePointRatio, lineDistance, d_texPixelLen, texV);
|
|
122
|
-
// 设置数据集的参数
|
|
123
|
-
|
|
124
|
-
vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
|
|
125
|
-
|
|
126
|
-
// gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, a_Size.y, 1.0));
|
|
127
|
-
|
|
128
|
-
float h = float(a_Position.z) * u_vertexScale; // 线顶点的高度 - 兼容不存在第三个数值的情况 vertex height
|
|
129
|
-
float lineHeight = a_Size.y; // size 第二个参数代表的高度 [linewidth, lineheight]
|
|
130
|
-
|
|
131
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
|
|
132
|
-
lineHeight *= 0.2; // 保持和 amap/mapbox 一致的效果
|
|
133
|
-
h *= 0.2;
|
|
134
|
-
if(u_heightfixed < 1.0) {
|
|
135
|
-
lineHeight = project_pixel(a_Size.y);
|
|
136
|
-
}
|
|
137
|
-
gl_Position = u_Mvp * (vec4(project_pos.xy + offset, lineHeight + h + u_raisingHeight, 1.0));
|
|
138
|
-
} else {
|
|
139
|
-
// mapbox - amap
|
|
140
|
-
|
|
141
|
-
// 兼容 mapbox 在线高度上的效果表现基本一致
|
|
142
|
-
if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
|
|
143
|
-
// mapbox
|
|
144
|
-
// 保持高度相对不变
|
|
145
|
-
float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
|
|
146
|
-
h *= mapboxZoomScale;
|
|
147
|
-
h += u_raisingHeight * mapboxZoomScale;
|
|
148
|
-
if(u_heightfixed > 0.0) {
|
|
149
|
-
lineHeight *= mapboxZoomScale;
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
} else {
|
|
153
|
-
// amap
|
|
154
|
-
h += u_raisingHeight;
|
|
155
|
-
// lineHeight 顶点偏移高度
|
|
156
|
-
if(u_heightfixed < 1.0) {
|
|
157
|
-
lineHeight *= pow(2.0, 20.0 - u_Zoom);
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, lineHeight + h, 1.0));
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
setPickingColor(a_PickingColor);
|
|
165
|
-
}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
|
|
2
|
-
#define Animate 0.0
|
|
3
|
-
uniform float u_time;
|
|
4
|
-
uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
|
|
5
|
-
varying vec4 v_Color;
|
|
6
|
-
|
|
7
|
-
varying float v_distance_ratio;
|
|
8
|
-
#pragma include "picking"
|
|
9
|
-
|
|
10
|
-
void main() {
|
|
11
|
-
|
|
12
|
-
float animateSpeed = 0.0; // 运动速度
|
|
13
|
-
gl_FragColor = v_Color;
|
|
14
|
-
|
|
15
|
-
if(u_animate.x == Animate) {
|
|
16
|
-
animateSpeed = u_time / u_animate.y;
|
|
17
|
-
float alpha =1.0 - fract( mod(1.0- v_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + u_time / u_animate.y);
|
|
18
|
-
|
|
19
|
-
alpha = (alpha + u_animate.w -1.0) / u_animate.w;
|
|
20
|
-
// alpha = smoothstep(0., 1., alpha);
|
|
21
|
-
alpha = clamp(alpha, 0.0, 1.0);
|
|
22
|
-
gl_FragColor.a *= alpha;
|
|
23
|
-
|
|
24
|
-
// u_animate
|
|
25
|
-
// x enable
|
|
26
|
-
// y duration
|
|
27
|
-
// z interval
|
|
28
|
-
// w trailLength
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
gl_FragColor = filterColor(gl_FragColor);
|
|
32
|
-
}
|