@antv/l7-layers 2.20.12 → 2.20.14

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.
Files changed (102) hide show
  1. package/es/core/BaseLayer.d.ts +0 -1
  2. package/es/core/BaseLayer.js +8 -5
  3. package/es/core/LayerPickService.d.ts +1 -1
  4. package/es/core/LayerPickService.js +28 -10
  5. package/es/geometry/models/sprite.js +2 -2
  6. package/es/heatmap/models/grid.js +2 -2
  7. package/es/heatmap/models/grid3d.js +4 -4
  8. package/es/heatmap/models/heatmap.js +10 -6
  9. package/es/heatmap/shaders/grid/grid_frag.glsl +1 -0
  10. package/es/heatmap/shaders/grid3d/grid_3d_frag.glsl +9 -0
  11. package/es/heatmap/shaders/grid3d/grid_3d_vert.glsl +4 -8
  12. package/es/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl +2 -1
  13. package/es/heatmap/shaders/heatmap/heatmap_framebuffer_vert.glsl +3 -1
  14. package/es/heatmap/shaders/heatmap/heatmap_vert.glsl +3 -0
  15. package/es/image/models/image.js +6 -8
  16. package/es/line/models/arc.js +1 -1
  17. package/es/line/models/line.js +10 -45
  18. package/es/line/shaders/arc/line_arc_frag.glsl +2 -1
  19. package/es/line/shaders/line/line_frag.glsl +2 -2
  20. package/es/line/shaders/line/line_vert.glsl +10 -7
  21. package/es/plugins/ShaderUniformPlugin.js +3 -2
  22. package/es/point/models/extrude.js +2 -2
  23. package/es/point/models/fill.js +1 -1
  24. package/es/point/models/fillImage.js +3 -5
  25. package/es/point/models/text.js +2 -2
  26. package/es/point/shaders/extrude/extrude_frag.glsl +1 -0
  27. package/es/point/shaders/extrude/extrude_vert.glsl +0 -1
  28. package/es/point/shaders/fill/fill_frag.glsl +1 -1
  29. package/es/point/shaders/fillImage/fillImage_frag.glsl +1 -2
  30. package/es/point/shaders/text/text_frag.glsl +3 -2
  31. package/es/point/shaders/text/text_vert.glsl +0 -2
  32. package/es/polygon/models/extrude.js +30 -39
  33. package/es/polygon/models/extrusion.js +1 -1
  34. package/es/polygon/models/fill.js +3 -3
  35. package/es/polygon/models/water.js +6 -4
  36. package/es/polygon/shaders/extrude/polygon_extrude_frag.glsl +1 -0
  37. package/es/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +1 -0
  38. package/es/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +2 -3
  39. package/es/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +7 -9
  40. package/es/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +1 -2
  41. package/es/polygon/shaders/extrusion/polygon_extrusion_frag.glsl +1 -0
  42. package/es/polygon/shaders/fill/fill_frag.glsl +1 -0
  43. package/es/polygon/shaders/fill/fill_linear_frag.glsl +4 -3
  44. package/es/polygon/shaders/fill/fill_linear_vert.glsl +5 -8
  45. package/es/raster/models/rasterTerrainRgb.d.ts +8 -2
  46. package/es/raster/models/rasterTerrainRgb.js +20 -14
  47. package/es/raster/shaders/terrain/terrain_rgb_frag.glsl +18 -16
  48. package/es/raster/shaders/terrain/terrain_rgb_vert.glsl +13 -5
  49. package/es/tile/service/TilePickService.d.ts +1 -1
  50. package/es/tile/service/TilePickService.js +36 -13
  51. package/es/tile/tile/Tile.js +4 -3
  52. package/es/utils/load-image.d.ts +1 -0
  53. package/es/utils/load-image.js +46 -0
  54. package/lib/core/BaseLayer.js +8 -5
  55. package/lib/core/LayerPickService.js +28 -10
  56. package/lib/geometry/models/sprite.js +2 -2
  57. package/lib/heatmap/models/grid.js +2 -2
  58. package/lib/heatmap/models/grid3d.js +4 -4
  59. package/lib/heatmap/models/heatmap.js +10 -6
  60. package/lib/heatmap/shaders/grid/grid_frag.glsl +1 -0
  61. package/lib/heatmap/shaders/grid3d/grid_3d_frag.glsl +9 -0
  62. package/lib/heatmap/shaders/grid3d/grid_3d_vert.glsl +4 -8
  63. package/lib/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl +2 -1
  64. package/lib/heatmap/shaders/heatmap/heatmap_framebuffer_vert.glsl +3 -1
  65. package/lib/heatmap/shaders/heatmap/heatmap_vert.glsl +3 -0
  66. package/lib/image/models/image.js +6 -8
  67. package/lib/line/models/arc.js +1 -1
  68. package/lib/line/models/line.js +10 -45
  69. package/lib/line/shaders/arc/line_arc_frag.glsl +2 -1
  70. package/lib/line/shaders/line/line_frag.glsl +2 -2
  71. package/lib/line/shaders/line/line_vert.glsl +10 -7
  72. package/lib/plugins/ShaderUniformPlugin.js +3 -2
  73. package/lib/point/models/extrude.js +2 -2
  74. package/lib/point/models/fill.js +1 -1
  75. package/lib/point/models/fillImage.js +3 -5
  76. package/lib/point/models/text.js +2 -2
  77. package/lib/point/shaders/extrude/extrude_frag.glsl +1 -0
  78. package/lib/point/shaders/extrude/extrude_vert.glsl +0 -1
  79. package/lib/point/shaders/fill/fill_frag.glsl +1 -1
  80. package/lib/point/shaders/fillImage/fillImage_frag.glsl +1 -2
  81. package/lib/point/shaders/text/text_frag.glsl +3 -2
  82. package/lib/point/shaders/text/text_vert.glsl +0 -2
  83. package/lib/polygon/models/extrude.js +29 -38
  84. package/lib/polygon/models/extrusion.js +1 -1
  85. package/lib/polygon/models/fill.js +3 -3
  86. package/lib/polygon/models/water.js +6 -4
  87. package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl +1 -0
  88. package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl +1 -0
  89. package/lib/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl +2 -3
  90. package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl +7 -9
  91. package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl +1 -2
  92. package/lib/polygon/shaders/extrusion/polygon_extrusion_frag.glsl +1 -0
  93. package/lib/polygon/shaders/fill/fill_frag.glsl +1 -0
  94. package/lib/polygon/shaders/fill/fill_linear_frag.glsl +4 -3
  95. package/lib/polygon/shaders/fill/fill_linear_vert.glsl +5 -8
  96. package/lib/raster/models/rasterTerrainRgb.js +20 -14
  97. package/lib/raster/shaders/terrain/terrain_rgb_frag.glsl +18 -16
  98. package/lib/raster/shaders/terrain/terrain_rgb_vert.glsl +13 -5
  99. package/lib/tile/service/TilePickService.js +36 -13
  100. package/lib/tile/tile/Tile.js +4 -3
  101. package/lib/utils/load-image.js +53 -0
  102. package/package.json +7 -7
@@ -111,7 +111,8 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
111
111
  while (1) switch (_context.prev = _context.next) {
112
112
  case 0:
113
113
  mask = new _polygon.default({
114
- visible: false,
114
+ name: 'mask',
115
+ visible: true,
115
116
  enablePicking: false
116
117
  }).source({
117
118
  type: 'FeatureCollection',
@@ -121,7 +122,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
121
122
  type: 'geojson',
122
123
  featureId: 'id'
123
124
  }
124
- }).shape('fill').style({
125
+ }).shape('fill').color('#0f0').style({
125
126
  opacity: 0.5
126
127
  });
127
128
  container = (0, _l7Core.createLayerContainer)(this.parent.sceneContainer);
@@ -145,7 +146,7 @@ var Tile = exports.default = /*#__PURE__*/function (_EventEmitter) {
145
146
  return _addTileMask.apply(this, arguments);
146
147
  }
147
148
  return addTileMask;
148
- }()
149
+ }() // 全局 Mask
149
150
  }, {
150
151
  key: "addMask",
151
152
  value: function () {
@@ -0,0 +1,53 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+ Object.defineProperty(exports, "__esModule", {
5
+ value: true
6
+ });
7
+ exports.loadImage = loadImage;
8
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
9
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
10
+ function loadImage(_x) {
11
+ return _loadImage.apply(this, arguments);
12
+ }
13
+ function _loadImage() {
14
+ _loadImage = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(url) {
15
+ var response, imageBitmap, image;
16
+ return _regenerator.default.wrap(function _callee$(_context) {
17
+ while (1) switch (_context.prev = _context.next) {
18
+ case 0:
19
+ if (!window.createImageBitmap) {
20
+ _context.next = 14;
21
+ break;
22
+ }
23
+ _context.next = 3;
24
+ return fetch(url);
25
+ case 3:
26
+ response = _context.sent;
27
+ _context.t0 = createImageBitmap;
28
+ _context.next = 7;
29
+ return response.blob();
30
+ case 7:
31
+ _context.t1 = _context.sent;
32
+ _context.next = 10;
33
+ return (0, _context.t0)(_context.t1);
34
+ case 10:
35
+ imageBitmap = _context.sent;
36
+ return _context.abrupt("return", imageBitmap);
37
+ case 14:
38
+ image = new window.Image();
39
+ return _context.abrupt("return", new Promise(function (res) {
40
+ image.onload = function () {
41
+ return res(image);
42
+ };
43
+ image.src = url;
44
+ image.crossOrigin = 'Anonymous';
45
+ }));
46
+ case 16:
47
+ case "end":
48
+ return _context.stop();
49
+ }
50
+ }, _callee);
51
+ }));
52
+ return _loadImage.apply(this, arguments);
53
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/l7-layers",
3
- "version": "2.20.12",
3
+ "version": "2.20.14",
4
4
  "description": "L7's collection of built-in layers",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -27,10 +27,10 @@
27
27
  "license": "ISC",
28
28
  "dependencies": {
29
29
  "@antv/async-hook": "^2.2.9",
30
- "@antv/l7-core": "2.20.12",
31
- "@antv/l7-maps": "2.20.12",
32
- "@antv/l7-source": "2.20.12",
33
- "@antv/l7-utils": "2.20.12",
30
+ "@antv/l7-core": "2.20.14",
31
+ "@antv/l7-maps": "2.20.14",
32
+ "@antv/l7-source": "2.20.14",
33
+ "@antv/l7-utils": "2.20.14",
34
34
  "@babel/runtime": "^7.7.7",
35
35
  "@mapbox/martini": "^0.2.0",
36
36
  "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
52
52
  "reflect-metadata": "^0.1.13"
53
53
  },
54
54
  "devDependencies": {
55
- "@antv/l7-test-utils": "2.20.12",
55
+ "@antv/l7-test-utils": "2.20.14",
56
56
  "@types/d3-array": "^2.0.0",
57
57
  "@types/d3-color": "^1.2.2",
58
58
  "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
61
61
  "@types/gl-matrix": "^2.4.5",
62
62
  "@types/lodash": "^4.14.138"
63
63
  },
64
- "gitHead": "82fdda60dd4255ce14405f0a780f235a71d7e0b1",
64
+ "gitHead": "ad997ac14616fa503fec4022f1a1a48747524f87",
65
65
  "publishConfig": {
66
66
  "access": "public"
67
67
  }