@antv/l7-layers 2.9.32-alpha.0 → 2.9.32-alpha.2

package/es/point/models/earthFill.js

@@ -1,258 +0,0 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-
-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); }; }
-
-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 { AttributeType, gl } from '@antv/l7-core';
-import { isNumber } from 'lodash';
-import BaseModel from "../../core/BaseModel";
-import { GlobelPointFillTriangulation } from "../../core/triangulation";
-
-/* babel-plugin-inline-import '../shaders/earth/fill_frag.glsl' */
-var pointFillFrag = "uniform float u_additive;\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 textrueStroke = vec4(\n    styleMappingMat[1][0],\n    styleMappingMat[1][1],\n    styleMappingMat[1][2],\n    styleMappingMat[1][3]\n  );\n\n  float opacity = styleMappingMat[0][0];\n  float stroke_opacity = styleMappingMat[0][1];\n  float strokeWidth = styleMappingMat[0][2];\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  if(outer_df > antialiasblur + 0.018) discard;\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
-
-/* babel-plugin-inline-import '../shaders/earth/fill_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\n\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\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n#pragma include \"styleMappingCalStrokeOpacity\"\n#pragma include \"styleMappingCalStrokeWidth\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\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 - empty\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\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\n  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][1] = strokeOpacityAndOffset.r;\n  textureOffset = strokeOpacityAndOffset.g;\n\n  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][2] = strokeWidthAndOffset.r;\n  textureOffset = strokeWidthAndOffset.g;\n\n  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);\n  if(hasStroke()) {\n    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R\n    textureOffset += 1.0;\n\n    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G\n    textureOffset += 1.0;\n\n    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B\n    textureOffset += 1.0;\n\n    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);\n    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A\n    textureOffset += 1.0;\n  } else {\n    if(u_stroke_color == vec4(0.0)) {\n      styleMappingMat[1][0] = v_color.r;\n      styleMappingMat[1][1] = v_color.g;\n      styleMappingMat[1][2] = v_color.b;\n      styleMappingMat[1][3] = v_color.a;\n    } else {\n      styleMappingMat[1][0] = u_stroke_color.r;\n      styleMappingMat[1][1] = u_stroke_color.g;\n      styleMappingMat[1][2] = u_stroke_color.b;\n      styleMappingMat[1][3] = u_stroke_color.a;\n    }\n  }\n\n  // cal style mapping\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1, 1.0);\n\n  setPickingColor(a_PickingColor);\n}\n";
-import { mat4, vec3 } from 'gl-matrix';
-
-var FillModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(FillModel, _BaseModel);
-
-  var _super = _createSuper(FillModel);
-
-  function FillModel() {
-    _classCallCheck(this, FillModel);
-
-    return _super.apply(this, arguments);
-  }
-
-  _createClass(FillModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          _ref$strokeOpacity = _ref.strokeOpacity,
-          strokeOpacity = _ref$strokeOpacity === void 0 ? 1 : _ref$strokeOpacity,
-          _ref$strokeWidth = _ref.strokeWidth,
-          strokeWidth = _ref$strokeWidth === void 0 ? 0 : _ref$strokeWidth,
-          _ref$stroke = _ref.stroke,
-          stroke = _ref$stroke === void 0 ? 'rgba(0,0,0,0)' : _ref$stroke,
-          _ref$offsets = _ref.offsets,
-          offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
-          blend = _ref.blend,
-          _ref$blur = _ref.blur,
-          blur = _ref$blur === void 0 ? 0 : _ref$blur;
-
-      if (this.dataTextureTest && this.dataTextureNeedUpdate({
-        opacity: opacity,
-        strokeOpacity: strokeOpacity,
-        strokeWidth: strokeWidth,
-        stroke: stroke,
-        offsets: offsets
-      })) {
-        // 判断当前的样式中哪些是需要进行数据映射的，哪些是常量，同时计算用于构建数据纹理的一些中间变量
-        this.judgeStyleAttributes({
-          opacity: opacity,
-          strokeOpacity: strokeOpacity,
-          strokeWidth: strokeWidth,
-          stroke: stroke,
-          offsets: offsets
-        });
-        var encodeData = this.layer.getEncodedData();
-
-        var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
-            data = _this$calDataFrame.data,
-            width = _this$calDataFrame.width,
-            height = _this$calDataFrame.height;
-
-        this.rowCount = height; // 当前数据纹理有多少行
-
-        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
-          flipY: true,
-          data: data,
-          format: gl.LUMINANCE,
-          type: gl.FLOAT,
-          width: width,
-          height: height
-        }) : this.createTexture2D({
-          flipY: true,
-          data: [1],
-          format: gl.LUMINANCE,
-          type: gl.FLOAT,
-          width: 1,
-          height: 1
-        });
-      }
-
-      return {
-        u_blur: blur,
-        u_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        u_cellTypeLayout: this.getCellTypeLayout(),
-        u_opacity: isNumber(opacity) ? opacity : 1.0,
-        u_stroke_opacity: isNumber(strokeOpacity) ? strokeOpacity : 1.0,
-        u_stroke_width: isNumber(strokeWidth) ? strokeWidth : 1.0,
-        u_stroke_color: this.getStrokeColor(stroke),
-        u_offsets: this.isOffsetStatic(offsets) ? offsets : [0, 0]
-      };
-    }
-  }, {
-    key: "getAnimateUniforms",
-    value: function getAnimateUniforms() {
-      var _ref2 = this.layer.getLayerConfig(),
-          _ref2$animateOption = _ref2.animateOption,
-          animateOption = _ref2$animateOption === void 0 ? {
-        enable: false
-      } : _ref2$animateOption;
-
-      return {
-        u_animate: this.animateOption2Array(animateOption),
-        u_time: this.layer.getLayerAnimateTime()
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
-    value: function buildModels(callbackModel) {
-      this.layer.triangulation = GlobelPointFillTriangulation;
-      this.layer.buildLayerModel({
-        moduleName: 'pointEarthFill',
-        vertexShader: pointFillVert,
-        fragmentShader: pointFillFrag,
-        triangulation: GlobelPointFillTriangulation,
-        depth: {
-          enable: true
-        },
-        blend: this.getBlend()
-      }).then(function (model) {
-        callbackModel([model]);
-      }).catch(function (err) {
-        console.warn(err);
-        callbackModel([]);
-      });
-    }
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    } // overwrite baseModel func
-
-  }, {
-    key: "animateOption2Array",
-    value: function animateOption2Array(option) {
-      return [option.enable ? 0 : 1.0, option.speed || 1, option.rings || 3, 0];
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      var _this = this;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'extrude',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Extrude',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var _vertex = _slicedToArray(vertex, 3),
-                x = _vertex[0],
-                y = _vertex[1],
-                z = _vertex[2];
-
-            var n1 = vec3.fromValues(0, 0, 1);
-            var n2 = vec3.fromValues(x, 0, z);
-            var xzReg = x >= 0 ? vec3.angle(n1, n2) : Math.PI * 2 - vec3.angle(n1, n2);
-            var yReg = Math.PI * 2 - Math.asin(y / 100);
-            var m = mat4.create();
-            mat4.rotateY(m, m, xzReg);
-            mat4.rotateX(m, m, yReg);
-            var v1 = vec3.fromValues(1, 1, 0);
-            vec3.transformMat4(v1, v1, m);
-            vec3.normalize(v1, v1);
-            var v2 = vec3.fromValues(-1, 1, 0);
-            vec3.transformMat4(v2, v2, m);
-            vec3.normalize(v2, v2);
-            var v3 = vec3.fromValues(-1, -1, 0);
-            vec3.transformMat4(v3, v3, m);
-            vec3.normalize(v3, v3);
-            var v4 = vec3.fromValues(1, -1, 0);
-            vec3.transformMat4(v4, v4, m);
-            vec3.normalize(v4, v4);
-            var extrude = [].concat(_toConsumableArray(v1), _toConsumableArray(v2), _toConsumableArray(v3), _toConsumableArray(v4));
-            var extrudeIndex = attributeIdx % 4 * 3;
-            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
-          }
-        }
-      }); // point layer size;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var _feature$size = feature.size,
-                size = _feature$size === void 0 ? 5 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
-          }
-        }
-      }); // point layer size;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'shape',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Shape',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
-            var _feature$shape = feature.shape,
-                shape = _feature$shape === void 0 ? 2 : _feature$shape;
-
-            var shape2d = _this.layer.getLayerConfig().shape2d;
-
-            var shapeIndex = shape2d.indexOf(shape);
-            return [shapeIndex];
-          }
-        }
-      });
-    }
-  }]);
-
-  return FillModel;
-}(BaseModel);
-
-export { FillModel as default };

package/es/point/models/extrude.d.ts

@@ -1,24 +0,0 @@
-import { IModel } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class ExtrudeModel extends BaseModel {
-    private raiseCount;
-    private raiseRepeat;
-    getUninforms(): {
-        u_pickLight: number;
-        u_heightfixed: number;
-        u_r: number;
-        u_dataTexture: import("@antv/l7-core").ITexture2D;
-        u_cellTypeLayout: number[];
-        u_opacity: number;
-        u_linearColor: number;
-        u_sourceColor: number[];
-        u_targetColor: number[];
-        u_opacitylinear: number;
-        u_opacitylinear_dir: number;
-        u_lightEnable: number;
-    };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    clearModels(): void;
-    protected registerBuiltinAttributes(): void;
-}

package/es/point/models/extrude.js

@@ -1,295 +0,0 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
-import _createClass from "@babel/runtime/helpers/createClass";
-import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
-import _inherits from "@babel/runtime/helpers/inherits";
-import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
-import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-
-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); }; }
-
-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 { AttributeType, gl } from '@antv/l7-core';
-import { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';
-import { isNumber } from 'lodash';
-import BaseModel from "../../core/BaseModel";
-import { PointExtrudeTriangulation } from "../../core/triangulation";
-
-/* babel-plugin-inline-import '../shaders/extrude/extrude_frag.glsl' */
-var pointExtrudeFrag = "varying vec4 v_color;\nuniform float u_opacity: 1.0;\n\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\nuniform float u_linearColor: 0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\n\nuniform float u_opacitylinear: 0.0;\nuniform float u_opacitylinear_dir: 1.0;\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  float lightWeight = styleMappingMat[1][3];\n  float barLinearZ = styleMappingMat[2][3];\n\n  // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    gl_FragColor = mix(u_sourceColor, u_targetColor, barLinearZ);\n    gl_FragColor.rgb *= lightWeight;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     gl_FragColor = v_color;\n  }\n\n  // \u5E94\u7528\u900F\u660E\u5EA6\n  gl_FragColor.a *= opacity;\n\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - barLinearZ): barLinearZ;\n  }\n\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
-
-/* babel-plugin-inline-import '../shaders/extrude/extrude_vert.glsl' */
-var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\n\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\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\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 - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA - lightWeight\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - linearZ(\u5782\u76F4\u65B9\u5411 0 - 1 \u7684\u503C)\n    0.0, 0.0, 0.0, 0.0\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  vec3 size = a_Size * a_Position;\n\n  // a_Position.z \u662F\u5728\u6784\u5EFA\u7F51\u683C\u7684\u65F6\u5019\u4F20\u5165\u7684\u6807\u51C6\u503C 0 - 1\uFF0C\u5728\u63D2\u503C\u5668\u63D2\u503C\u53EF\u4EE5\u83B7\u53D6 0\uFF5E1 \u7EBF\u6027\u6E10\u53D8\u7684\u503C\n  styleMappingMat[2][3] =  a_Position.z;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n  styleMappingMat[1][3] = lightWeight;\n\n  v_color =vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  // gl_Position = project_common_position_to_clipspace(pos);\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * pos;\n  } else {\n    gl_Position = project_common_position_to_clipspace(pos);\n  }\n\n  setPickingColor(a_PickingColor);\n}\n";
-
-var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
-  _inherits(ExtrudeModel, _BaseModel);
-
-  var _super = _createSuper(ExtrudeModel);
-
-  function ExtrudeModel() {
-    var _this;
-
-    _classCallCheck(this, ExtrudeModel);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _defineProperty(_assertThisInitialized(_this), "raiseCount", 0);
-
-    _defineProperty(_assertThisInitialized(_this), "raiseRepeat", 0);
-
-    return _this;
-  }
-
-  _createClass(ExtrudeModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$animateOption = _ref.animateOption,
-          animateOption = _ref$animateOption === void 0 ? {
-        enable: false,
-        speed: 0.01,
-        repeat: false
-      } : _ref$animateOption,
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          sourceColor = _ref.sourceColor,
-          targetColor = _ref.targetColor,
-          _ref$pickLight = _ref.pickLight,
-          pickLight = _ref$pickLight === void 0 ? false : _ref$pickLight,
-          _ref$heightfixed = _ref.heightfixed,
-          heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
-          _ref$opacityLinear = _ref.opacityLinear,
-          opacityLinear = _ref$opacityLinear === void 0 ? {
-        enable: false,
-        dir: 'up'
-      } : _ref$opacityLinear,
-          _ref$lightEnable = _ref.lightEnable,
-          lightEnable = _ref$lightEnable === void 0 ? true : _ref$lightEnable;
-
-      if (this.dataTextureTest && this.dataTextureNeedUpdate({
-        opacity: opacity
-      })) {
-        this.judgeStyleAttributes({
-          opacity: opacity
-        });
-        var encodeData = this.layer.getEncodedData();
-
-        var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
-            data = _this$calDataFrame.data,
-            width = _this$calDataFrame.width,
-            height = _this$calDataFrame.height;
-
-        this.rowCount = height; // 当前数据纹理有多少行
-
-        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
-          flipY: true,
-          data: data,
-          format: gl.LUMINANCE,
-          type: gl.FLOAT,
-          width: width,
-          height: height
-        }) : this.createTexture2D({
-          flipY: true,
-          data: [1],
-          format: gl.LUMINANCE,
-          type: gl.FLOAT,
-          width: 1,
-          height: 1
-        });
-      } // 转化渐变色
-
-
-      var useLinearColor = 0; // 默认不生效
-
-      var sourceColorArr = [0, 0, 0, 0];
-      var targetColorArr = [0, 0, 0, 0];
-
-      if (sourceColor && targetColor) {
-        sourceColorArr = rgb2arr(sourceColor);
-        targetColorArr = rgb2arr(targetColor);
-        useLinearColor = 1;
-      }
-
-      if (this.raiseCount < 1 && this.raiseRepeat > 0) {
-        if (animateOption.enable) {
-          var _animateOption$speed = animateOption.speed,
-              speed = _animateOption$speed === void 0 ? 0.01 : _animateOption$speed;
-          this.raiseCount += speed;
-
-          if (this.raiseCount >= 1) {
-            if (this.raiseRepeat > 1) {
-              this.raiseCount = 0;
-              this.raiseRepeat--;
-            } else {
-              this.raiseCount = 1;
-            }
-          }
-        }
-      }
-
-      return {
-        // 圆柱体的拾取高亮是否要计算光照
-        u_pickLight: Number(pickLight),
-        // 圆柱体是否固定高度
-        u_heightfixed: Number(heightfixed),
-        u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        u_cellTypeLayout: this.getCellTypeLayout(),
-        u_opacity: isNumber(opacity) ? opacity : 1.0,
-        // 渐变色支持参数
-        u_linearColor: useLinearColor,
-        u_sourceColor: sourceColorArr,
-        u_targetColor: targetColorArr,
-        // 透明度渐变
-        u_opacitylinear: Number(opacityLinear.enable),
-        u_opacitylinear_dir: opacityLinear.dir === 'up' ? 1.0 : 0.0,
-        // 光照计算开关
-        u_lightEnable: Number(lightEnable)
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(callbackModel) {
-        var _ref2, _ref2$depth, depth, _ref2$animateOption$r, repeat;
-
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                // GAODE1.x GAODE2.x MAPBOX
-                _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
-                this.raiseRepeat = repeat;
-                this.layer.buildLayerModel({
-                  moduleName: 'pointExtrude',
-                  vertexShader: pointExtrudeVert,
-                  fragmentShader: pointExtrudeFrag,
-                  triangulation: PointExtrudeTriangulation,
-                  blend: this.getBlend(),
-                  cull: {
-                    enable: true,
-                    face: getCullFace(this.mapService.version)
-                  },
-                  depth: {
-                    enable: depth
-                  }
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
-                });
-
-              case 3:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels(_x) {
-        return _buildModels.apply(this, arguments);
-      }
-
-      return buildModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature) {
-            var size = feature.size;
-
-            if (size) {
-              var buffersize = [];
-
-              if (Array.isArray(size)) {
-                buffersize = size.length === 2 ? [size[0], size[0], size[1]] : size;
-              }
-
-              if (!Array.isArray(size)) {
-                buffersize = [size, size, size];
-              }
-
-              return buffersize;
-            } else {
-              return [2, 2, 2];
-            }
-          }
-        }
-      }); // point layer size;
-
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'normal',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Normal',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.STATIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
-            return normal;
-          }
-        }
-      });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'pos',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Pos',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 3,
-          update: function update(feature) {
-            var coordinates = calculateCentroid(feature.coordinates);
-            return [coordinates[0], coordinates[1], 0];
-          }
-        }
-      });
-    }
-  }]);
-
-  return ExtrudeModel;
-}(BaseModel);
-
-export { ExtrudeModel as default };

package/es/point/models/fill.d.ts

@@ -1,40 +0,0 @@
-import { IAnimateOption, IAttribute, IElements, IModel, IModelUniform } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class FillModel extends BaseModel {
-    private meter2coord;
-    private meterYScale;
-    private isMeter;
-    private unit;
-    getUninforms(): IModelUniform;
-    getAnimateUniforms(): IModelUniform;
-    getAttribute(): {
-        attributes: {
-            [attributeName: string]: IAttribute;
-        };
-        elements: IElements;
-    };
-    initModels(callbackModel: (models: IModel[]) => void): void;
-    /**
-     * 计算等面积点图层（unit meter）笛卡尔坐标标度与世界坐标标度的比例
-     * @returns
-     */
-    calMeter2Coord(): void;
-    buildModels(callbackModel: (models: IModel[]) => void): Promise<void>;
-    /**
-     * 根据 animateOption 的值返回对应的 shader 代码
-     * @returns
-     */
-    getShaders(animateOption: Partial<IAnimateOption>): {
-        frag: string;
-        vert: string;
-        type: string;
-    };
-    clearModels(): void;
-    protected animateOption2Array(option: Partial<IAnimateOption>): number[];
-    protected registerBuiltinAttributes(): void;
-    /**
-     * 判断是否更新点图层的计量单位
-     * @param unit
-     */
-    private updateUnit;
-}