@antv/l7-layers 2.10.2 → 2.10.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.d.ts +3 -2
- package/es/Geometry/index.js +24 -34
- package/es/Geometry/models/billboard.d.ts +2 -2
- package/es/Geometry/models/billboard.js +45 -85
- package/es/Geometry/models/plane.d.ts +2 -2
- package/es/Geometry/models/plane.js +49 -89
- package/es/Geometry/models/sprite.d.ts +2 -2
- package/es/Geometry/models/sprite.js +54 -92
- package/es/canvas/index.d.ts +3 -2
- package/es/canvas/index.js +26 -36
- package/es/canvas/models/canvas.d.ts +2 -2
- package/es/canvas/models/canvas.js +23 -62
- package/es/citybuliding/building.d.ts +3 -2
- package/es/citybuliding/building.js +24 -33
- package/es/citybuliding/models/build.d.ts +2 -2
- package/es/citybuliding/models/build.js +31 -76
- package/es/core/BaseLayer.d.ts +18 -21
- package/es/core/BaseLayer.js +273 -393
- package/es/core/BaseModel.d.ts +2 -2
- package/es/core/BaseModel.js +13 -54
- package/es/core/shape/Path.js +1 -1
- package/es/core/shape/extrude.js +1 -1
- package/es/core/triangulation.js +3 -10
- package/es/earth/index.d.ts +2 -2
- package/es/earth/index.js +16 -35
- package/es/earth/models/atmosphere.d.ts +2 -2
- package/es/earth/models/atmosphere.js +27 -72
- package/es/earth/models/base.d.ts +2 -2
- package/es/earth/models/base.js +50 -96
- package/es/earth/models/bloomsphere.d.ts +2 -2
- package/es/earth/models/bloomsphere.js +27 -72
- package/es/earth/utils.js +1 -1
- package/es/heatmap/index.d.ts +3 -2
- package/es/heatmap/index.js +29 -40
- package/es/heatmap/models/grid.d.ts +2 -2
- package/es/heatmap/models/grid.js +32 -73
- package/es/heatmap/models/grid3d.d.ts +2 -2
- package/es/heatmap/models/grid3d.js +33 -74
- package/es/heatmap/models/heatmap.d.ts +2 -2
- package/es/heatmap/models/heatmap.js +22 -48
- package/es/heatmap/models/hexagon.d.ts +2 -2
- package/es/heatmap/models/hexagon.js +33 -74
- package/es/image/index.d.ts +3 -2
- package/es/image/index.js +24 -34
- package/es/image/models/dataImage.d.ts +2 -2
- package/es/image/models/dataImage.js +59 -98
- package/es/image/models/image.d.ts +2 -2
- package/es/image/models/image.js +72 -113
- package/es/image/models/tileDataImage.d.ts +2 -2
- package/es/image/models/tileDataImage.js +48 -89
- package/es/index.d.ts +2 -2
- package/es/index.js +2 -2
- package/es/line/index.d.ts +4 -5
- package/es/line/index.js +32 -58
- package/es/line/models/arc.d.ts +2 -2
- package/es/line/models/arc.js +45 -80
- package/es/line/models/arc_3d.d.ts +2 -2
- package/es/line/models/arc_3d.js +41 -76
- package/es/line/models/earthArc_3d.d.ts +2 -2
- package/es/line/models/earthArc_3d.js +44 -79
- package/es/line/models/great_circle.d.ts +2 -2
- package/es/line/models/great_circle.js +36 -77
- package/es/line/models/half.d.ts +2 -2
- package/es/line/models/half.js +23 -46
- package/es/line/models/index.d.ts +1 -1
- package/es/line/models/index.js +2 -0
- package/es/line/models/line.d.ts +2 -2
- package/es/line/models/line.js +54 -86
- package/es/line/models/linearline.d.ts +2 -2
- package/es/line/models/linearline.js +38 -77
- package/es/line/models/simpleLine.d.ts +2 -2
- package/es/line/models/simpleLine.js +39 -76
- package/es/line/models/simpleTileLine.d.ts +2 -2
- package/es/line/models/simpleTileLine.js +35 -75
- package/es/line/models/tile.d.ts +2 -2
- package/es/line/models/tile.js +23 -46
- package/es/line/models/wall.d.ts +2 -2
- package/es/line/models/wall.js +29 -74
- package/es/mask/index.d.ts +4 -2
- package/es/mask/index.js +104 -34
- package/es/mask/models/fill.d.ts +2 -2
- package/es/mask/models/fill.js +22 -46
- package/es/mask/models/index.d.ts +1 -1
- package/es/mask/models/index.js +3 -1
- package/es/plugins/DataMappingPlugin.js +72 -83
- package/es/plugins/DataSourcePlugin.js +32 -68
- package/es/plugins/FeatureScalePlugin.js +48 -88
- package/es/plugins/LayerAnimateStylePlugin.js +3 -3
- package/es/plugins/LayerModelPlugin.d.ts +2 -2
- package/es/plugins/LayerModelPlugin.js +39 -126
- package/es/plugins/LayerStylePlugin.js +8 -3
- package/es/plugins/LightingPlugin.js +4 -4
- package/es/plugins/MultiPassRendererPlugin.js +3 -3
- package/es/plugins/PixelPickingPlugin.js +3 -3
- package/es/plugins/RegisterStyleAttributePlugin.js +18 -3
- package/es/plugins/ShaderUniformPlugin.js +6 -6
- package/es/plugins/UpdateModelPlugin.js +2 -2
- package/es/plugins/UpdateStyleAttributePlugin.js +5 -6
- package/es/point/index.d.ts +4 -4
- package/es/point/index.js +30 -62
- package/es/point/models/earthExtrude.d.ts +2 -2
- package/es/point/models/earthExtrude.js +37 -80
- package/es/point/models/earthFill.d.ts +2 -2
- package/es/point/models/earthFill.js +28 -73
- package/es/point/models/extrude.d.ts +2 -2
- package/es/point/models/extrude.js +25 -48
- package/es/point/models/fill.d.ts +2 -2
- package/es/point/models/fill.js +28 -51
- package/es/point/models/fillmage.d.ts +2 -2
- package/es/point/models/fillmage.js +51 -90
- package/es/point/models/image.d.ts +2 -2
- package/es/point/models/image.js +38 -79
- package/es/point/models/index.d.ts +1 -1
- package/es/point/models/index.js +2 -0
- package/es/point/models/normal.d.ts +2 -2
- package/es/point/models/normal.js +36 -77
- package/es/point/models/radar.d.ts +2 -2
- package/es/point/models/radar.js +43 -83
- package/es/point/models/simplePoint.d.ts +2 -2
- package/es/point/models/simplePoint.js +35 -76
- package/es/point/models/text.d.ts +2 -3
- package/es/point/models/text.js +116 -173
- package/es/point/models/tile.d.ts +2 -2
- package/es/point/models/tile.js +40 -82
- package/es/point/models/tileText.d.ts +2 -2
- package/es/point/models/tileText.js +125 -160
- package/es/point/shape/extrude.js +1 -1
- package/es/polygon/index.d.ts +3 -2
- package/es/polygon/index.js +31 -34
- package/es/polygon/models/extrude.d.ts +2 -2
- package/es/polygon/models/extrude.js +38 -75
- package/es/polygon/models/fill.d.ts +2 -2
- package/es/polygon/models/fill.js +48 -81
- package/es/polygon/models/index.d.ts +1 -1
- package/es/polygon/models/index.js +2 -0
- package/es/polygon/models/ocean.d.ts +2 -2
- package/es/polygon/models/ocean.js +34 -75
- package/es/polygon/models/tile.d.ts +2 -2
- package/es/polygon/models/tile.js +35 -75
- package/es/polygon/models/water.d.ts +2 -2
- package/es/polygon/models/water.js +34 -75
- package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -1
- package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +2 -1
- package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +2 -1
- package/es/raster/index.d.ts +4 -3
- package/es/raster/index.js +29 -35
- package/es/raster/models/index.d.ts +1 -1
- package/es/raster/models/index.js +3 -1
- package/es/raster/models/raster.d.ts +2 -2
- package/es/raster/models/raster.js +19 -42
- package/es/raster/models/rasterRgb.d.ts +2 -2
- package/es/raster/models/rasterRgb.js +21 -44
- package/es/raster/models/rasterTile.d.ts +2 -2
- package/es/raster/models/rasterTile.js +41 -82
- package/es/raster/raster.d.ts +1 -1
- package/es/raster/raster.js +31 -51
- package/es/tile/interaction/TilePickService.d.ts +16 -0
- package/es/tile/interaction/TilePickService.js +129 -0
- package/es/tile/interaction/getRasterData.d.ts +2 -2
- package/es/tile/interaction/getRasterData.js +1 -1
- package/es/tile/interaction/utils.js +12 -4
- package/es/tile/interface.d.ts +4 -5
- package/es/tile/manager/base.d.ts +12 -17
- package/es/tile/manager/base.js +51 -216
- package/es/tile/manager/layerManager.d.ts +19 -0
- package/es/tile/manager/layerManager.js +254 -0
- package/es/tile/manager/mapLayerManager.d.ts +7 -0
- package/es/tile/manager/mapLayerManager.js +119 -0
- package/es/tile/models/tileModel.d.ts +10 -0
- package/es/tile/models/tileModel.js +81 -0
- package/es/tile/render/TileRenderService.d.ts +10 -0
- package/es/tile/render/TileRenderService.js +68 -0
- package/es/tile/style/TileStyleService.d.ts +17 -0
- package/es/tile/style/TileStyleService.js +118 -0
- package/es/tile/style/constants.d.ts +13 -1
- package/es/tile/style/constants.js +15 -6
- package/es/tile/style/utils.d.ts +8 -1
- package/es/tile/style/utils.js +127 -1
- package/es/tile/tileFactory/base.d.ts +45 -0
- package/es/tile/tileFactory/base.js +403 -0
- package/es/tile/tileFactory/index.d.ts +4 -10
- package/es/tile/tileFactory/index.js +23 -30
- package/es/tile/tileFactory/layers/{RasterDataLayer.d.ts → rasterDataLayer.d.ts} +3 -3
- package/es/tile/tileFactory/layers/{RasterDataLayer.js → rasterDataLayer.js} +28 -40
- package/es/tile/tileFactory/layers/{TileDebugLayer.d.ts → tileTest.d.ts} +2 -2
- package/es/tile/tileFactory/layers/{TileDebugLayer.js → tileTest.js} +17 -30
- package/es/tile/tileFactory/layers/vectorLayer.d.ts +30 -0
- package/es/tile/tileFactory/layers/vectorLayer.js +253 -0
- package/es/tile/tileFactory/line.d.ts +12 -0
- package/es/tile/tileFactory/line.js +59 -0
- package/es/tile/tileFactory/mask.d.ts +12 -0
- package/es/tile/tileFactory/mask.js +60 -0
- package/es/tile/tileFactory/point.d.ts +12 -0
- package/es/tile/tileFactory/point.js +60 -0
- package/es/tile/tileFactory/polygon.d.ts +12 -0
- package/es/tile/tileFactory/polygon.js +59 -0
- package/es/tile/tileFactory/raster.d.ts +12 -0
- package/es/tile/tileFactory/raster.js +55 -0
- package/es/tile/tileFactory/rasterData.d.ts +12 -0
- package/es/tile/tileFactory/rasterData.js +81 -0
- package/es/tile/tileFactory/test.d.ts +12 -0
- package/es/tile/tileFactory/test.js +94 -0
- package/es/tile/tileLayer/MapTileLayer.d.ts +6 -0
- package/es/tile/tileLayer/MapTileLayer.js +48 -0
- package/es/tile/tileLayer/TileLayer.d.ts +22 -0
- package/es/tile/tileLayer/TileLayer.js +198 -0
- package/es/tile/tileLayer/base.d.ts +33 -0
- package/es/tile/tileLayer/base.js +212 -0
- package/es/tile/utils.d.ts +11 -1
- package/es/tile/utils.js +129 -0
- package/es/utils/blend.js +1 -1
- package/es/utils/collision-index.js +4 -4
- package/es/utils/dataMappingStyle.d.ts +4 -4
- package/es/utils/dataMappingStyle.js +18 -16
- package/es/utils/extrude_polyline.js +5 -5
- package/es/utils/grid-index.js +3 -3
- package/es/utils/layerData.js +11 -5
- package/es/utils/multiPassRender.js +1 -1
- package/es/utils/polylineNormal.js +1 -1
- package/es/utils/simpleLine.js +3 -3
- package/es/wind/index.d.ts +3 -2
- package/es/wind/index.js +24 -34
- package/es/wind/models/wind.d.ts +2 -2
- package/es/wind/models/wind.js +111 -127
- package/es/wind/models/windRender.js +3 -3
- package/lib/Geometry/index.js +17 -29
- package/lib/Geometry/models/billboard.js +37 -79
- package/lib/Geometry/models/plane.js +40 -82
- package/lib/Geometry/models/sprite.js +45 -85
- package/lib/canvas/index.js +19 -31
- package/lib/canvas/models/canvas.js +15 -56
- package/lib/citybuliding/building.js +17 -28
- package/lib/citybuliding/models/build.js +25 -72
- package/lib/core/BaseLayer.js +256 -381
- package/lib/core/BaseModel.js +6 -48
- package/lib/core/triangulation.js +1 -8
- package/lib/earth/index.js +9 -30
- package/lib/earth/models/atmosphere.js +22 -69
- package/lib/earth/models/base.js +42 -90
- package/lib/earth/models/bloomsphere.js +22 -69
- package/lib/heatmap/index.js +22 -35
- package/lib/heatmap/models/grid.js +27 -70
- package/lib/heatmap/models/grid3d.js +28 -71
- package/lib/heatmap/models/heatmap.js +14 -40
- package/lib/heatmap/models/hexagon.js +28 -71
- package/lib/image/index.js +17 -29
- package/lib/image/models/dataImage.js +54 -95
- package/lib/image/models/image.js +67 -110
- package/lib/image/models/tileDataImage.js +43 -86
- package/lib/index.js +5 -5
- package/lib/line/index.js +26 -53
- package/lib/line/models/arc.js +38 -75
- package/lib/line/models/arc_3d.js +34 -71
- package/lib/line/models/earthArc_3d.js +37 -74
- package/lib/line/models/great_circle.js +29 -72
- package/lib/line/models/half.js +17 -40
- package/lib/line/models/index.js +3 -0
- package/lib/line/models/line.js +47 -81
- package/lib/line/models/linearline.js +31 -72
- package/lib/line/models/simpleLine.js +34 -73
- package/lib/line/models/simpleTileLine.js +30 -72
- package/lib/line/models/tile.js +17 -40
- package/lib/line/models/wall.js +22 -69
- package/lib/mask/index.js +99 -28
- package/lib/mask/models/fill.js +16 -40
- package/lib/mask/models/index.js +4 -1
- package/lib/plugins/DataMappingPlugin.js +64 -77
- package/lib/plugins/DataSourcePlugin.js +30 -68
- package/lib/plugins/FeatureScalePlugin.js +44 -86
- package/lib/plugins/LayerModelPlugin.js +41 -131
- package/lib/plugins/LayerStylePlugin.js +6 -1
- package/lib/plugins/MultiPassRendererPlugin.js +1 -1
- package/lib/plugins/PixelPickingPlugin.js +1 -1
- package/lib/plugins/RegisterStyleAttributePlugin.js +16 -1
- package/lib/plugins/UpdateStyleAttributePlugin.js +3 -4
- package/lib/point/index.js +24 -56
- package/lib/point/models/earthExtrude.js +30 -75
- package/lib/point/models/earthFill.js +21 -68
- package/lib/point/models/extrude.js +17 -40
- package/lib/point/models/fill.js +21 -44
- package/lib/point/models/fillmage.js +43 -84
- package/lib/point/models/image.js +31 -74
- package/lib/point/models/index.js +3 -0
- package/lib/point/models/normal.js +30 -73
- package/lib/point/models/radar.js +35 -77
- package/lib/point/models/simplePoint.js +29 -72
- package/lib/point/models/text.js +106 -164
- package/lib/point/models/tile.js +35 -79
- package/lib/point/models/tileText.js +115 -151
- package/lib/polygon/index.js +25 -29
- package/lib/polygon/models/extrude.js +32 -71
- package/lib/polygon/models/fill.js +43 -78
- package/lib/polygon/models/index.js +3 -0
- package/lib/polygon/models/ocean.js +28 -71
- package/lib/polygon/models/tile.js +30 -72
- package/lib/polygon/models/water.js +28 -71
- package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl +2 -1
- package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +2 -1
- package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +2 -1
- package/lib/raster/index.js +22 -30
- package/lib/raster/models/index.js +4 -1
- package/lib/raster/models/raster.js +13 -36
- package/lib/raster/models/rasterRgb.js +13 -36
- package/lib/raster/models/rasterTile.js +36 -79
- package/lib/raster/raster.js +22 -44
- package/lib/tile/interaction/TilePickService.js +143 -0
- package/lib/tile/interaction/utils.js +11 -3
- package/lib/tile/manager/base.js +47 -213
- package/lib/tile/manager/layerManager.js +275 -0
- package/lib/tile/manager/mapLayerManager.js +134 -0
- package/lib/tile/models/tileModel.js +94 -0
- package/lib/tile/render/TileRenderService.js +78 -0
- package/lib/tile/style/TileStyleService.js +133 -0
- package/lib/tile/style/constants.js +19 -8
- package/lib/tile/style/utils.js +140 -0
- package/lib/tile/tileFactory/base.js +427 -0
- package/lib/tile/tileFactory/index.js +24 -42
- package/lib/tile/tileFactory/layers/{RasterDataLayer.js → rasterDataLayer.js} +21 -35
- package/lib/tile/tileFactory/layers/{TileDebugLayer.js → tileTest.js} +11 -24
- package/lib/tile/tileFactory/layers/vectorLayer.js +268 -0
- package/lib/tile/tileFactory/line.js +70 -0
- package/lib/tile/tileFactory/mask.js +71 -0
- package/lib/tile/tileFactory/point.js +71 -0
- package/lib/tile/tileFactory/polygon.js +70 -0
- package/lib/tile/tileFactory/raster.js +68 -0
- package/lib/tile/tileFactory/rasterData.js +93 -0
- package/lib/tile/tileFactory/test.js +106 -0
- package/lib/tile/tileLayer/MapTileLayer.js +63 -0
- package/lib/tile/tileLayer/TileLayer.js +215 -0
- package/lib/tile/tileLayer/base.js +225 -0
- package/lib/tile/utils.js +148 -0
- package/lib/utils/dataMappingStyle.js +20 -18
- package/lib/utils/layerData.js +10 -4
- package/lib/wind/index.js +17 -29
- package/lib/wind/models/wind.js +104 -122
- package/package.json +7 -7
- package/es/core/LayerPickService.d.ts +0 -9
- package/es/core/LayerPickService.js +0 -85
- package/es/tile/service/TileLayerService.d.ts +0 -33
- package/es/tile/service/TileLayerService.js +0 -172
- package/es/tile/service/TilePickService.d.ts +0 -22
- package/es/tile/service/TilePickService.js +0 -124
- package/es/tile/tileFactory/DebugTile.d.ts +0 -16
- package/es/tile/tileFactory/DebugTile.js +0 -100
- package/es/tile/tileFactory/ImageTile.d.ts +0 -14
- package/es/tile/tileFactory/ImageTile.js +0 -89
- package/es/tile/tileFactory/MaskTile.d.ts +0 -17
- package/es/tile/tileFactory/MaskTile.js +0 -98
- package/es/tile/tileFactory/RasterRGBTile.d.ts +0 -16
- package/es/tile/tileFactory/RasterRGBTile.js +0 -91
- package/es/tile/tileFactory/RasterTile.d.ts +0 -27
- package/es/tile/tileFactory/RasterTile.js +0 -186
- package/es/tile/tileFactory/Tile.d.ts +0 -23
- package/es/tile/tileFactory/Tile.js +0 -136
- package/es/tile/tileFactory/VectorTile.d.ts +0 -20
- package/es/tile/tileFactory/VectorTile.js +0 -158
- package/es/tile/tileFactory/util.d.ts +0 -6
- package/es/tile/tileFactory/util.js +0 -33
- package/es/tile/tileLayer/BaseLayer.d.ts +0 -46
- package/es/tile/tileLayer/BaseLayer.js +0 -358
- package/lib/core/LayerPickService.js +0 -96
- package/lib/tile/service/TileLayerService.js +0 -185
- package/lib/tile/service/TilePickService.js +0 -136
- package/lib/tile/tileFactory/DebugTile.js +0 -115
- package/lib/tile/tileFactory/ImageTile.js +0 -104
- package/lib/tile/tileFactory/MaskTile.js +0 -113
- package/lib/tile/tileFactory/RasterRGBTile.js +0 -106
- package/lib/tile/tileFactory/RasterTile.js +0 -205
- package/lib/tile/tileFactory/Tile.js +0 -146
- package/lib/tile/tileFactory/VectorTile.js +0 -173
- package/lib/tile/tileFactory/util.js +0 -48
- package/lib/tile/tileLayer/BaseLayer.js +0 -373
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
8
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
5
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
6
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
9
7
|
|
|
10
8
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
11
9
|
|
|
@@ -18,19 +16,19 @@ import BaseModel from "../../core/BaseModel";
|
|
|
18
16
|
import { PolygonExtrudeTriangulation } from "../../core/triangulation";
|
|
19
17
|
|
|
20
18
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_frag.glsl' */
|
|
21
|
-
var polygonExtrudeFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0]; \n float isSide = styleMappingMat[0][3];\n float sidey = styleMappingMat[3][0];\n float lightWeight = styleMappingMat[3][1];\n\n if(isSide <
|
|
19
|
+
var polygonExtrudeFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0]; \n float isSide = styleMappingMat[0][3];\n float sidey = styleMappingMat[3][0];\n float lightWeight = styleMappingMat[3][1];\n\n // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n if(isSide < 0.999) {\n // side face\n if(u_sidesurface < 1.0) {\n discard;\n }\n\n if(u_linearColor == 1.0) {\n vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n linearColor.rgb *= lightWeight;\n gl_FragColor = linearColor;\n } else {\n gl_FragColor = v_Color;\n }\n\n } else {\n // top face\n if(u_topsurface < 1.0) {\n discard;\n }\n\n gl_FragColor = v_Color;\n }\n\n gl_FragColor.a *= opacity;\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; // extrude
|
|
22
20
|
|
|
23
21
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_vert.glsl' */
|
|
24
22
|
var polygonExtrudeVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity: 1.0;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n styleMappingMat = mat4(\n 0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide\n 0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n 0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n 0.0, 0.0, 0.0, 0.0 // sidey\n );\n styleMappingMat[0][3] = a_Position.z;\n styleMappingMat[3][0] = a_uvs[2];\n\n float rowCount = u_cellTypeLayout[0][0]; // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n float columnWidth = 1.0/columnCount; // \u5217\u5BBD\n float rowHeight = 1.0/rowCount; // \u884C\u9AD8\n float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n \n // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n styleMappingMat[0][0] = opacityAndOffset.r;\n textureOffset = opacityAndOffset.g;\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n vec4 project_pos = project_position(pos);\n\n if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n project_pos.z = a_Position.z * a_Size;\n project_pos.z += u_raisingHeight;\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n project_pos.z *= mapboxZoomScale;\n project_pos.z += u_raisingHeight * mapboxZoomScale;\n }\n }\n\n // project_pos.z += 500000.0; // amap1\n\n // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox\n // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n } else {\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n }\n\n float lightWeight = calc_lighting(pos);\n // v_Color = a_Color;\n v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n styleMappingMat[3][1] = lightWeight;\n\n setPickingColor(a_PickingColor);\n}\n";
|
|
25
23
|
|
|
26
24
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrudetex_frag.glsl' */
|
|
27
|
-
var polygonExtrudeTexFrag = "uniform sampler2D u_texture;\nuniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0];\n float isSide = styleMappingMat[0][3];\n float lightWeight = styleMappingMat[3][1];\n float topU = styleMappingMat[2][2];\n float topV = styleMappingMat[2][3];\n\n float sidey = styleMappingMat[3][0];\n if(isSide <
|
|
25
|
+
var polygonExtrudeTexFrag = "uniform sampler2D u_texture;\nuniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0];\n float isSide = styleMappingMat[0][3];\n float lightWeight = styleMappingMat[3][1];\n float topU = styleMappingMat[2][2];\n float topV = styleMappingMat[2][3];\n\n float sidey = styleMappingMat[3][0];\n // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n if(isSide < 0.999) {\n // side face\n if(u_sidesurface < 1.0) {\n discard;\n }\n\n if(u_linearColor == 1.0) {\n vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n linearColor.rgb *= lightWeight;\n gl_FragColor = linearColor;\n } else {\n gl_FragColor = v_Color;\n }\n } else {\n\n // top face\n if(u_topsurface < 1.0) {\n discard;\n }\n\n gl_FragColor = texture2D(u_texture, vec2(topU, topV));\n }\n \n\n gl_FragColor.a *= opacity;\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; // texture
|
|
28
26
|
|
|
29
27
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrudetex_vert.glsl' */
|
|
30
28
|
var polygonExtrudeTexVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity: 1.0;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n v_Color = a_Color;\n\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n styleMappingMat = mat4(\n 0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - a_Position.z(judge side by a_Position.z)\n 0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n 0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - u - v\n 0.0, 0.0, 0.0, 0.0 // sidey\n );\n \n styleMappingMat[0][3] = a_Position.z;\n styleMappingMat[2][2] = a_uvs[0];\n styleMappingMat[2][3] = 1.0 - a_uvs[1];\n styleMappingMat[3][0] = a_uvs[2];\n\n\n float rowCount = u_cellTypeLayout[0][0]; // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n float columnWidth = 1.0/columnCount; // \u5217\u5BBD\n float rowHeight = 1.0/rowCount; // \u884C\u9AD8\n float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n \n // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n styleMappingMat[0][0] = opacityAndOffset.r;\n textureOffset = opacityAndOffset.g;\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n vec4 project_pos = project_position(pos);\n\n if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n project_pos.z = a_Position.z * a_Size;\n project_pos.z += u_raisingHeight;\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n project_pos.z *= mapboxZoomScale;\n project_pos.z += u_raisingHeight * mapboxZoomScale;\n }\n }\n\n // project_pos.z += 500000.0; // amap1\n\n // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox\n // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n } else {\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n }\n\n float lightWeight = calc_lighting(pos);\n styleMappingMat[3][1] = lightWeight;\n\n setPickingColor(a_PickingColor);\n}\n"; // extrude picking
|
|
31
29
|
|
|
32
30
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_picklight_frag.glsl' */
|
|
33
|
-
var polygonExtrudePickLightFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0];\n float isSide = styleMappingMat[0][3];\n float sidey = styleMappingMat[3][0];\n float lightWeight = styleMappingMat[3][1];\n\n if(isSide <
|
|
31
|
+
var polygonExtrudePickLightFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_linearColor: 0;\n\nuniform float u_topsurface: 1.0;\nuniform float u_sidesurface: 1.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n#pragma include \"picking\"\n\nvoid main() {\n float opacity = styleMappingMat[0][0];\n float isSide = styleMappingMat[0][3];\n float sidey = styleMappingMat[3][0];\n float lightWeight = styleMappingMat[3][1];\n\n // Tip: \u90E8\u5206\u673A\u578B GPU \u8BA1\u7B97\u7CBE\u5EA6\u517C\u5BB9\n if(isSide < 0.999) {\n // side face\n if(u_sidesurface < 1.0) {\n discard;\n }\n \n if( u_linearColor == 1.0) {\n // side use linear\n vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);\n linearColor.rgb *= lightWeight;\n gl_FragColor = linearColor;\n } else {\n // side notuse linear\n gl_FragColor = v_Color;\n }\n } else {\n // top face\n if(u_topsurface < 1.0) {\n discard;\n }\n gl_FragColor = v_Color;\n }\n\n gl_FragColor.a *= opacity;\n gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);\n}\n";
|
|
34
32
|
|
|
35
33
|
/* babel-plugin-inline-import '../shaders/extrude/polygon_extrude_picklight_vert.glsl' */
|
|
36
34
|
var polygonExtrudePickLightVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nattribute vec3 a_uvs;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity: 1.0;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nvoid main() {\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n styleMappingMat = mat4(\n 0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide\n 0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n 0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n 0.0, 0.0, 0.0, 0.0 // sidey\n );\n styleMappingMat[0][3] = a_Position.z;\n styleMappingMat[3][0] = a_uvs[2];\n\n float rowCount = u_cellTypeLayout[0][0]; // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n float columnWidth = 1.0/columnCount; // \u5217\u5BBD\n float rowHeight = 1.0/rowCount; // \u884C\u9AD8\n float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n \n // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n styleMappingMat[0][0] = opacityAndOffset.r;\n textureOffset = opacityAndOffset.g;\n // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n vec4 project_pos = project_position(pos);\n\n if(u_heightfixed > 0.0) { // \u5224\u65AD\u51E0\u4F55\u4F53\u662F\u5426\u56FA\u5B9A\u9AD8\u5EA6\n project_pos.z = a_Position.z * a_Size;\n project_pos.z += u_raisingHeight;\n if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n project_pos.z *= mapboxZoomScale;\n project_pos.z += u_raisingHeight * mapboxZoomScale;\n }\n }\n\n // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));\n gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n } else {\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n }\n\n float lightWeight = calc_lighting(pos);\n // v_Color = a_Color;\n v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n styleMappingMat[3][1] = lightWeight;\n\n setPickingColor(a_PickingColor);\n}\n";
|
|
@@ -126,72 +124,37 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
126
124
|
}
|
|
127
125
|
}, {
|
|
128
126
|
key: "initModels",
|
|
129
|
-
value: function () {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
switch (_context.prev = _context.next) {
|
|
134
|
-
case 0:
|
|
135
|
-
this.loadTexture();
|
|
136
|
-
_context.next = 3;
|
|
137
|
-
return this.buildModels();
|
|
138
|
-
|
|
139
|
-
case 3:
|
|
140
|
-
return _context.abrupt("return", _context.sent);
|
|
141
|
-
|
|
142
|
-
case 4:
|
|
143
|
-
case "end":
|
|
144
|
-
return _context.stop();
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
}, _callee, this);
|
|
148
|
-
}));
|
|
149
|
-
|
|
150
|
-
function initModels() {
|
|
151
|
-
return _initModels.apply(this, arguments);
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
return initModels;
|
|
155
|
-
}()
|
|
127
|
+
value: function initModels(callbackModel) {
|
|
128
|
+
this.loadTexture();
|
|
129
|
+
this.buildModels(callbackModel);
|
|
130
|
+
}
|
|
156
131
|
}, {
|
|
157
132
|
key: "buildModels",
|
|
158
|
-
value: function () {
|
|
159
|
-
var
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
return _context2.stop();
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
|
-
}, _callee2, this);
|
|
187
|
-
}));
|
|
188
|
-
|
|
189
|
-
function buildModels() {
|
|
190
|
-
return _buildModels.apply(this, arguments);
|
|
191
|
-
}
|
|
192
|
-
|
|
193
|
-
return buildModels;
|
|
194
|
-
}()
|
|
133
|
+
value: function buildModels(callbackModel) {
|
|
134
|
+
var _ref2 = this.layer.getLayerConfig(),
|
|
135
|
+
_ref2$mask = _ref2.mask,
|
|
136
|
+
mask = _ref2$mask === void 0 ? false : _ref2$mask,
|
|
137
|
+
_ref2$maskInside = _ref2.maskInside,
|
|
138
|
+
maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
|
|
139
|
+
|
|
140
|
+
var _this$getShaders = this.getShaders(),
|
|
141
|
+
frag = _this$getShaders.frag,
|
|
142
|
+
vert = _this$getShaders.vert,
|
|
143
|
+
type = _this$getShaders.type;
|
|
144
|
+
|
|
145
|
+
this.layer.buildLayerModel({
|
|
146
|
+
moduleName: type,
|
|
147
|
+
vertexShader: vert,
|
|
148
|
+
fragmentShader: frag,
|
|
149
|
+
triangulation: PolygonExtrudeTriangulation,
|
|
150
|
+
stencil: getMask(mask, maskInside)
|
|
151
|
+
}).then(function (model) {
|
|
152
|
+
callbackModel([model]);
|
|
153
|
+
}).catch(function (err) {
|
|
154
|
+
console.warn(err);
|
|
155
|
+
callbackModel([]);
|
|
156
|
+
});
|
|
157
|
+
}
|
|
195
158
|
}, {
|
|
196
159
|
key: "getShaders",
|
|
197
160
|
value: function getShaders() {
|
|
@@ -9,8 +9,8 @@ export default class FillModel extends BaseModel {
|
|
|
9
9
|
u_opacitylinear: number;
|
|
10
10
|
u_dir: number;
|
|
11
11
|
};
|
|
12
|
-
initModels(
|
|
13
|
-
buildModels(
|
|
12
|
+
initModels(callbackModel: (models: IModel[]) => void): void;
|
|
13
|
+
buildModels(callbackModel: (models: IModel[]) => void): void;
|
|
14
14
|
clearModels(): void;
|
|
15
15
|
protected registerBuiltinAttributes(): void;
|
|
16
16
|
private getModelParams;
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
7
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
1
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
3
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
4
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
5
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
8
6
|
|
|
9
7
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
10
8
|
|
|
@@ -97,82 +95,51 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
97
95
|
}
|
|
98
96
|
}, {
|
|
99
97
|
key: "initModels",
|
|
100
|
-
value: function () {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
while (1) {
|
|
104
|
-
switch (_context.prev = _context.next) {
|
|
105
|
-
case 0:
|
|
106
|
-
_context.next = 2;
|
|
107
|
-
return this.buildModels();
|
|
108
|
-
|
|
109
|
-
case 2:
|
|
110
|
-
return _context.abrupt("return", _context.sent);
|
|
111
|
-
|
|
112
|
-
case 3:
|
|
113
|
-
case "end":
|
|
114
|
-
return _context.stop();
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
}, _callee, this);
|
|
118
|
-
}));
|
|
119
|
-
|
|
120
|
-
function initModels() {
|
|
121
|
-
return _initModels.apply(this, arguments);
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
return initModels;
|
|
125
|
-
}()
|
|
98
|
+
value: function initModels(callbackModel) {
|
|
99
|
+
this.buildModels(callbackModel);
|
|
100
|
+
}
|
|
126
101
|
}, {
|
|
127
102
|
key: "buildModels",
|
|
128
|
-
value: function () {
|
|
129
|
-
var
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}));
|
|
169
|
-
|
|
170
|
-
function buildModels() {
|
|
171
|
-
return _buildModels.apply(this, arguments);
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
return buildModels;
|
|
175
|
-
}()
|
|
103
|
+
value: function buildModels(callbackModel) {
|
|
104
|
+
var _this$getModelParams = this.getModelParams(),
|
|
105
|
+
frag = _this$getModelParams.frag,
|
|
106
|
+
vert = _this$getModelParams.vert,
|
|
107
|
+
triangulation = _this$getModelParams.triangulation,
|
|
108
|
+
type = _this$getModelParams.type;
|
|
109
|
+
|
|
110
|
+
var _ref2 = this.layer.getLayerConfig(),
|
|
111
|
+
_ref2$mask = _ref2.mask,
|
|
112
|
+
mask = _ref2$mask === void 0 ? false : _ref2$mask,
|
|
113
|
+
_ref2$maskInside = _ref2.maskInside,
|
|
114
|
+
maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside,
|
|
115
|
+
_ref2$workerEnabled = _ref2.workerEnabled,
|
|
116
|
+
workerEnabled = _ref2$workerEnabled === void 0 ? false : _ref2$workerEnabled,
|
|
117
|
+
enablePicking = _ref2.enablePicking;
|
|
118
|
+
|
|
119
|
+
this.layer.triangulation = triangulation;
|
|
120
|
+
this.layer.buildLayerModel({
|
|
121
|
+
moduleName: type,
|
|
122
|
+
vertexShader: vert,
|
|
123
|
+
fragmentShader: frag,
|
|
124
|
+
triangulation: triangulation,
|
|
125
|
+
primitive: gl.TRIANGLES,
|
|
126
|
+
depth: {
|
|
127
|
+
enable: false
|
|
128
|
+
},
|
|
129
|
+
blend: this.getBlend(),
|
|
130
|
+
stencil: getMask(mask, maskInside),
|
|
131
|
+
workerEnabled: workerEnabled,
|
|
132
|
+
workerOptions: {
|
|
133
|
+
modelType: type,
|
|
134
|
+
enablePicking: enablePicking
|
|
135
|
+
}
|
|
136
|
+
}).then(function (model) {
|
|
137
|
+
callbackModel([model]);
|
|
138
|
+
}).catch(function (err) {
|
|
139
|
+
console.warn(err);
|
|
140
|
+
callbackModel([]);
|
|
141
|
+
});
|
|
142
|
+
}
|
|
176
143
|
}, {
|
|
177
144
|
key: "clearModels",
|
|
178
145
|
value: function clearModels() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare type PolygonModelType = 'fill' | 'extrude' | 'line' | 'point_fill' | 'point_image' | 'point_normal' | 'point_extrude' | 'text' | 'water' | 'ocean' | 'tile';
|
|
1
|
+
export declare type PolygonModelType = 'fill' | 'extrude' | 'line' | 'point_fill' | 'point_image' | 'point_normal' | 'point_extrude' | 'text' | 'water' | 'ocean' | 'vectorpolygon' | 'tile';
|
|
2
2
|
declare const PolygonModels: {
|
|
3
3
|
[key in PolygonModelType]: any;
|
|
4
4
|
};
|
|
@@ -4,6 +4,7 @@ import PointFillModel from "../../point/models/fill";
|
|
|
4
4
|
import IMageModel from "../../point/models/image";
|
|
5
5
|
import NormalModel from "../../point/models/normal";
|
|
6
6
|
import TextModel from "../../point/models/text";
|
|
7
|
+
import PolygonTileModel from "../../tile/models/tileModel";
|
|
7
8
|
import ExtrudeModel from "./extrude";
|
|
8
9
|
import FillModel from "./fill";
|
|
9
10
|
import Ocean from "./ocean";
|
|
@@ -21,6 +22,7 @@ var PolygonModels = {
|
|
|
21
22
|
water: Water,
|
|
22
23
|
ocean: Ocean,
|
|
23
24
|
// point_fill: PointModels.fill,
|
|
25
|
+
vectorpolygon: PolygonTileModel,
|
|
24
26
|
tile: TilePolygonModel
|
|
25
27
|
};
|
|
26
28
|
export default PolygonModels;
|
|
@@ -13,8 +13,8 @@ export default class OceanModel extends BaseModel {
|
|
|
13
13
|
u_opacity: number;
|
|
14
14
|
};
|
|
15
15
|
getAnimateUniforms(): IModelUniform;
|
|
16
|
-
initModels(
|
|
17
|
-
buildModels(
|
|
16
|
+
initModels(callbackModel: (models: IModel[]) => void): void;
|
|
17
|
+
buildModels(callbackModel: (models: IModel[]) => void): void;
|
|
18
18
|
clearModels(): void;
|
|
19
19
|
protected registerBuiltinAttributes(): void;
|
|
20
20
|
private loadTexture;
|
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
8
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
1
|
+
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
2
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
3
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
4
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
5
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
6
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
9
7
|
|
|
10
8
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
11
9
|
|
|
@@ -64,75 +62,36 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
64
62
|
}
|
|
65
63
|
}, {
|
|
66
64
|
key: "initModels",
|
|
67
|
-
value: function () {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
switch (_context.prev = _context.next) {
|
|
72
|
-
case 0:
|
|
73
|
-
this.loadTexture();
|
|
74
|
-
_context.next = 3;
|
|
75
|
-
return this.buildModels();
|
|
76
|
-
|
|
77
|
-
case 3:
|
|
78
|
-
return _context.abrupt("return", _context.sent);
|
|
79
|
-
|
|
80
|
-
case 4:
|
|
81
|
-
case "end":
|
|
82
|
-
return _context.stop();
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
}, _callee, this);
|
|
86
|
-
}));
|
|
87
|
-
|
|
88
|
-
function initModels() {
|
|
89
|
-
return _initModels.apply(this, arguments);
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
return initModels;
|
|
93
|
-
}()
|
|
65
|
+
value: function initModels(callbackModel) {
|
|
66
|
+
this.loadTexture();
|
|
67
|
+
this.buildModels(callbackModel);
|
|
68
|
+
}
|
|
94
69
|
}, {
|
|
95
70
|
key: "buildModels",
|
|
96
|
-
value: function () {
|
|
97
|
-
var
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
return _context2.abrupt("return", [model]);
|
|
121
|
-
|
|
122
|
-
case 5:
|
|
123
|
-
case "end":
|
|
124
|
-
return _context2.stop();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}, _callee2, this);
|
|
128
|
-
}));
|
|
129
|
-
|
|
130
|
-
function buildModels() {
|
|
131
|
-
return _buildModels.apply(this, arguments);
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
return buildModels;
|
|
135
|
-
}()
|
|
71
|
+
value: function buildModels(callbackModel) {
|
|
72
|
+
var _ref2 = this.layer.getLayerConfig(),
|
|
73
|
+
_ref2$mask = _ref2.mask,
|
|
74
|
+
mask = _ref2$mask === void 0 ? false : _ref2$mask,
|
|
75
|
+
_ref2$maskInside = _ref2.maskInside,
|
|
76
|
+
maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside;
|
|
77
|
+
|
|
78
|
+
this.layer.buildLayerModel({
|
|
79
|
+
moduleName: 'polygonOcean',
|
|
80
|
+
vertexShader: ocean_vert,
|
|
81
|
+
fragmentShader: ocean_frag,
|
|
82
|
+
triangulation: polygonTriangulation,
|
|
83
|
+
primitive: gl.TRIANGLES,
|
|
84
|
+
depth: {
|
|
85
|
+
enable: false
|
|
86
|
+
},
|
|
87
|
+
stencil: getMask(mask, maskInside)
|
|
88
|
+
}).then(function (model) {
|
|
89
|
+
callbackModel([model]);
|
|
90
|
+
}).catch(function (err) {
|
|
91
|
+
console.warn(err);
|
|
92
|
+
callbackModel([]);
|
|
93
|
+
});
|
|
94
|
+
}
|
|
136
95
|
}, {
|
|
137
96
|
key: "clearModels",
|
|
138
97
|
value: function clearModels() {
|
|
@@ -5,8 +5,8 @@ export default class FillModel extends BaseModel {
|
|
|
5
5
|
u_opacity: number;
|
|
6
6
|
u_color: number[];
|
|
7
7
|
};
|
|
8
|
-
initModels(
|
|
9
|
-
buildModels(
|
|
8
|
+
initModels(callbackModel: (models: IModel[]) => void): void;
|
|
9
|
+
buildModels(callbackModel: (models: IModel[]) => void): void;
|
|
10
10
|
clearModels(): void;
|
|
11
11
|
protected registerBuiltinAttributes(): void;
|
|
12
12
|
}
|
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
|
|
7
|
-
import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
1
|
+
import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
|
|
2
|
+
import _createClass from "@babel/runtime/helpers/esm/createClass";
|
|
3
|
+
import _inherits from "@babel/runtime/helpers/esm/inherits";
|
|
4
|
+
import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
|
|
5
|
+
import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
|
|
8
6
|
|
|
9
7
|
function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
|
|
10
8
|
|
|
@@ -56,76 +54,38 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
|
|
|
56
54
|
}
|
|
57
55
|
}, {
|
|
58
56
|
key: "initModels",
|
|
59
|
-
value: function () {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
while (1) {
|
|
63
|
-
switch (_context.prev = _context.next) {
|
|
64
|
-
case 0:
|
|
65
|
-
_context.next = 2;
|
|
66
|
-
return this.buildModels();
|
|
67
|
-
|
|
68
|
-
case 2:
|
|
69
|
-
return _context.abrupt("return", _context.sent);
|
|
70
|
-
|
|
71
|
-
case 3:
|
|
72
|
-
case "end":
|
|
73
|
-
return _context.stop();
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}, _callee, this);
|
|
77
|
-
}));
|
|
78
|
-
|
|
79
|
-
function initModels() {
|
|
80
|
-
return _initModels.apply(this, arguments);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
return initModels;
|
|
84
|
-
}()
|
|
57
|
+
value: function initModels(callbackModel) {
|
|
58
|
+
this.buildModels(callbackModel);
|
|
59
|
+
}
|
|
85
60
|
}, {
|
|
86
61
|
key: "buildModels",
|
|
87
|
-
value: function () {
|
|
88
|
-
var
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
case 6:
|
|
116
|
-
case "end":
|
|
117
|
-
return _context2.stop();
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
|
-
}, _callee2, this);
|
|
121
|
-
}));
|
|
122
|
-
|
|
123
|
-
function buildModels() {
|
|
124
|
-
return _buildModels.apply(this, arguments);
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
return buildModels;
|
|
128
|
-
}()
|
|
62
|
+
value: function buildModels(callbackModel) {
|
|
63
|
+
var _ref2 = this.layer.getLayerConfig(),
|
|
64
|
+
_ref2$mask = _ref2.mask,
|
|
65
|
+
mask = _ref2$mask === void 0 ? false : _ref2$mask,
|
|
66
|
+
_ref2$maskInside = _ref2.maskInside,
|
|
67
|
+
maskInside = _ref2$maskInside === void 0 ? true : _ref2$maskInside,
|
|
68
|
+
usage = _ref2.usage;
|
|
69
|
+
|
|
70
|
+
this.layer.triangulation = polygonTriangulation;
|
|
71
|
+
this.layer.buildLayerModel({
|
|
72
|
+
moduleName: 'polygonTile_' + usage,
|
|
73
|
+
vertexShader: usage === 'basemap' ? polygon_tile_map_vert : polygon_tile_vert,
|
|
74
|
+
fragmentShader: usage === 'basemap' ? polygon_tile_map_frag : polygon_tile_frag,
|
|
75
|
+
triangulation: polygonTriangulation,
|
|
76
|
+
depth: {
|
|
77
|
+
enable: false
|
|
78
|
+
},
|
|
79
|
+
blend: this.getBlend(),
|
|
80
|
+
stencil: getMask(mask, maskInside),
|
|
81
|
+
pick: usage !== 'basemap'
|
|
82
|
+
}).then(function (model) {
|
|
83
|
+
callbackModel([model]);
|
|
84
|
+
}).catch(function (err) {
|
|
85
|
+
console.warn(err);
|
|
86
|
+
callbackModel([]);
|
|
87
|
+
});
|
|
88
|
+
}
|
|
129
89
|
}, {
|
|
130
90
|
key: "clearModels",
|
|
131
91
|
value: function clearModels() {}
|