@antv/l7-layers 2.19.11 → 2.20.0

package/es/point/shaders/fill_frag.glsl

@@ -1,16 +1,22 @@
-uniform float u_additive;
-uniform float u_stroke_opacity : 1;
-uniform float u_stroke_width : 2;
 
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec4 v_stroke;
+layout(std140) uniform commonUniforms {
+  vec3 u_blur_height_fixed;
+  float u_stroke_width;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_size_unit;
+};
 
+in vec4 v_color;
+in vec4 v_stroke;
+in vec4 v_data;
+in float v_radius;
 
+#pragma include "scene_uniforms"
 #pragma include "sdf_2d"
 #pragma include "picking"
 
+out vec4 outputColor;
 
 void main() {
   int shape = int(floor(v_data.w + 0.5));
@@ -58,20 +64,20 @@ void main() {
   );
 
   if(u_stroke_width < 0.01) {
-    gl_FragColor = v_color;
+    outputColor = v_color;
   } else {
-    gl_FragColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
+    outputColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
   }
 
   if(u_additive > 0.0) {
-    gl_FragColor *= opacity_t;
-    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
+    outputColor *= opacity_t;
+    outputColor = filterColorAlpha(outputColor, outputColor.a);
   } else {
-    gl_FragColor.a *= opacity_t;
-    gl_FragColor = filterColor(gl_FragColor);
+    outputColor.a *= opacity_t;
+    outputColor = filterColor(outputColor);
   }
    // 作为 mask 模板时需要丢弃透明的像素
-  if(gl_FragColor.a < 0.01) {
+  if(outputColor.a < 0.01) {
     discard;
   } 
 }

package/es/point/shaders/fill_vert.glsl

@@ -1,25 +1,26 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-attribute float a_Shape;
-uniform mat4 u_ModelMatrix;
-
-uniform int u_size_unit;
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec4 v_stroke;
-uniform float u_stroke_width: 2;
-uniform vec3 u_blur_height_fixed: [0, 0, 0];
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 10) in float a_Shape;
+
+layout(std140) uniform commonUniforms {
+  vec3 u_blur_height_fixed;
+  float u_stroke_width;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_size_unit;
+};
+
+out vec4 v_color;
+out vec4 v_stroke;
+out vec4 v_data;
+out float v_radius;
 
 #pragma include "projection"
 #pragma include "picking"
 #pragma include "rotation_2d"
 
-
 void main() {
   // 透明度计算
    v_stroke = stroke;  
@@ -37,7 +38,7 @@ void main() {
   // unpack color(vec2)
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
-  if(u_size_unit == 1) {
+  if(u_size_unit == 1.0) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
 

package/es/point/shaders/normal_frag.glsl

@@ -1,4 +1,5 @@
-varying vec4 v_color;
+in vec4 v_color;
+out vec4 outputColor;
 void main() {
-  gl_FragColor = v_color;
-}
+  outputColor = v_color;
+}

package/es/point/shaders/normal_vert.glsl

@@ -1,11 +1,12 @@
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
 
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform u_Common {
+  float u_size_scale;
+};
 
-attribute float a_Size;
-attribute vec4 a_Color;
-
-varying vec4 v_color;
+out vec4 v_color;
 
 #pragma include "projection"
 #pragma include "project"
@@ -13,12 +14,12 @@ varying vec4 v_color;
 void main() {
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);
+  if (u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * vec4(a_Position, 1.0);
   } else {
-    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);
-    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy),project_pos.z,project_pos.w));
+    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2., -a_Size /2., 0., 0.);
+    gl_Position = project_common_position_to_clipspace(project_pos);
   }
 
-  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
+  gl_PointSize = a_Size * u_size_scale *  2.0  * u_DevicePixelRatio;
 }

package/es/polygon/index.js

@@ -55,7 +55,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       if (shape === 'fill' || !shape) {
         return 'fill';
       } else if (shape === 'extrude') {

package/es/polygon/models/extrude.js

@@ -153,7 +153,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/extrusion.js

@@ -90,7 +90,7 @@ var ExtrusionModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/ocean.js

@@ -107,9 +107,9 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$texture2, _this$texture3;
-      (_this$texture = this.texture1) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$texture2 = this.texture2) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
-      (_this$texture3 = this.texture3) === null || _this$texture3 === void 0 ? void 0 : _this$texture3.destroy();
+      (_this$texture = this.texture1) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$texture2 = this.texture2) === null || _this$texture2 === void 0 || _this$texture2.destroy();
+      (_this$texture3 = this.texture3) === null || _this$texture3 === void 0 || _this$texture3.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/water.js

@@ -102,7 +102,7 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/raster.js

@@ -163,8 +163,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$colorTexture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/rasterRgb.js

@@ -175,7 +175,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/rasterTerrainRgb.js

@@ -112,7 +112,7 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "buildModels",

package/es/tile/core/BaseLayer.js

@@ -49,7 +49,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom,
         latLonBounds: latLonBounds
       };
-      (_this$tilesetManager = _this.tilesetManager) === null || _this$tilesetManager === void 0 ? void 0 : _this$tilesetManager.throttleUpdate(zoom, latLonBounds);
+      (_this$tilesetManager = _this.tilesetManager) === null || _this$tilesetManager === void 0 || _this$tilesetManager.throttleUpdate(zoom, latLonBounds);
     });
     //  防抖操作
     _defineProperty(this, "viewchange", debounce(this.mapchange, 24));
@@ -96,7 +96,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$getCurrentView2 = this.getCurrentView(),
         latLonBounds = _this$getCurrentView2.latLonBounds,
         zoom = _this$getCurrentView2.zoom;
-      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 || _this$tilesetManager2.update(zoom, latLonBounds);
     }
   }, {
     key: "getCurrentView",
@@ -179,7 +179,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$tilesetManager3;
       this.mapService.off('zoomend', this.mapchange);
       this.mapService.off('moveend', this.viewchange);
-      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
+      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 || _this$tilesetManager3.destroy();
       this.tileLayerService.destroy();
     }
     // 重新加载
@@ -192,7 +192,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$getCurrentView3 = this.getCurrentView(),
         latLonBounds = _this$getCurrentView3.latLonBounds,
         zoom = _this$getCurrentView3.zoom;
-      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 ? void 0 : _this$tilesetManager4.update(zoom, latLonBounds);
+      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 || _this$tilesetManager4.update(zoom, latLonBounds);
     }
   }, {
     key: "tileUnLoad",

package/es/tile/interaction/getRasterData.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { DOM } from '@antv/l7-utils';
 export function readRasterValue(tile, mapService, x, y) {
   var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
-  var bbox = (tile === null || tile === void 0 ? void 0 : (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
+  var bbox = (tile === null || tile === void 0 || (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
   var _bbox = _slicedToArray(bbox, 4),
     _bbox$ = _bbox[0],
     minLng = _bbox$ === void 0 ? 0 : _bbox$,
@@ -21,12 +21,12 @@ export function readRasterValue(tile, mapService, x, y) {
   (y - tileMaxXY.y) / tilePixelHeight // y
   ];
 
-  var tileWidth = (tile === null || tile === void 0 ? void 0 : (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
-  var tileHeight = (tile === null || tile === void 0 ? void 0 : (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
+  var tileWidth = (tile === null || tile === void 0 || (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
+  var tileHeight = (tile === null || tile === void 0 || (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
   var indexX = Math.floor(pos[0] * tileWidth);
   var indexY = Math.floor(pos[1] * tileHeight);
   var index = Math.max(0, indexY - 1) * tileWidth + indexX;
-  var data = tile === null || tile === void 0 ? void 0 : (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
+  var data = tile === null || tile === void 0 || (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
   return data;
 }
 export function readPixel(x, y, rendererService) {

package/es/tile/service/TileLayerService.js

@@ -71,17 +71,17 @@ export var TileLayerService = /*#__PURE__*/function () {
         // 不可见 => 可见 兄弟节点加载完成
         if (sourceTile.parent) {
           var flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(flag);
+          tile === null || tile === void 0 || tile.updateVisible(flag);
         } else {
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(true);
+          tile === null || tile === void 0 || tile.updateVisible(true);
         }
       } else {
         // 可见 => 不可见 兄弟节点加载完成
         if (sourceTile.parent) {
           var _flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(!_flag);
+          tile === null || tile === void 0 || tile.updateVisible(!_flag);
         } else {
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(false);
+          tile === null || tile === void 0 || tile.updateVisible(false);
         }
       }
     }

package/es/tile/service/TilePickService.js

@@ -28,7 +28,7 @@ export var TilePickService = /*#__PURE__*/function () {
       if (tile) {
         // TODO 多图层拾取
         var pickLayer = tile.getMainLayer();
-        pickLayer === null || pickLayer === void 0 ? void 0 : pickLayer.layerPickService.pickRender(target);
+        pickLayer === null || pickLayer === void 0 || pickLayer.layerPickService.pickRender(target);
       }
     }
   }, {
@@ -78,10 +78,10 @@ export var TilePickService = /*#__PURE__*/function () {
         var layer = tile.getMainLayer();
         switch (type) {
           case SELECT:
-            layer === null || layer === void 0 ? void 0 : layer.hooks.beforeSelect.call([r, g, b]);
+            layer === null || layer === void 0 || layer.hooks.beforeSelect.call([r, g, b]);
             break;
           case ACTIVE:
-            layer === null || layer === void 0 ? void 0 : layer.hooks.beforeHighlight.call([r, g, b]);
+            layer === null || layer === void 0 || layer.hooks.beforeHighlight.call([r, g, b]);
             break;
         }
       });

package/es/tile/tile/Tile.d.ts

@@ -88,8 +88,11 @@ export default abstract class Tile extends EventEmitter implements ITile {
         pickBufferScale?: number | undefined;
         stencil?: boolean | undefined;
         debug?: boolean | undefined;
+        renderer?: "regl" | "device" | undefined;
         antialias?: boolean | undefined;
         preserveDrawingBuffer?: boolean | undefined;
+        enableWebGPU?: boolean | undefined;
+        shaderCompilerPath?: string | undefined;
     };
     protected getMaskLayer(): ILayer[];
     protected addTileMask(): Promise<ILayer>;

package/es/tile/tile/Tile.js

@@ -80,7 +80,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
       var _this$parent$getLayer = this.parent.getLayerConfig(),
         maskLayers = _this$parent$getLayer.maskLayers;
       var layers = [];
-      maskLayers === null || maskLayers === void 0 ? void 0 : maskLayers.forEach(function (layer) {
+      maskLayers === null || maskLayers === void 0 || maskLayers.forEach(function (layer) {
         if (!layer.tileLayer) {
           // 非瓦片图层返回图层本身，瓦片图层返回对应的行列号图层
           layers.push(layer);
@@ -233,7 +233,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
     key: "destroy",
     value: function destroy() {
       var _this$tileMask;
-      (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 ? void 0 : _this$tileMask.destroy();
+      (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 || _this$tileMask.destroy();
       this.layers.forEach(function (layer) {
         return layer.destroy();
       });

package/es/wind/models/wind.js

@@ -65,7 +65,6 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _source$data,
           _source$data2,
-          _source$data2$images,
           _this3 = this;
         var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, createTexture2D, source, glContext, model;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -81,7 +80,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
               this.cacheZoom = Math.floor(this.mapService.getZoom());
               glContext = this.rendererService.getGLContext();
               this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
-              (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
+              (_source$data2 = source.data) === null || _source$data2 === void 0 || (_source$data2 = _source$data2.images) === null || _source$data2 === void 0 || _source$data2.then(function (imageData) {
                 var _this3$texture;
                 _this3.sizeScale = sizeScale * _this3.getZoomScale();
                 var _this3$getWindSize = _this3.getWindSize(),
@@ -107,7 +106,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
                   vMax: vMax,
                   image: imageData[0]
                 });
-                (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
+                (_this3$texture = _this3.texture) === null || _this3$texture === void 0 || _this3$texture.destroy();
                 _this3.texture = createTexture2D({
                   width: imageWidth,
                   height: imageHeight
@@ -175,8 +174,8 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$wind;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$wind = this.wind) === null || _this$wind === void 0 ? void 0 : _this$wind.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$wind = this.wind) === null || _this$wind === void 0 || _this$wind.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",
@@ -274,7 +273,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       this.layerService.beforeRenderData(this.layer);
       this.layer.hooks.beforeRender.call();
       this.layerService.renderMask(this.layer.masks);
-      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
+      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 || _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_texture: this.texture

package/lib/canvas/index.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _index = _interopRequireDefault(require("./models/index"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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; } }
-var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
+var CanvasLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CanvasLayer, _BaseLayer);
   var _super = _createSuper(CanvasLayer);
   function CanvasLayer() {
@@ -99,5 +99,4 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return CanvasLayer;
-}(_BaseLayer2.default);
-exports.default = CanvasLayer;
+}(_BaseLayer2.default);

package/lib/canvas/models/canvas.js

@@ -19,7 +19,7 @@ var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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; } }
-var CanvaModel = /*#__PURE__*/function (_BaseModel) {
+var CanvaModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CanvaModel, _BaseModel);
   var _super = _createSuper(CanvaModel);
   function CanvaModel() {
@@ -111,7 +111,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       if (this.canvas) {
         var _this$mapService$getC;
-        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 ? void 0 : _this$mapService$getC.removeChild(this.canvas);
+        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 || _this$mapService$getC.removeChild(this.canvas);
         // @ts-ignore
         this.canvas = null;
       }
@@ -168,7 +168,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
       canvas.style.top = '0';
       canvas.style.left = '0';
       canvas.style.zIndex = zIndex + '';
-      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.appendChild(canvas);
+      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 || _this$mapService$getC2.appendChild(canvas);
       var ctx = canvas.getContext('2d');
       this.ctx = ctx;
     }
@@ -198,5 +198,4 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return CanvaModel;
-}(_BaseModel2.default);
-exports.default = CanvaModel;
+}(_BaseModel2.default);

package/lib/canvas/models/index.js

@@ -9,5 +9,4 @@ var _canvas = _interopRequireDefault(require("./canvas"));
 var CanvasModels = {
   canvas: _canvas.default
 };
-var _default = CanvasModels;
-exports.default = _default;
+var _default = exports.default = CanvasModels;

package/lib/citybuliding/building.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _build = _interopRequireDefault(require("./models/build"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 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; } }
-var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
+var CityBuildingLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CityBuildingLayer, _BaseLayer);
   var _super = _createSuper(CityBuildingLayer);
   function CityBuildingLayer() {
@@ -66,5 +66,4 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return CityBuildingLayer;
-}(_BaseLayer2.default);
-exports.default = CityBuildingLayer;
+}(_BaseLayer2.default);

package/lib/citybuliding/models/build.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var buildFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\nuniform float u_near : 0;\nuniform float u_far : 1;\nvarying vec4 v_Color;\nvarying vec2 v_texCoord;\nuniform float u_Zoom : 1;\nuniform float u_time;\n\nuniform float u_circleSweep;\nuniform float u_cityMinSize;\nuniform vec3 u_circleSweepColor;\nuniform float u_circleSweepSpeed;\n\nvarying float v_worldDis;\n\n#pragma include \"picking\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  gl_FragColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       gl_FragColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        gl_FragColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    gl_FragColor.rgb += r * r * u_circleSweepColor;\n  }\n   \n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/build_vert.glsl' */
 var buildVert = "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;\nuniform mat4 u_ModelMatrix;\n\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\nvarying vec4 v_Color;\n\nuniform float u_circleSweep;\nuniform vec2 u_cityCenter;\n\nvarying float v_worldDis;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {\n      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    }\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\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  setPickingColor(a_PickingColor);\n}\n";
-var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
+var CityBuildModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CityBuildModel, _BaseModel);
   var _super = _createSuper(CityBuildModel);
   function CityBuildModel() {
@@ -206,5 +206,4 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return CityBuildModel;
-}(_BaseModel2.default);
-exports.default = CityBuildModel;
+}(_BaseModel2.default);