@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4
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/Geometry/index.js +6 -2
- package/es/Geometry/models/billboard.js +3 -7
- package/es/Geometry/models/plane.js +5 -7
- package/es/Geometry/models/sprite.js +4 -7
- package/es/canvas/index.d.ts +4 -0
- package/es/canvas/index.js +38 -2
- package/es/citybuliding/building.js +6 -2
- package/es/citybuliding/models/build.js +2 -3
- package/es/core/BaseLayer.d.ts +20 -12
- package/es/core/BaseLayer.js +61 -85
- package/es/core/BaseModel.d.ts +2 -2
- package/es/core/BaseModel.js +22 -19
- package/es/core/interface.d.ts +20 -1
- package/es/core/triangulation.d.ts +6 -0
- package/es/core/triangulation.js +64 -2
- package/es/earth/index.js +3 -1
- package/es/earth/models/atmosphere.js +4 -7
- package/es/earth/models/base.js +12 -18
- package/es/earth/models/bloomsphere.js +4 -8
- package/es/earth/shaders/atmosphere_frag.glsl +1 -1
- package/es/earth/shaders/bloomsphere_frag.glsl +1 -1
- package/es/heatmap/index.d.ts +2 -2
- package/es/heatmap/index.js +7 -5
- package/es/heatmap/models/grid.js +1 -3
- package/es/heatmap/models/grid3d.js +4 -11
- package/es/heatmap/models/heatmap.js +8 -9
- package/es/heatmap/models/hexagon.js +2 -6
- package/es/heatmap/triangulation.js +0 -1
- package/es/image/index.d.ts +1 -1
- package/es/image/index.js +10 -3
- package/es/image/models/dataImage.d.ts +1 -1
- package/es/image/models/dataImage.js +14 -39
- package/es/image/models/image.js +5 -10
- package/es/image/models/index.d.ts +1 -1
- package/es/image/models/index.js +3 -1
- package/es/image/models/tileDataImage.d.ts +19 -0
- package/es/image/models/tileDataImage.js +174 -0
- package/es/line/index.d.ts +1 -0
- package/es/line/index.js +8 -2
- package/es/line/models/arc.js +10 -10
- package/es/line/models/arc_3d.js +8 -10
- package/es/line/models/earthArc_3d.js +8 -10
- package/es/line/models/great_circle.js +7 -7
- package/es/line/models/half.js +3 -4
- package/es/line/models/line.js +10 -9
- package/es/line/models/linearline.js +3 -4
- package/es/line/models/simpleLine.js +5 -4
- package/es/line/models/simpleTileLine.d.ts +9 -0
- package/es/line/models/simpleTileLine.js +100 -0
- package/es/line/models/tile.d.ts +1 -4
- package/es/line/models/tile.js +50 -223
- package/es/line/models/wall.js +11 -47
- package/es/line/shaders/dash/arc_dash_vert.glsl +2 -0
- package/es/line/shaders/dash/line_dash_frag.glsl +1 -1
- package/es/line/shaders/line_arc2d_vert.glsl +2 -2
- package/es/line/shaders/line_arc_3d_frag.glsl +10 -10
- package/es/line/shaders/line_arc_3d_vert.glsl +5 -6
- package/es/line/shaders/line_arc_frag.glsl +9 -10
- package/es/line/shaders/line_arc_great_circle_frag.glsl +6 -6
- package/es/line/shaders/line_arc_great_circle_vert.glsl +2 -3
- package/es/line/shaders/line_arc_vert.glsl +6 -4
- package/es/line/shaders/line_bezier_vert.glsl +2 -2
- package/es/line/shaders/line_frag.glsl +5 -6
- package/es/line/shaders/line_vert.glsl +1 -1
- package/es/line/shaders/linear/arc3d_linear_frag.glsl +6 -7
- package/es/line/shaders/linear/arc3d_linear_vert.glsl +11 -12
- package/es/line/shaders/linear/arc_linear_frag.glsl +1 -1
- package/es/line/shaders/tile/line_tile_map_vert.glsl +25 -0
- package/es/line/shaders/tile/line_tile_vert.glsl +19 -177
- package/es/line/shaders/tile/simpleline_map_vert.glsl +15 -0
- package/es/line/shaders/tile/simpleline_vert.glsl +21 -0
- package/es/line/shaders/{wall_frag.glsl → wall/wall_frag.glsl} +21 -25
- package/es/line/shaders/wall/wall_vert.glsl +77 -0
- package/es/mask/index.d.ts +1 -0
- package/es/mask/index.js +80 -5
- package/es/mask/models/fill.d.ts +2 -1
- package/es/mask/models/fill.js +13 -10
- package/es/mask/shaders/mask_vert.glsl +0 -6
- package/es/plugins/DataMappingPlugin.d.ts +4 -3
- package/es/plugins/DataMappingPlugin.js +129 -58
- package/es/plugins/DataSourcePlugin.js +3 -2
- package/es/plugins/FeatureScalePlugin.d.ts +0 -2
- package/es/plugins/FeatureScalePlugin.js +8 -51
- package/es/plugins/LayerAnimateStylePlugin.d.ts +0 -2
- package/es/plugins/LayerAnimateStylePlugin.js +7 -27
- package/es/plugins/LayerModelPlugin.js +2 -6
- package/es/plugins/LightingPlugin.js +1 -7
- package/es/plugins/MultiPassRendererPlugin.d.ts +0 -1
- package/es/plugins/MultiPassRendererPlugin.js +4 -16
- package/es/plugins/PixelPickingPlugin.d.ts +1 -1
- package/es/plugins/PixelPickingPlugin.js +8 -28
- package/es/plugins/RegisterStyleAttributePlugin.d.ts +4 -0
- package/es/plugins/RegisterStyleAttributePlugin.js +56 -5
- package/es/plugins/UpdateStyleAttributePlugin.js +2 -9
- package/es/point/index.js +9 -6
- package/es/point/models/earthExtrude.d.ts +1 -1
- package/es/point/models/earthExtrude.js +9 -14
- package/es/point/models/earthFill.js +2 -2
- package/es/point/models/extrude.d.ts +1 -1
- package/es/point/models/extrude.js +9 -12
- package/es/point/models/fill.d.ts +1 -1
- package/es/point/models/fill.js +8 -9
- package/es/point/models/fillmage.js +5 -6
- package/es/point/models/image.js +3 -3
- package/es/point/models/index.d.ts +1 -1
- package/es/point/models/index.js +3 -3
- package/es/point/models/normal.d.ts +0 -1
- package/es/point/models/normal.js +9 -62
- package/es/point/models/radar.js +5 -70
- package/es/point/models/simplePoint.d.ts +0 -1
- package/es/point/models/simplePoint.js +2 -11
- package/es/point/models/text.js +7 -10
- package/es/point/models/tile.d.ts +0 -7
- package/es/point/models/tile.js +24 -158
- package/es/point/models/tileText.d.ts +0 -4
- package/es/point/models/tileText.js +99 -188
- package/es/point/shaders/animate/wave_frag.glsl +4 -4
- package/es/point/shaders/earth/fill_vert.glsl +0 -1
- package/es/point/shaders/fill_vert.glsl +0 -1
- package/es/point/shaders/normal_frag.glsl +1 -10
- package/es/point/shaders/normal_vert.glsl +5 -60
- package/es/point/shaders/radar/radar_frag.glsl +4 -15
- package/es/point/shaders/radar/radar_vert.glsl +4 -54
- package/es/point/shaders/tile/fill_tile_frag.glsl +10 -17
- package/es/point/shaders/tile/fill_tile_vert.glsl +20 -123
- package/es/point/shaders/tile/text_frag.glsl +33 -0
- package/es/point/shaders/tile/text_map_frag.glsl +31 -0
- package/es/point/shaders/tile/text_map_vert.glsl +38 -0
- package/es/point/shaders/tile/text_vert.glsl +48 -0
- package/es/polygon/index.js +6 -2
- package/es/polygon/models/extrude.js +4 -8
- package/es/polygon/models/fill.js +3 -4
- package/es/polygon/models/ocean.d.ts +0 -2
- package/es/polygon/models/ocean.js +13 -47
- package/es/polygon/models/tile.d.ts +1 -4
- package/es/polygon/models/tile.js +25 -57
- package/es/polygon/models/water.d.ts +0 -2
- package/es/polygon/models/water.js +13 -47
- package/es/polygon/shaders/polygon_frag.glsl +2 -2
- package/es/polygon/shaders/polygon_vert.glsl +2 -2
- package/es/polygon/shaders/tile/polygon_tile_map_vert.glsl +16 -0
- package/es/polygon/shaders/tile/polygon_tile_vert.glsl +20 -60
- package/es/polygon/shaders/water/polygon_ocean_frag.glsl +1 -2
- package/es/polygon/shaders/water/polygon_ocean_vert.glsl +0 -31
- package/es/polygon/shaders/water/polygon_water_frag.glsl +1 -3
- package/es/polygon/shaders/water/polygon_water_vert.glsl +0 -29
- package/es/raster/buffers/triangulation.js +1 -4
- package/es/raster/index.js +6 -2
- package/es/raster/models/raster.d.ts +1 -1
- package/es/raster/models/raster.js +6 -5
- package/es/shader/minify_frag.glsl +7 -0
- package/es/shader/minify_picking_frag.glsl +10 -0
- package/es/tile/manager/baseMapTileLayerManager.d.ts +29 -0
- package/es/tile/manager/baseMapTileLayerManager.js +207 -0
- package/es/tile/manager/tileLayerManager.d.ts +2 -2
- package/es/tile/manager/tileLayerManager.js +12 -2
- package/es/tile/manager/tilePickerManager.d.ts +2 -3
- package/es/tile/manager/tilePickerManager.js +1 -2
- package/es/tile/models/tileModel.d.ts +1 -0
- package/es/tile/models/tileModel.js +18 -2
- package/es/tile/tileFactory/base.d.ts +1 -1
- package/es/tile/tileFactory/base.js +58 -33
- package/es/tile/tileFactory/line.js +3 -0
- package/es/tile/tileFactory/point.js +3 -0
- package/es/tile/tileFactory/polygon.js +3 -0
- package/es/tile/tileFactory/raster.js +3 -0
- package/es/tile/tileFactory/rasterData.js +3 -0
- package/es/tile/tileFactory/rasterDataLayer.js +6 -2
- package/es/tile/tileFactory/test.js +26 -5
- package/es/tile/tileFactory/vectorLayer.d.ts +4 -1
- package/es/tile/tileFactory/vectorLayer.js +110 -7
- package/es/tile/tileLayer/baseMapTileLayer.d.ts +29 -0
- package/es/tile/tileLayer/baseMapTileLayer.js +188 -0
- package/es/tile/tileLayer/baseTileLayer.d.ts +4 -4
- package/es/tile/tileLayer/baseTileLayer.js +46 -75
- package/es/tile/tileTest.d.ts +1 -0
- package/es/tile/tileTest.js +3 -2
- package/es/tile/tmsMapTileLayer.d.ts +9 -0
- package/es/tile/tmsMapTileLayer.js +119 -0
- package/es/tile/tmsTileLayer.d.ts +2 -0
- package/es/tile/tmsTileLayer.js +24 -2
- package/es/tile/utils.d.ts +4 -0
- package/es/tile/utils.js +30 -0
- package/es/utils/dataMappingStyle.js +3 -0
- package/es/utils/layerData.js +2 -2
- package/es/utils/updateShape.js +2 -2
- package/es/wind/index.js +6 -2
- package/es/wind/models/wind.js +8 -8
- package/es/wind/shaders/wind_vert.glsl +1 -1
- package/lib/Geometry/index.js +6 -2
- package/lib/Geometry/models/billboard.js +3 -7
- package/lib/Geometry/models/plane.js +5 -7
- package/lib/Geometry/models/sprite.js +4 -7
- package/lib/canvas/index.js +37 -2
- package/lib/citybuliding/building.js +6 -2
- package/lib/citybuliding/models/build.js +2 -3
- package/lib/core/BaseLayer.js +61 -85
- package/lib/core/BaseModel.js +22 -19
- package/lib/core/triangulation.js +66 -2
- package/lib/earth/index.js +3 -1
- package/lib/earth/models/atmosphere.js +4 -7
- package/lib/earth/models/base.js +12 -18
- package/lib/earth/models/bloomsphere.js +4 -8
- package/lib/earth/shaders/atmosphere_frag.glsl +1 -1
- package/lib/earth/shaders/bloomsphere_frag.glsl +1 -1
- package/lib/heatmap/index.js +7 -5
- package/lib/heatmap/models/grid.js +1 -3
- package/lib/heatmap/models/grid3d.js +4 -11
- package/lib/heatmap/models/heatmap.js +8 -9
- package/lib/heatmap/models/hexagon.js +2 -6
- package/lib/heatmap/triangulation.js +0 -1
- package/lib/image/index.js +10 -3
- package/lib/image/models/dataImage.js +13 -38
- package/lib/image/models/image.js +5 -10
- package/lib/image/models/index.js +4 -1
- package/lib/image/models/tileDataImage.js +188 -0
- package/lib/line/index.js +7 -2
- package/lib/line/models/arc.js +10 -10
- package/lib/line/models/arc_3d.js +8 -10
- package/lib/line/models/earthArc_3d.js +8 -10
- package/lib/line/models/great_circle.js +7 -7
- package/lib/line/models/half.js +3 -4
- package/lib/line/models/line.js +10 -9
- package/lib/line/models/linearline.js +3 -4
- package/lib/line/models/simpleLine.js +5 -4
- package/lib/line/models/simpleTileLine.js +115 -0
- package/lib/line/models/tile.js +50 -224
- package/lib/line/models/wall.js +11 -47
- package/lib/line/shaders/dash/arc_dash_vert.glsl +2 -0
- package/lib/line/shaders/dash/line_dash_frag.glsl +1 -1
- package/lib/line/shaders/line_arc2d_vert.glsl +2 -2
- package/lib/line/shaders/line_arc_3d_frag.glsl +10 -10
- package/lib/line/shaders/line_arc_3d_vert.glsl +5 -6
- package/lib/line/shaders/line_arc_frag.glsl +9 -10
- package/lib/line/shaders/line_arc_great_circle_frag.glsl +6 -6
- package/lib/line/shaders/line_arc_great_circle_vert.glsl +2 -3
- package/lib/line/shaders/line_arc_vert.glsl +6 -4
- package/lib/line/shaders/line_bezier_vert.glsl +2 -2
- package/lib/line/shaders/line_frag.glsl +5 -6
- package/lib/line/shaders/line_vert.glsl +1 -1
- package/lib/line/shaders/linear/arc3d_linear_frag.glsl +6 -7
- package/lib/line/shaders/linear/arc3d_linear_vert.glsl +11 -12
- package/lib/line/shaders/linear/arc_linear_frag.glsl +1 -1
- package/lib/line/shaders/tile/line_tile_map_vert.glsl +25 -0
- package/lib/line/shaders/tile/line_tile_vert.glsl +19 -177
- package/lib/line/shaders/tile/simpleline_map_vert.glsl +15 -0
- package/lib/line/shaders/tile/simpleline_vert.glsl +21 -0
- package/lib/line/shaders/{wall_frag.glsl → wall/wall_frag.glsl} +21 -25
- package/lib/line/shaders/wall/wall_vert.glsl +77 -0
- package/lib/mask/index.js +82 -5
- package/lib/mask/models/fill.js +14 -10
- package/lib/mask/shaders/mask_vert.glsl +0 -6
- package/lib/plugins/DataMappingPlugin.js +127 -57
- package/lib/plugins/DataSourcePlugin.js +3 -2
- package/lib/plugins/FeatureScalePlugin.js +6 -50
- package/lib/plugins/LayerAnimateStylePlugin.js +6 -29
- package/lib/plugins/LayerModelPlugin.js +2 -6
- package/lib/plugins/LightingPlugin.js +1 -7
- package/lib/plugins/MultiPassRendererPlugin.js +3 -19
- package/lib/plugins/PixelPickingPlugin.js +8 -28
- package/lib/plugins/RegisterStyleAttributePlugin.js +56 -5
- package/lib/plugins/UpdateStyleAttributePlugin.js +2 -9
- package/lib/point/index.js +9 -6
- package/lib/point/models/earthExtrude.js +9 -14
- package/lib/point/models/earthFill.js +2 -2
- package/lib/point/models/extrude.js +9 -12
- package/lib/point/models/fill.js +8 -9
- package/lib/point/models/fillmage.js +5 -6
- package/lib/point/models/image.js +3 -3
- package/lib/point/models/index.js +1 -1
- package/lib/point/models/normal.js +8 -61
- package/lib/point/models/radar.js +5 -70
- package/lib/point/models/simplePoint.js +1 -10
- package/lib/point/models/text.js +7 -10
- package/lib/point/models/tile.js +23 -159
- package/lib/point/models/tileText.js +98 -187
- package/lib/point/shaders/animate/wave_frag.glsl +4 -4
- package/lib/point/shaders/earth/fill_vert.glsl +0 -1
- package/lib/point/shaders/fill_vert.glsl +0 -1
- package/lib/point/shaders/normal_frag.glsl +1 -10
- package/lib/point/shaders/normal_vert.glsl +5 -60
- package/lib/point/shaders/radar/radar_frag.glsl +4 -15
- package/lib/point/shaders/radar/radar_vert.glsl +4 -54
- package/lib/point/shaders/tile/fill_tile_frag.glsl +10 -17
- package/lib/point/shaders/tile/fill_tile_vert.glsl +20 -123
- package/lib/point/shaders/tile/text_frag.glsl +33 -0
- package/lib/point/shaders/tile/text_map_frag.glsl +31 -0
- package/lib/point/shaders/tile/text_map_vert.glsl +38 -0
- package/lib/point/shaders/tile/text_vert.glsl +48 -0
- package/lib/polygon/index.js +6 -2
- package/lib/polygon/models/extrude.js +4 -8
- package/lib/polygon/models/fill.js +3 -4
- package/lib/polygon/models/ocean.js +14 -47
- package/lib/polygon/models/tile.js +24 -57
- package/lib/polygon/models/water.js +14 -47
- package/lib/polygon/shaders/polygon_frag.glsl +2 -2
- package/lib/polygon/shaders/polygon_vert.glsl +2 -2
- package/lib/polygon/shaders/tile/polygon_tile_map_vert.glsl +16 -0
- package/lib/polygon/shaders/tile/polygon_tile_vert.glsl +20 -60
- package/lib/polygon/shaders/water/polygon_ocean_frag.glsl +1 -2
- package/lib/polygon/shaders/water/polygon_ocean_vert.glsl +0 -31
- package/lib/polygon/shaders/water/polygon_water_frag.glsl +1 -3
- package/lib/polygon/shaders/water/polygon_water_vert.glsl +0 -29
- package/lib/raster/buffers/triangulation.js +1 -4
- package/lib/raster/index.js +6 -2
- package/lib/raster/models/raster.js +6 -5
- package/lib/shader/minify_frag.glsl +7 -0
- package/lib/shader/minify_picking_frag.glsl +10 -0
- package/lib/tile/manager/baseMapTileLayerManager.js +222 -0
- package/lib/tile/manager/tileLayerManager.js +12 -2
- package/lib/tile/manager/tilePickerManager.js +1 -2
- package/lib/tile/models/tileModel.js +19 -2
- package/lib/tile/tileFactory/base.js +60 -33
- package/lib/tile/tileFactory/line.js +3 -0
- package/lib/tile/tileFactory/point.js +3 -0
- package/lib/tile/tileFactory/polygon.js +3 -0
- package/lib/tile/tileFactory/raster.js +3 -0
- package/lib/tile/tileFactory/rasterData.js +3 -0
- package/lib/tile/tileFactory/rasterDataLayer.js +6 -2
- package/lib/tile/tileFactory/test.js +26 -5
- package/lib/tile/tileFactory/vectorLayer.js +112 -8
- package/lib/tile/tileLayer/baseMapTileLayer.js +195 -0
- package/lib/tile/tileLayer/baseTileLayer.js +46 -75
- package/lib/tile/tileTest.js +3 -2
- package/lib/tile/tmsMapTileLayer.js +136 -0
- package/lib/tile/tmsTileLayer.js +25 -2
- package/lib/tile/utils.js +38 -0
- package/lib/utils/dataMappingStyle.js +3 -0
- package/lib/utils/layerData.js +2 -2
- package/lib/utils/updateShape.js +2 -2
- package/lib/wind/index.js +6 -2
- package/lib/wind/models/wind.js +7 -7
- package/lib/wind/shaders/wind_vert.glsl +1 -1
- package/package.json +8 -7
- package/es/line/shaders/tile/line_tile_frag.glsl +0 -79
- package/es/line/shaders/wall_vert.glsl +0 -111
- package/es/mask/shaders/mask_frag.glsl +0 -7
- package/es/polygon/shaders/tile/polygon_tile_frag.glsl +0 -12
- package/lib/line/shaders/tile/line_tile_frag.glsl +0 -79
- package/lib/line/shaders/wall_vert.glsl +0 -111
- package/lib/mask/shaders/mask_frag.glsl +0 -7
- package/lib/polygon/shaders/tile/polygon_tile_frag.glsl +0 -12
package/lib/earth/models/base.js
CHANGED
|
@@ -65,7 +65,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
65
65
|
value: function getUninforms() {
|
|
66
66
|
var _this$layer$getLayerC = this.layer.getLayerConfig(),
|
|
67
67
|
animateOption = _this$layer$getLayerC.animateOption,
|
|
68
|
-
|
|
68
|
+
globalOptions = _this$layer$getLayerC.globalOptions;
|
|
69
69
|
|
|
70
70
|
if (animateOption !== null && animateOption !== void 0 && animateOption.enable) {
|
|
71
71
|
// @ts-ignore
|
|
@@ -80,13 +80,12 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
return {
|
|
83
|
-
u_ambientRatio: (
|
|
83
|
+
u_ambientRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.ambientRatio) || 0.6,
|
|
84
84
|
// 环境光
|
|
85
|
-
u_diffuseRatio: (
|
|
85
|
+
u_diffuseRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.diffuseRatio) || 0.4,
|
|
86
86
|
// 漫反射
|
|
87
|
-
u_specularRatio: (
|
|
87
|
+
u_specularRatio: (globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.specularRatio) || 0.1,
|
|
88
88
|
// 高光反射
|
|
89
|
-
// u_sunLight: [120, 120, 120],
|
|
90
89
|
u_sunLight: [this.sunX, this.sunY, this.sunZ],
|
|
91
90
|
u_texture: this.texture
|
|
92
91
|
};
|
|
@@ -98,7 +97,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
98
97
|
this.sunY = 10;
|
|
99
98
|
this.sunX = Math.cos(this.earthTime) * (this.sunRadius - this.sunY);
|
|
100
99
|
this.sunZ = Math.sin(this.earthTime) * (this.sunRadius - this.sunY);
|
|
101
|
-
this.layerService.
|
|
100
|
+
this.layerService.throttleRenderLayers();
|
|
102
101
|
}
|
|
103
102
|
}, {
|
|
104
103
|
key: "initModels",
|
|
@@ -106,10 +105,10 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
106
105
|
var _this2 = this;
|
|
107
106
|
|
|
108
107
|
var _this$layer$getLayerC2 = this.layer.getLayerConfig(),
|
|
109
|
-
|
|
108
|
+
globalOptions = _this$layer$getLayerC2.globalOptions;
|
|
110
109
|
|
|
111
|
-
if ((
|
|
112
|
-
this.setEarthTime(
|
|
110
|
+
if ((globalOptions === null || globalOptions === void 0 ? void 0 : globalOptions.earthTime) !== undefined) {
|
|
111
|
+
this.setEarthTime(globalOptions.earthTime);
|
|
113
112
|
}
|
|
114
113
|
|
|
115
114
|
var source = this.layer.getSource();
|
|
@@ -125,9 +124,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
125
124
|
height: imageData[0].height
|
|
126
125
|
});
|
|
127
126
|
|
|
128
|
-
_this2.layerService.
|
|
129
|
-
|
|
130
|
-
_this2.layerService.renderLayers();
|
|
127
|
+
_this2.layerService.reRender();
|
|
131
128
|
});
|
|
132
129
|
this.buildModels(callbackModel);
|
|
133
130
|
}
|
|
@@ -139,7 +136,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
139
136
|
}, {
|
|
140
137
|
key: "buildModels",
|
|
141
138
|
value: function buildModels(callbackModel) {
|
|
142
|
-
//
|
|
139
|
+
// Tip: 调整图层的绘制顺序 地球大气层
|
|
143
140
|
this.layer.zIndex = -998;
|
|
144
141
|
this.layer.buildLayerModel({
|
|
145
142
|
moduleName: 'earthBase',
|
|
@@ -160,20 +157,18 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
160
157
|
}, {
|
|
161
158
|
key: "registerBuiltinAttributes",
|
|
162
159
|
value: function registerBuiltinAttributes() {
|
|
163
|
-
// point layer size;
|
|
164
160
|
this.styleAttributeService.registerStyleAttribute({
|
|
165
161
|
name: 'size',
|
|
166
162
|
type: _l7Core.AttributeType.Attribute,
|
|
167
163
|
descriptor: {
|
|
168
164
|
name: 'a_Size',
|
|
169
165
|
buffer: {
|
|
170
|
-
// give the WebGL driver a hint that this buffer may change
|
|
171
166
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
172
167
|
data: [],
|
|
173
168
|
type: _l7Core.gl.FLOAT
|
|
174
169
|
},
|
|
175
170
|
size: 1,
|
|
176
|
-
update: function update(feature
|
|
171
|
+
update: function update(feature) {
|
|
177
172
|
var _feature$size = feature.size,
|
|
178
173
|
size = _feature$size === void 0 ? 1 : _feature$size;
|
|
179
174
|
return Array.isArray(size) ? [size[0]] : [size];
|
|
@@ -186,7 +181,6 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
186
181
|
descriptor: {
|
|
187
182
|
name: 'a_Normal',
|
|
188
183
|
buffer: {
|
|
189
|
-
// give the WebGL driver a hint that this buffer may change
|
|
190
184
|
usage: _l7Core.gl.STATIC_DRAW,
|
|
191
185
|
data: [],
|
|
192
186
|
type: _l7Core.gl.FLOAT
|
|
@@ -209,7 +203,7 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
209
203
|
type: _l7Core.gl.FLOAT
|
|
210
204
|
},
|
|
211
205
|
size: 2,
|
|
212
|
-
update: function update(feature, featureIdx, vertex
|
|
206
|
+
update: function update(feature, featureIdx, vertex) {
|
|
213
207
|
return [vertex[3], vertex[4]];
|
|
214
208
|
}
|
|
215
209
|
}
|
|
@@ -30,7 +30,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
|
|
|
30
30
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
31
31
|
|
|
32
32
|
/* babel-plugin-inline-import '../shaders/bloomsphere_frag.glsl' */
|
|
33
|
-
var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n float intensity = - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n //
|
|
33
|
+
var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;\nvarying vec3 vVertexNormal;\n\nvarying vec4 v_Color;\nvoid main() {\n\n\n float intensity = - dot(normalize(vVertexNormal), normalize(u_CameraPosition));\n // \u53BB\u9664\u80CC\u9762\n if(intensity > 1.0) intensity = 0.0;\n\n gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);\n}\n";
|
|
34
34
|
|
|
35
35
|
/* babel-plugin-inline-import '../shaders/bloomsphere_vert.glsl' */
|
|
36
36
|
var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\n\nvoid main() {\n v_Color = a_Color;\n\n vVertexNormal = a_Normal;\n\n gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
|
|
@@ -69,7 +69,7 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
69
69
|
}, {
|
|
70
70
|
key: "buildModels",
|
|
71
71
|
value: function buildModels(callbackModel) {
|
|
72
|
-
//
|
|
72
|
+
// Tip: 调整图层的绘制顺序,让它保持在地球后面(减少锯齿现象)
|
|
73
73
|
this.layer.zIndex = -999;
|
|
74
74
|
this.layer.buildLayerModel({
|
|
75
75
|
moduleName: 'earthBloom',
|
|
@@ -90,20 +90,18 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
90
90
|
}, {
|
|
91
91
|
key: "registerBuiltinAttributes",
|
|
92
92
|
value: function registerBuiltinAttributes() {
|
|
93
|
-
// point layer size;
|
|
94
93
|
this.styleAttributeService.registerStyleAttribute({
|
|
95
94
|
name: 'size',
|
|
96
95
|
type: _l7Core.AttributeType.Attribute,
|
|
97
96
|
descriptor: {
|
|
98
97
|
name: 'a_Size',
|
|
99
98
|
buffer: {
|
|
100
|
-
// give the WebGL driver a hint that this buffer may change
|
|
101
99
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
102
100
|
data: [],
|
|
103
101
|
type: _l7Core.gl.FLOAT
|
|
104
102
|
},
|
|
105
103
|
size: 1,
|
|
106
|
-
update: function update(feature
|
|
104
|
+
update: function update(feature) {
|
|
107
105
|
var _feature$size = feature.size,
|
|
108
106
|
size = _feature$size === void 0 ? 1 : _feature$size;
|
|
109
107
|
return Array.isArray(size) ? [size[0]] : [size];
|
|
@@ -116,7 +114,6 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
116
114
|
descriptor: {
|
|
117
115
|
name: 'a_Normal',
|
|
118
116
|
buffer: {
|
|
119
|
-
// give the WebGL driver a hint that this buffer may change
|
|
120
117
|
usage: _l7Core.gl.STATIC_DRAW,
|
|
121
118
|
data: [],
|
|
122
119
|
type: _l7Core.gl.FLOAT
|
|
@@ -133,13 +130,12 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
133
130
|
descriptor: {
|
|
134
131
|
name: 'a_Uv',
|
|
135
132
|
buffer: {
|
|
136
|
-
// give the WebGL driver a hint that this buffer may change
|
|
137
133
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
138
134
|
data: [],
|
|
139
135
|
type: _l7Core.gl.FLOAT
|
|
140
136
|
},
|
|
141
137
|
size: 2,
|
|
142
|
-
update: function update(feature, featureIdx, vertex
|
|
138
|
+
update: function update(feature, featureIdx, vertex) {
|
|
143
139
|
return [vertex[3], vertex[4]];
|
|
144
140
|
}
|
|
145
141
|
}
|
|
@@ -10,7 +10,7 @@ void main() {
|
|
|
10
10
|
|
|
11
11
|
// float intensity = pow(0.5 + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
|
|
12
12
|
float intensity = pow(v_offset + dot(normalize(vVertexNormal), normalize(u_CameraPosition)), 3.0);
|
|
13
|
-
//
|
|
13
|
+
// 去除背面
|
|
14
14
|
if(intensity > 1.0) intensity = 0.0;
|
|
15
15
|
|
|
16
16
|
gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
|
package/lib/heatmap/index.js
CHANGED
|
@@ -58,7 +58,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
58
58
|
this.layerModel.initModels(function (models) {
|
|
59
59
|
_this2.models = models;
|
|
60
60
|
|
|
61
|
-
_this2.
|
|
61
|
+
_this2.emit('modelLoaded', null);
|
|
62
|
+
|
|
63
|
+
_this2.layerService.throttleRenderLayers();
|
|
62
64
|
});
|
|
63
65
|
}
|
|
64
66
|
}, {
|
|
@@ -67,7 +69,9 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
67
69
|
var _this3 = this;
|
|
68
70
|
|
|
69
71
|
this.layerModel.buildModels(function (models) {
|
|
70
|
-
|
|
72
|
+
_this3.models = models;
|
|
73
|
+
|
|
74
|
+
_this3.emit('modelLoaded', null);
|
|
71
75
|
});
|
|
72
76
|
}
|
|
73
77
|
}, {
|
|
@@ -88,9 +92,7 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
88
92
|
if (this.layerModelNeedUpdate) {
|
|
89
93
|
this.layerModel.buildModels(function (models) {
|
|
90
94
|
return _this4.models = models;
|
|
91
|
-
});
|
|
92
|
-
// this.models = this.layerModel.buildModels();
|
|
93
|
-
|
|
95
|
+
});
|
|
94
96
|
this.layerModelNeedUpdate = false;
|
|
95
97
|
}
|
|
96
98
|
|
|
@@ -101,14 +101,12 @@ var GridModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
101
101
|
descriptor: {
|
|
102
102
|
name: 'a_Pos',
|
|
103
103
|
buffer: {
|
|
104
|
-
// give the WebGL driver a hint that this buffer may change
|
|
105
104
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
106
105
|
data: [],
|
|
107
106
|
type: _l7Core.gl.FLOAT
|
|
108
107
|
},
|
|
109
108
|
size: 3,
|
|
110
|
-
update: function update(feature
|
|
111
|
-
// const coordinates = feature.coordinates as number[];
|
|
109
|
+
update: function update(feature) {
|
|
112
110
|
var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
|
|
113
111
|
return [coordinates[0], coordinates[1], 0];
|
|
114
112
|
}
|
|
@@ -95,33 +95,29 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
95
95
|
}, {
|
|
96
96
|
key: "registerBuiltinAttributes",
|
|
97
97
|
value: function registerBuiltinAttributes() {
|
|
98
|
-
// point layer size;
|
|
99
98
|
this.styleAttributeService.registerStyleAttribute({
|
|
100
99
|
name: 'size',
|
|
101
100
|
type: _l7Core.AttributeType.Attribute,
|
|
102
101
|
descriptor: {
|
|
103
102
|
name: 'a_Size',
|
|
104
103
|
buffer: {
|
|
105
|
-
// give the WebGL driver a hint that this buffer may change
|
|
106
104
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
107
105
|
data: [],
|
|
108
106
|
type: _l7Core.gl.FLOAT
|
|
109
107
|
},
|
|
110
108
|
size: 1,
|
|
111
|
-
update: function update(feature
|
|
109
|
+
update: function update(feature) {
|
|
112
110
|
var size = feature.size;
|
|
113
111
|
return Array.isArray(size) ? [size[0]] : [size];
|
|
114
112
|
}
|
|
115
113
|
}
|
|
116
|
-
});
|
|
117
|
-
|
|
114
|
+
});
|
|
118
115
|
this.styleAttributeService.registerStyleAttribute({
|
|
119
116
|
name: 'normal',
|
|
120
117
|
type: _l7Core.AttributeType.Attribute,
|
|
121
118
|
descriptor: {
|
|
122
119
|
name: 'a_Normal',
|
|
123
120
|
buffer: {
|
|
124
|
-
// give the WebGL driver a hint that this buffer may change
|
|
125
121
|
usage: _l7Core.gl.STATIC_DRAW,
|
|
126
122
|
data: [],
|
|
127
123
|
type: _l7Core.gl.FLOAT
|
|
@@ -139,16 +135,13 @@ var Grid3DModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
139
135
|
descriptor: {
|
|
140
136
|
name: 'a_Pos',
|
|
141
137
|
buffer: {
|
|
142
|
-
// give the WebGL driver a hint that this buffer may change
|
|
143
138
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
144
139
|
data: [],
|
|
145
140
|
type: _l7Core.gl.FLOAT
|
|
146
141
|
},
|
|
147
142
|
size: 3,
|
|
148
|
-
update: function update(feature
|
|
149
|
-
var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
|
|
150
|
-
// const coordinates = feature.originCoordinates as number[];
|
|
151
|
-
|
|
143
|
+
update: function update(feature) {
|
|
144
|
+
var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
|
|
152
145
|
return [coordinates[0], coordinates[1], 0];
|
|
153
146
|
}
|
|
154
147
|
}
|
|
@@ -110,13 +110,13 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
110
110
|
var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(callbackModel) {
|
|
111
111
|
var _shapeAttr$scale;
|
|
112
112
|
|
|
113
|
-
var _this$rendererService2, createFramebuffer,
|
|
113
|
+
var _this$rendererService2, createFramebuffer, getViewportSize, createTexture2D, shapeAttr, shapeType, _getViewportSize, width, height;
|
|
114
114
|
|
|
115
115
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
116
116
|
while (1) {
|
|
117
117
|
switch (_context.prev = _context.next) {
|
|
118
118
|
case 0:
|
|
119
|
-
_this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer,
|
|
119
|
+
_this$rendererService2 = this.rendererService, createFramebuffer = _this$rendererService2.createFramebuffer, getViewportSize = _this$rendererService2.getViewportSize, createTexture2D = _this$rendererService2.createTexture2D;
|
|
120
120
|
shapeAttr = this.styleAttributeService.getLayerStyleAttribute('shape');
|
|
121
121
|
shapeType = (shapeAttr === null || shapeAttr === void 0 ? void 0 : (_shapeAttr$scale = shapeAttr.scale) === null || _shapeAttr$scale === void 0 ? void 0 : _shapeAttr$scale.field) || 'heatmap';
|
|
122
122
|
this.shapeType = shapeType; // 生成热力图密度图
|
|
@@ -174,18 +174,16 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
174
174
|
descriptor: {
|
|
175
175
|
name: 'a_Dir',
|
|
176
176
|
buffer: {
|
|
177
|
-
// give the WebGL driver a hint that this buffer may change
|
|
178
177
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
179
178
|
data: [],
|
|
180
179
|
type: _l7Core.gl.FLOAT
|
|
181
180
|
},
|
|
182
181
|
size: 2,
|
|
183
|
-
update: function update(feature, featureIdx, vertex
|
|
182
|
+
update: function update(feature, featureIdx, vertex) {
|
|
184
183
|
return [vertex[3], vertex[4]];
|
|
185
184
|
}
|
|
186
185
|
}
|
|
187
|
-
});
|
|
188
|
-
|
|
186
|
+
});
|
|
189
187
|
this.styleAttributeService.registerStyleAttribute({
|
|
190
188
|
name: 'size',
|
|
191
189
|
type: _l7Core.AttributeType.Attribute,
|
|
@@ -198,7 +196,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
198
196
|
type: _l7Core.gl.FLOAT
|
|
199
197
|
},
|
|
200
198
|
size: 1,
|
|
201
|
-
update: function update(feature
|
|
199
|
+
update: function update(feature) {
|
|
202
200
|
var _feature$size = feature.size,
|
|
203
201
|
size = _feature$size === void 0 ? 1 : _feature$size;
|
|
204
202
|
return [size];
|
|
@@ -237,7 +235,8 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
237
235
|
dstRGB: _l7Core.gl.ONE,
|
|
238
236
|
dstAlpha: 1
|
|
239
237
|
}
|
|
240
|
-
}
|
|
238
|
+
},
|
|
239
|
+
pick: false
|
|
241
240
|
});
|
|
242
241
|
|
|
243
242
|
case 3:
|
|
@@ -283,6 +282,7 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
283
282
|
createBuffer = _this$rendererService3.createBuffer,
|
|
284
283
|
createModel = _this$rendererService3.createModel;
|
|
285
284
|
return createModel({
|
|
285
|
+
pick: false,
|
|
286
286
|
vs: vs,
|
|
287
287
|
fs: fs,
|
|
288
288
|
attributes: {
|
|
@@ -306,7 +306,6 @@ var HeatMapModel = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE
|
|
|
306
306
|
enable: false
|
|
307
307
|
},
|
|
308
308
|
blend: this.getBlend(),
|
|
309
|
-
// count: 6,
|
|
310
309
|
elements: createElements({
|
|
311
310
|
data: [0, 2, 1, 2, 3, 1],
|
|
312
311
|
type: _l7Core.gl.UNSIGNED_INT,
|
|
@@ -102,17 +102,13 @@ var HexagonModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
102
102
|
descriptor: {
|
|
103
103
|
name: 'a_Pos',
|
|
104
104
|
buffer: {
|
|
105
|
-
// give the WebGL driver a hint that this buffer may change
|
|
106
105
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
107
106
|
data: [],
|
|
108
107
|
type: _l7Core.gl.FLOAT
|
|
109
108
|
},
|
|
110
109
|
size: 3,
|
|
111
|
-
update: function update(feature
|
|
112
|
-
|
|
113
|
-
var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates; // const coordinates = feature.coordinates as number[];
|
|
114
|
-
// const coordinates = feature.originCoordinates as number[];
|
|
115
|
-
|
|
110
|
+
update: function update(feature) {
|
|
111
|
+
var coordinates = feature.version === 'GAODE2.x' ? feature.originCoordinates : feature.coordinates;
|
|
116
112
|
return [coordinates[0], coordinates[1], 0];
|
|
117
113
|
}
|
|
118
114
|
}
|
package/lib/image/index.js
CHANGED
|
@@ -58,7 +58,9 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
58
58
|
this.layerModel.initModels(function (models) {
|
|
59
59
|
_this2.models = models;
|
|
60
60
|
|
|
61
|
-
_this2.
|
|
61
|
+
_this2.emit('modelLoaded', null);
|
|
62
|
+
|
|
63
|
+
_this2.layerService.throttleRenderLayers();
|
|
62
64
|
});
|
|
63
65
|
}
|
|
64
66
|
}, {
|
|
@@ -67,7 +69,9 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
67
69
|
var _this3 = this;
|
|
68
70
|
|
|
69
71
|
this.layerModel.buildModels(function (models) {
|
|
70
|
-
|
|
72
|
+
_this3.models = models;
|
|
73
|
+
|
|
74
|
+
_this3.emit('modelLoaded', null);
|
|
71
75
|
});
|
|
72
76
|
}
|
|
73
77
|
}, {
|
|
@@ -89,7 +93,8 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
89
93
|
var type = this.getModelType();
|
|
90
94
|
var defaultConfig = {
|
|
91
95
|
image: {},
|
|
92
|
-
dataImage: {}
|
|
96
|
+
dataImage: {},
|
|
97
|
+
tileDataImage: {}
|
|
93
98
|
};
|
|
94
99
|
return defaultConfig[type];
|
|
95
100
|
}
|
|
@@ -105,6 +110,8 @@ var ImageLayer = /*#__PURE__*/function (_BaseLayer) {
|
|
|
105
110
|
return 'dataImage';
|
|
106
111
|
} else if (shape === 'image') {
|
|
107
112
|
return 'image';
|
|
113
|
+
} else if (shape === 'tileDataImage') {
|
|
114
|
+
return 'tileDataImage';
|
|
108
115
|
} else {
|
|
109
116
|
return 'image';
|
|
110
117
|
}
|
|
@@ -73,7 +73,7 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
73
73
|
pixelConstantRGB = _ref$pixelConstantRGB === void 0 ? 0.1 : _ref$pixelConstantRGB;
|
|
74
74
|
|
|
75
75
|
if (!(0, _lodash.isEqual)(this.rampColors, rampColors)) {
|
|
76
|
-
this.
|
|
76
|
+
this.updateColorTexture();
|
|
77
77
|
this.rampColors = rampColors;
|
|
78
78
|
}
|
|
79
79
|
|
|
@@ -111,39 +111,15 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
111
111
|
height: 0,
|
|
112
112
|
width: 0
|
|
113
113
|
});
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
img.crossOrigin = 'anonymous';
|
|
120
|
-
img.src = source.data.originData;
|
|
121
|
-
|
|
122
|
-
img.onload = function () {
|
|
123
|
-
_this.texture = createTexture2D({
|
|
124
|
-
data: img,
|
|
125
|
-
width: img.width,
|
|
126
|
-
height: img.height
|
|
127
|
-
});
|
|
128
|
-
|
|
129
|
-
_this.layerService.updateLayerRenderList();
|
|
130
|
-
|
|
131
|
-
_this.layerService.renderLayers();
|
|
132
|
-
};
|
|
133
|
-
} else {
|
|
134
|
-
source.data.images.then(function (imageData) {
|
|
135
|
-
_this.texture = createTexture2D({
|
|
136
|
-
data: imageData[0],
|
|
137
|
-
width: imageData[0].width,
|
|
138
|
-
height: imageData[0].height
|
|
139
|
-
});
|
|
140
|
-
|
|
141
|
-
_this.layerService.updateLayerRenderList();
|
|
142
|
-
|
|
143
|
-
_this.layerService.renderLayers();
|
|
114
|
+
source.data.images.then(function (imageData) {
|
|
115
|
+
_this.texture = createTexture2D({
|
|
116
|
+
data: imageData[0],
|
|
117
|
+
width: imageData[0].width,
|
|
118
|
+
height: imageData[0].height
|
|
144
119
|
});
|
|
145
|
-
}
|
|
146
120
|
|
|
121
|
+
_this.layerService.reRender();
|
|
122
|
+
});
|
|
147
123
|
var rampImageData = rampColorsData ? rampColorsData : (0, _l7Utils.generateColorRamp)(rampColors);
|
|
148
124
|
this.colorTexture = createTexture2D({
|
|
149
125
|
data: rampImageData.data,
|
|
@@ -161,7 +137,8 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
161
137
|
enable: false
|
|
162
138
|
},
|
|
163
139
|
blend: this.getBlend(),
|
|
164
|
-
stencil: (0, _l7Utils.getMask)(mask, maskInside)
|
|
140
|
+
stencil: (0, _l7Utils.getMask)(mask, maskInside),
|
|
141
|
+
pick: false
|
|
165
142
|
}).then(function (model) {
|
|
166
143
|
callbackModel([model]);
|
|
167
144
|
}).catch(function (err) {
|
|
@@ -198,28 +175,26 @@ var ImageDataModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
198
175
|
}, {
|
|
199
176
|
key: "registerBuiltinAttributes",
|
|
200
177
|
value: function registerBuiltinAttributes() {
|
|
201
|
-
// point layer size;
|
|
202
178
|
this.styleAttributeService.registerStyleAttribute({
|
|
203
179
|
name: 'uv',
|
|
204
180
|
type: _l7Core.AttributeType.Attribute,
|
|
205
181
|
descriptor: {
|
|
206
182
|
name: 'a_Uv',
|
|
207
183
|
buffer: {
|
|
208
|
-
// give the WebGL driver a hint that this buffer may change
|
|
209
184
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
210
185
|
data: [],
|
|
211
186
|
type: _l7Core.gl.FLOAT
|
|
212
187
|
},
|
|
213
188
|
size: 2,
|
|
214
|
-
update: function update(feature, featureIdx, vertex
|
|
189
|
+
update: function update(feature, featureIdx, vertex) {
|
|
215
190
|
return [vertex[3], vertex[4]];
|
|
216
191
|
}
|
|
217
192
|
}
|
|
218
193
|
});
|
|
219
194
|
}
|
|
220
195
|
}, {
|
|
221
|
-
key: "
|
|
222
|
-
value: function
|
|
196
|
+
key: "updateColorTexture",
|
|
197
|
+
value: function updateColorTexture() {
|
|
223
198
|
var createTexture2D = this.rendererService.createTexture2D;
|
|
224
199
|
|
|
225
200
|
var _ref3 = this.layer.getLayerConfig(),
|
|
@@ -88,9 +88,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
88
88
|
height: img.height
|
|
89
89
|
});
|
|
90
90
|
|
|
91
|
-
_this.layerService.
|
|
92
|
-
|
|
93
|
-
_this.layerService.renderLayers();
|
|
91
|
+
_this.layerService.reRender();
|
|
94
92
|
};
|
|
95
93
|
} else {
|
|
96
94
|
source.data.images.then(function (imageData) {
|
|
@@ -102,9 +100,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
102
100
|
min: _l7Core.gl.LINEAR
|
|
103
101
|
});
|
|
104
102
|
|
|
105
|
-
_this.layerService.
|
|
106
|
-
|
|
107
|
-
_this.layerService.renderLayers();
|
|
103
|
+
_this.layerService.reRender();
|
|
108
104
|
});
|
|
109
105
|
}
|
|
110
106
|
|
|
@@ -121,7 +117,8 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
121
117
|
depth: {
|
|
122
118
|
enable: false
|
|
123
119
|
},
|
|
124
|
-
stencil: (0, _l7Utils.getMask)(mask, maskInside)
|
|
120
|
+
stencil: (0, _l7Utils.getMask)(mask, maskInside),
|
|
121
|
+
pick: false
|
|
125
122
|
}).then(function (model) {
|
|
126
123
|
callbackModel([model]);
|
|
127
124
|
}).catch(function (err) {
|
|
@@ -157,20 +154,18 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
157
154
|
}, {
|
|
158
155
|
key: "registerBuiltinAttributes",
|
|
159
156
|
value: function registerBuiltinAttributes() {
|
|
160
|
-
// point layer size;
|
|
161
157
|
this.styleAttributeService.registerStyleAttribute({
|
|
162
158
|
name: 'uv',
|
|
163
159
|
type: _l7Core.AttributeType.Attribute,
|
|
164
160
|
descriptor: {
|
|
165
161
|
name: 'a_Uv',
|
|
166
162
|
buffer: {
|
|
167
|
-
// give the WebGL driver a hint that this buffer may change
|
|
168
163
|
usage: _l7Core.gl.DYNAMIC_DRAW,
|
|
169
164
|
data: [],
|
|
170
165
|
type: _l7Core.gl.FLOAT
|
|
171
166
|
},
|
|
172
167
|
size: 2,
|
|
173
|
-
update: function update(feature, featureIdx, vertex
|
|
168
|
+
update: function update(feature, featureIdx, vertex) {
|
|
174
169
|
return [vertex[3], vertex[4]];
|
|
175
170
|
}
|
|
176
171
|
}
|
|
@@ -11,9 +11,12 @@ var _dataImage = _interopRequireDefault(require("./dataImage"));
|
|
|
11
11
|
|
|
12
12
|
var _image = _interopRequireDefault(require("./image"));
|
|
13
13
|
|
|
14
|
+
var _tileDataImage = _interopRequireDefault(require("./tileDataImage"));
|
|
15
|
+
|
|
14
16
|
var ImageModels = {
|
|
15
17
|
image: _image.default,
|
|
16
|
-
dataImage: _dataImage.default
|
|
18
|
+
dataImage: _dataImage.default,
|
|
19
|
+
tileDataImage: _tileDataImage.default
|
|
17
20
|
};
|
|
18
21
|
var _default = ImageModels;
|
|
19
22
|
exports.default = _default;
|