@antv/l7-layers 2.9.19 → 2.9.22-alpha.0

package/es/Geometry/index.js

@@ -10,10 +10,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import BaseLayer from '../core/BaseLayer';
-import GeometryModels from './models';
+import BaseLayer from "../core/BaseLayer";
+import GeometryModels from "./models";
 
-var GeometryLayer = function (_BaseLayer) {
+var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(GeometryLayer, _BaseLayer);
 
   var _super = _createSuper(GeometryLayer);
@@ -103,5 +103,4 @@ var GeometryLayer = function (_BaseLayer) {
   return GeometryLayer;
 }(BaseLayer);
 
-export { GeometryLayer as default };
-//# sourceMappingURL=index.js.map
+export { GeometryLayer as default };

package/es/Geometry/models/billboard.js

@@ -13,11 +13,15 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { getMask } from '@antv/l7-utils';
-import BaseModel from '../../core/BaseModel';
+import BaseModel from "../../core/BaseModel";
+
+/* babel-plugin-inline-import '../shaders/billboard_frag.glsl' */
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
+/* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = 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      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      // gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n      gl_Position = u_Mvp * (vec4(x, y, z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(x , y, z , 1.0));\n   }\n\n   setPickingColor(a_PickingColor);\n}\n";
 
-var BillBoardModel = function (_BaseModel) {
+var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(BillBoardModel, _BaseModel);
 
   var _super = _createSuper(BillBoardModel);
@@ -33,8 +37,6 @@ var BillBoardModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "radian", 0);
 
     _defineProperty(_assertThisInitialized(_this), "planeGeometryTriangulation", function () {
@@ -63,17 +65,27 @@ var BillBoardModel = function (_BaseModel) {
           height = _ref2$height === void 0 ? 1 : _ref2$height,
           _ref2$raisingHeight = _ref2.raisingHeight,
           raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
+      /**
+       *               rotateFlag
+       * L7MAP            1
+       * MAPBOX           1
+       * GAODE2.x         -1
+       * GAODE1.x         -1
+       */
+
 
       var rotateFlag = 1;
 
       if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
         rotateFlag = -1;
-      }
+      } // 控制图标的旋转角度（绕 Z 轴旋转）
+
 
       this.radian = rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
       return {
         u_raisingHeight: Number(raisingHeight),
-        u_RotateMatrix: new Float32Array([Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
+        u_RotateMatrix: new Float32Array([// z
+        Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
         u_opacity: opacity || 1,
         u_texture: this.texture,
         u_size: [width, height]
@@ -180,6 +192,7 @@ var BillBoardModel = function (_BaseModel) {
         descriptor: {
           name: 'a_Extrude',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -191,13 +204,15 @@ var BillBoardModel = function (_BaseModel) {
             return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
           }
         }
-      });
+      }); // point layer size;
+
       this.styleAttributeService.registerStyleAttribute({
         name: 'uv',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -214,5 +229,4 @@ var BillBoardModel = function (_BaseModel) {
   return BillBoardModel;
 }(BaseModel);
 
-export { BillBoardModel as default };
-//# sourceMappingURL=billboard.js.map
+export { BillBoardModel as default };

package/es/Geometry/models/index.js

@@ -1,10 +1,9 @@
-import BillBoardModel from './billboard';
-import PlaneModel from './plane';
-import SpriteModel from './sprite';
+import BillBoardModel from "./billboard";
+import PlaneModel from "./plane";
+import SpriteModel from "./sprite";
 var GeometryModels = {
   plane: PlaneModel,
   sprite: SpriteModel,
   billboard: BillBoardModel
 };
-export default GeometryModels;
-//# sourceMappingURL=index.js.map
+export default GeometryModels;

package/es/Geometry/models/plane.js

@@ -14,12 +14,17 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { AttributeType, gl } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import { getMask } from '@antv/l7-utils';
-import BaseModel from '../../core/BaseModel';
+import { getMask } from '@antv/l7-utils'; // import { mat4, vec3 } from 'gl-matrix';
+
+import BaseModel from "../../core/BaseModel";
+
+/* babel-plugin-inline-import '../shaders/plane_frag.glsl' */
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n    gl_FragColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n  gl_FragColor.a *= v_clip;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
+/* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform float u_terrainClipHeight;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n  \n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n\n   // float x = 1.0;\n   // float y = 0.0;\n   // float z = 0.0;\n   // mat3 translateMatrix = mat3(\n   //    1.0, 0.0, 0.0 \n   //    0.0, 1.0, 0.0\n   //    -project_pos.x,    -project_pos.y,  1.0\n   // );\n   //  mat4 translateMatrix = mat4(\n   //    1.0, 0.0, 0.0, 0.0 ,\n   //    0.0, 1.0, 0.0, 0.0,\n   //    0.0, 0.0, 1.0, 0.0,\n   //    1.0, 0.0, 0.0, 1.0\n   // );\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n   }\n\n   setPickingColor(a_PickingColor);\n}\n";
 
-var PlaneModel = function (_BaseModel) {
+var PlaneModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(PlaneModel, _BaseModel);
 
   var _super = _createSuper(PlaneModel);
@@ -35,14 +40,8 @@ var PlaneModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "terrainImage", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "terrainImageLoaded", false);
 
-    _defineProperty(_assertThisInitialized(_this), "mapTexture", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "planeGeometryTriangulation", function () {
       var _this2;
 
@@ -64,6 +63,7 @@ var PlaneModel = function (_BaseModel) {
           positions = _this$initPlane.positions;
 
       if (terrainTexture) {
+        // 存在地形贴图的时候会根据地形贴图对顶点进行偏移
         _this.loadTerrainTexture(positions, indices);
       }
 
@@ -86,6 +86,7 @@ var PlaneModel = function (_BaseModel) {
       var heightSegments = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
       var lng = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 120;
       var lat = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 30;
+      // https://github.com/mrdoob/three.js/blob/dev/src/geometries/PlaneGeometry.js
       var widthHalf = width / 2;
       var heightHalf = height / 2;
       var gridX = Math.floor(widthSegments);
@@ -104,6 +105,7 @@ var PlaneModel = function (_BaseModel) {
           var x = ix * segmentWidth - widthHalf;
 
           if (this.mapService.version === Version['GAODE2.x']) {
+            // @ts-ignore
             var _ref2 = this.mapService.lngLatToCoord([x + lng, -y + lat]),
                 _ref3 = _slicedToArray(_ref2, 2),
                 a = _ref3[0],
@@ -167,6 +169,7 @@ var PlaneModel = function (_BaseModel) {
     value: function clearModels() {
       var _this$texture2;
 
+      // @ts-ignore
       this.terrainImage = null;
       (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
     }
@@ -200,7 +203,8 @@ var PlaneModel = function (_BaseModel) {
         blend: this.getBlend(),
         cull: {
           enable: true,
-          face: gl.BACK
+          face: gl.BACK // gl.FRONT | gl.BACK;
+
         }
       }).then(function (model) {
         callbackModel([model]);
@@ -326,6 +330,10 @@ var PlaneModel = function (_BaseModel) {
       this.layer.updateModelData(modelData);
       this.layerService.renderLayers();
     }
+    /**
+     * load terrain texture & offset attribute z
+     */
+
   }, {
     key: "loadTerrainTexture",
     value: function loadTerrainTexture(positions, indices) {
@@ -343,6 +351,7 @@ var PlaneModel = function (_BaseModel) {
       } : _ref8$rgb2height;
 
       if (this.terrainImage) {
+        // 若当前已经存在 image，直接进行偏移计算（LOD）
         if (this.terrainImageLoaded) {
           this.translateVertex(positions, indices, this.terrainImage, widthSegments, heightSegments, rgb2height);
         } else {
@@ -351,12 +360,14 @@ var PlaneModel = function (_BaseModel) {
           };
         }
       } else {
+        // 加载地形贴图、根据地形贴图对 planeGeometry 进行偏移
         var terrainImage = new Image();
         this.terrainImage = terrainImage;
         terrainImage.crossOrigin = 'anonymous';
 
         terrainImage.onload = function () {
-          _this4.terrainImageLoaded = true;
+          _this4.terrainImageLoaded = true; // 图片加载完，触发事件，可以进行地形图的顶点计算存储
+
           setTimeout(function () {
             return _this4.layer.emit('terrainImageLoaded', null);
           });
@@ -383,12 +394,14 @@ var PlaneModel = function (_BaseModel) {
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
+      // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'uv',
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
           buffer: {
+            // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
@@ -405,5 +418,4 @@ var PlaneModel = function (_BaseModel) {
   return PlaneModel;
 }(BaseModel);
 
-export { PlaneModel as default };
-//# sourceMappingURL=plane.js.map
+export { PlaneModel as default };

package/es/Geometry/models/sprite.js

@@ -14,8 +14,12 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 import { gl } from '@antv/l7-core';
 import { Version } from '@antv/l7-maps';
-import BaseModel from '../../core/BaseModel';
+import BaseModel from "../../core/BaseModel";
+
+/* babel-plugin-inline-import '../shaders/sprite_frag.glsl' */
 var spriteFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying float v_d;\n\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, gl_PointCoord);\n    gl_FragColor.a *= u_opacity;\n  } else {\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n}\n";
+
+/* babel-plugin-inline-import '../shaders/sprite_vert.glsl' */
 var spriteVert = "precision highp float;\n\nattribute vec3 a_Position;\nattribute vec3 a_Color;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform float u_Scale;\nvarying vec3 v_Color;\nvarying float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n   v_Color = a_Color;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_d = a_Position.z;\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n   }\n\n   gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;\n}\n";
 var SPRITE_ANIMATE_DIR;
 
@@ -24,7 +28,7 @@ var SPRITE_ANIMATE_DIR;
   SPRITE_ANIMATE_DIR["DOWN"] = "down";
 })(SPRITE_ANIMATE_DIR || (SPRITE_ANIMATE_DIR = {}));
 
-var SpriteModel = function (_BaseModel) {
+var SpriteModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(SpriteModel, _BaseModel);
 
   var _super = _createSuper(SpriteModel);
@@ -40,28 +44,13 @@ var SpriteModel = function (_BaseModel) {
 
     _this = _super.call.apply(_super, [this].concat(args));
 
-    _defineProperty(_assertThisInitialized(_this), "texture", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "mapTexture", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "positions", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "indices", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "timer", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "spriteTop", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "spriteUpdate", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "spriteAnimate", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "planeGeometryUpdateTriangulation", function () {
       var _ref = _this.layer.getLayerConfig(),
           _ref$spriteBottom = _ref.spriteBottom,
           spriteBottom = _ref$spriteBottom === void 0 ? -100000 : _ref$spriteBottom;
 
-      var updateZ = _this.spriteUpdate;
+      var updateZ = _this.spriteUpdate; // const bottomZ = -100000;
+
       var bottomZ = spriteBottom;
       var topZ = _this.spriteTop;
 
@@ -89,6 +78,7 @@ var SpriteModel = function (_BaseModel) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "updateModel", function () {
+      // @ts-ignore
       var attributes = _this.layer.createAttrubutes({
         triangulation: _this.planeGeometryUpdateTriangulation
       });
@@ -157,6 +147,7 @@ var SpriteModel = function (_BaseModel) {
         var y = -radius / 2 + randomY;
 
         if (mapService.version === Version['GAODE2.x']) {
+          // @ts-ignore
           var _ref3 = mapService.lngLatToCoord([x + lng, -y + lat]),
               _ref4 = _slicedToArray(_ref3, 2),
               a = _ref4[0],
@@ -310,5 +301,4 @@ var SpriteModel = function (_BaseModel) {
   return SpriteModel;
 }(BaseModel);
 
-export { SpriteModel as default };
-//# sourceMappingURL=sprite.js.map
+export { SpriteModel as default };

package/es/Geometry/shaders/billboard_frag.glsl

@@ -0,0 +1,13 @@
+
+uniform sampler2D u_texture;
+uniform float u_opacity;
+
+varying vec3 v_Color;
+varying vec2 v_uv;
+
+#pragma include "picking"
+void main() {
+  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));
+  gl_FragColor.a *= u_opacity;
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/es/Geometry/shaders/billboard_vert.glsl

@@ -0,0 +1,50 @@
+precision highp float;
+uniform mat4 u_ModelMatrix;
+uniform float u_raisingHeight: 0.0;
+uniform mat4 u_Mvp;
+uniform float u_opacity;
+uniform vec2 u_size: [1.0, 1.0];
+uniform mat2 u_RotateMatrix;
+
+attribute vec3 a_Extrude;
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
+attribute vec3 a_Color;
+
+varying vec3 v_Color;
+varying vec2 v_uv;
+
+#pragma include "projection"
+#pragma include "picking"
+void main() {
+   vec3 extrude = a_Extrude;
+   v_Color = a_Color;
+   v_uv = a_Uv;
+
+   float raiseHeight = u_raisingHeight;
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
+      raiseHeight = u_raisingHeight * mapboxZoomScale;
+   }
+
+   // 计算经纬度点位坐标
+   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
+
+   // 计算绕 z 轴旋转后的偏移
+   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));
+   // 绕 z 轴旋转
+   float x = project_pos.x + offsetXY.x;
+   float y = project_pos.y + offsetXY.y;
+   // z 轴不参与旋转
+   float z = project_pixel(extrude.y * u_size.y + raiseHeight);
+
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+      // gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));
+      gl_Position = u_Mvp * (vec4(x, y, z, 1.0));
+   } else {
+      gl_Position = project_common_position_to_clipspace(vec4(x , y, z , 1.0));
+   }
+
+   setPickingColor(a_PickingColor);
+}

package/es/Geometry/shaders/plane_frag.glsl

@@ -0,0 +1,22 @@
+
+uniform sampler2D u_texture;
+uniform float u_mapFlag;
+uniform float u_opacity;
+
+varying vec3 v_Color;
+varying vec2 v_uv;
+varying float v_clip;
+
+#pragma include "picking"
+void main() {
+  // gl_FragColor = vec4(v_Color, u_opacity);
+  if(u_mapFlag > 0.0) {
+    gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));
+    gl_FragColor.a *= u_opacity;
+  } else {
+    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);
+    gl_FragColor = vec4(v_Color, u_opacity);
+  }
+  gl_FragColor.a *= v_clip;
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/es/Geometry/shaders/plane_vert.glsl

@@ -0,0 +1,53 @@
+precision highp float;
+uniform mat4 u_ModelMatrix;
+
+uniform mat4 u_Mvp;
+uniform float u_opacity;
+uniform float u_terrainClipHeight;
+
+attribute vec3 a_Position;
+attribute vec2 a_Uv;
+attribute vec3 a_Color;
+
+varying vec3 v_Color;
+varying vec2 v_uv;
+varying float v_clip;
+
+#pragma include "projection"
+#pragma include "picking"
+void main() {
+   v_Color = a_Color;
+   v_uv = a_Uv;
+  
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+
+   v_clip = 1.0;
+   if(a_Position.z < u_terrainClipHeight) {
+      v_clip = 0.0;
+   }
+  
+   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
+
+   // float x = 1.0;
+   // float y = 0.0;
+   // float z = 0.0;
+   // mat3 translateMatrix = mat3(
+   //    1.0, 0.0, 0.0 
+   //    0.0, 1.0, 0.0
+   //    -project_pos.x,    -project_pos.y,  1.0
+   // );
+   //  mat4 translateMatrix = mat4(
+   //    1.0, 0.0, 0.0, 0.0 ,
+   //    0.0, 1.0, 0.0, 0.0,
+   //    0.0, 0.0, 1.0, 0.0,
+   //    1.0, 0.0, 0.0, 1.0
+   // );
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));
+   } else {
+      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
+   }
+
+   setPickingColor(a_PickingColor);
+}

package/es/Geometry/shaders/sprite_frag.glsl

@@ -0,0 +1,21 @@
+
+uniform sampler2D u_texture;
+uniform float u_mapFlag;
+uniform float u_opacity;
+
+varying vec3 v_Color;
+varying float v_d;
+
+void main() {
+
+  if(v_d < 0.0) {
+    discard;
+  }
+
+  if(u_mapFlag > 0.0) {
+    gl_FragColor = texture2D(u_texture, gl_PointCoord);
+    gl_FragColor.a *= u_opacity;
+  } else {
+    gl_FragColor = vec4(v_Color, u_opacity);
+  }
+}

package/es/Geometry/shaders/sprite_vert.glsl

@@ -0,0 +1,28 @@
+precision highp float;
+
+attribute vec3 a_Position;
+attribute vec3 a_Color;
+
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+uniform float u_opacity;
+uniform float u_Scale;
+varying vec3 v_Color;
+varying float v_d;
+
+#pragma include "projection"
+void main() {
+   v_Color = a_Color;
+  
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+
+   v_d = a_Position.z;
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));
+   } else {
+      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));
+   }
+
+   gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;
+}

package/es/canvas/index.js

@@ -10,10 +10,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import BaseLayer from '../core/BaseLayer';
-import CanvasModels from './models/index';
+import BaseLayer from "../core/BaseLayer";
+import CanvasModels from "./models/index";
 
-var CanvasLayer = function (_BaseLayer) {
+var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(CanvasLayer, _BaseLayer);
 
   var _super = _createSuper(CanvasLayer);
@@ -88,5 +88,4 @@ var CanvasLayer = function (_BaseLayer) {
   return CanvasLayer;
 }(BaseLayer);
 
-export { CanvasLayer as default };
-//# sourceMappingURL=index.js.map
+export { CanvasLayer as default };

package/es/canvas/models/canvas.js

@@ -11,10 +11,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import BaseModel from '../../core/BaseModel';
-import { CanvasUpdateType } from '../../core/interface';
+import BaseModel from "../../core/BaseModel";
+import { CanvasUpdateType } from "../../core/interface";
 
-var CanvaModel = function (_BaseModel) {
+var CanvaModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(CanvaModel, _BaseModel);
 
   var _super = _createSuper(CanvaModel);
@@ -32,12 +32,6 @@ var CanvaModel = function (_BaseModel) {
 
     _defineProperty(_assertThisInitialized(_this), "updateMode", CanvasUpdateType.ALWAYS);
 
-    _defineProperty(_assertThisInitialized(_this), "canvas", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "ctx", void 0);
-
-    _defineProperty(_assertThisInitialized(_this), "prevSize", void 0);
-
     _defineProperty(_assertThisInitialized(_this), "renderUpdate", function () {
       var _ref = _this.layer.getLayerConfig(),
           _ref$zIndex = _ref.zIndex,
@@ -145,7 +139,8 @@ var CanvaModel = function (_BaseModel) {
       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 ? void 0 : _this$mapService$getC.removeChild(this.canvas); // @ts-ignore
+
         this.canvas = null;
       }
 
@@ -214,5 +209,4 @@ var CanvaModel = function (_BaseModel) {
   return CanvaModel;
 }(BaseModel);
 
-export { CanvaModel as default };
-//# sourceMappingURL=canvas.js.map
+export { CanvaModel as default };

package/es/canvas/models/index.js

@@ -1,6 +1,5 @@
-import CanvasModel from './canvas';
+import CanvasModel from "./canvas";
 var CanvasModels = {
   canvas: CanvasModel
 };
-export default CanvasModels;
-//# sourceMappingURL=index.js.map
+export default CanvasModels;

package/es/citybuliding/building.js

@@ -10,10 +10,10 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 
 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; } }
 
-import BaseLayer from '../core/BaseLayer';
-import CityBuildModel from './models/build';
+import BaseLayer from "../core/BaseLayer";
+import CityBuildModel from "./models/build";
 
-var CityBuildingLayer = function (_BaseLayer) {
+var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(CityBuildingLayer, _BaseLayer);
 
   var _super = _createSuper(CityBuildingLayer);
@@ -85,5 +85,4 @@ var CityBuildingLayer = function (_BaseLayer) {
   return CityBuildingLayer;
 }(BaseLayer);
 
-export { CityBuildingLayer as default };
-//# sourceMappingURL=building.js.map
+export { CityBuildingLayer as default };