@antv/l7-layers 2.9.25-alpha.0 → 2.9.26-alpha.1

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -1,58 +1,64 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
-
-// src/plugins/LayerAnimateStylePlugin.ts
-var LayerAnimateStylePlugin_exports = {};
-__export(LayerAnimateStylePlugin_exports, {
-  default: () => LayerAnimateStylePlugin
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(LayerAnimateStylePlugin_exports);
-var import_l7_core = require("@antv/l7-core");
-var import_inversify = require("inversify");
-var import_reflect_metadata = require("reflect-metadata");
-var LayerAnimateStylePlugin = class {
-  apply(layer) {
-    layer.hooks.beforeRender.tap("LayerAnimateStylePlugin", () => {
-      layer.models.forEach((model) => {
-        model.addUniforms({
-          ...layer.layerModel.getAnimateUniforms()
+exports.default = void 0;
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _applyDecoratedDescriptor2 = _interopRequireDefault(require("@babel/runtime/helpers/applyDecoratedDescriptor"));
+
+var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerWarningHelper"));
+
+var _l7Core = require("@antv/l7-core");
+
+var _inversify = require("inversify");
+
+require("reflect-metadata");
+
+var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+
+var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+  function LayerAnimateStylePlugin() {
+    (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
+    (0, _initializerDefineProperty2.default)(this, "cameraService", _descriptor, this);
+    (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor2, this);
+  }
+
+  (0, _createClass2.default)(LayerAnimateStylePlugin, [{
+    key: "apply",
+    value: function apply(layer) {
+      // layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', () => {
+      // })
+      layer.hooks.beforeRender.tap('LayerAnimateStylePlugin', function () {
+        // 重新计算坐标系参数
+        layer.models.forEach(function (model) {
+          model.addUniforms((0, _objectSpread2.default)({}, layer.layerModel.getAnimateUniforms()));
         });
       });
-    });
-  }
-};
-__decorateClass([
-  (0, import_inversify.inject)(import_l7_core.TYPES.ICameraService)
-], LayerAnimateStylePlugin.prototype, "cameraService", 2);
-__decorateClass([
-  (0, import_inversify.inject)(import_l7_core.TYPES.IRendererService)
-], LayerAnimateStylePlugin.prototype, "rendererService", 2);
-LayerAnimateStylePlugin = __decorateClass([
-  (0, import_inversify.injectable)()
-], LayerAnimateStylePlugin);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+    }
+  }]);
+  return LayerAnimateStylePlugin;
+}(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "rendererService", [_dec3], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);
+exports.default = LayerAnimateStylePlugin;

package/lib/plugins/LayerModelPlugin.js

@@ -1,75 +1,82 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
-
-// src/plugins/LayerModelPlugin.ts
-var LayerModelPlugin_exports = {};
-__export(LayerModelPlugin_exports, {
-  default: () => LayerModelPlugin
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(LayerModelPlugin_exports);
-var import_inversify = require("inversify");
-var import_reflect_metadata = require("reflect-metadata");
-var LayerModelPlugin = class {
-  initLayerModel(layer) {
-    layer.prepareBuildModel();
-    layer.buildModels();
-    layer.emit("modelLoaded", null);
-    layer.styleNeedUpdate = false;
-  }
-  prepareLayerModel(layer) {
-    layer.prepareBuildModel();
-    layer.clearModels();
-    layer.buildModels();
-    layer.emit("modelLoaded", null);
-    layer.layerModelNeedUpdate = false;
-  }
-  apply(layer) {
-    layer.hooks.init.tap("LayerModelPlugin", () => {
-      layer.inited = true;
-      const source = layer.getSource();
-      if (source.inited) {
-        this.initLayerModel(layer);
-      }
-    });
-    layer.hooks.beforeRenderData.tap("DataSourcePlugin", () => {
-      const source = layer.getSource();
-      if (source.inited) {
-        this.prepareLayerModel(layer);
-      } else {
-        source.once("sourceUpdate", () => {
-          this.prepareLayerModel(layer);
-        });
-      }
-      return false;
-    });
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inversify = require("inversify");
+
+require("reflect-metadata");
+
+var _dec, _class;
+
+var LayerModelPlugin = (
+/**
+ * Layer Model 初始化，更新，销毁
+ */
+_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+  function LayerModelPlugin() {
+    (0, _classCallCheck2.default)(this, LayerModelPlugin);
   }
-};
-LayerModelPlugin = __decorateClass([
-  (0, import_inversify.injectable)()
-], LayerModelPlugin);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+
+  (0, _createClass2.default)(LayerModelPlugin, [{
+    key: "initLayerModel",
+    value: function initLayerModel(layer) {
+      // 更新Model 配置项
+      layer.prepareBuildModel(); // 初始化 Model
+
+      layer.buildModels(); // emit layer model loaded
+
+      layer.emit('modelLoaded', null);
+      layer.styleNeedUpdate = false;
+    }
+  }, {
+    key: "prepareLayerModel",
+    value: function prepareLayerModel(layer) {
+      // 更新Model 配置项
+      layer.prepareBuildModel();
+      layer.clearModels(); // 初始化 Model
+
+      layer.buildModels(); // emit layer model loaded
+
+      layer.emit('modelLoaded', null);
+      layer.layerModelNeedUpdate = false;
+    }
+  }, {
+    key: "apply",
+    value: function apply(layer) {
+      var _this = this;
+
+      layer.hooks.init.tap('LayerModelPlugin', function () {
+        layer.inited = true;
+        var source = layer.getSource();
+
+        if (source.inited) {
+          _this.initLayerModel(layer);
+        }
+      });
+      layer.hooks.beforeRenderData.tap('DataSourcePlugin', function () {
+        var source = layer.getSource();
+
+        if (source.inited) {
+          _this.prepareLayerModel(layer);
+        } else {
+          source.once('sourceUpdate', function () {
+            _this.prepareLayerModel(layer);
+          });
+        }
+
+        return false;
+      });
+    }
+  }]);
+  return LayerModelPlugin;
+}()) || _class);
+exports.default = LayerModelPlugin;

package/lib/plugins/LayerStylePlugin.js

@@ -1,53 +1,50 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
-
-// src/plugins/LayerStylePlugin.ts
-var LayerStylePlugin_exports = {};
-__export(LayerStylePlugin_exports, {
-  default: () => LayerStylePlugin
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(LayerStylePlugin_exports);
-var import_inversify = require("inversify");
-var import_reflect_metadata = require("reflect-metadata");
-var LayerStylePlugin = class {
-  apply(layer) {
-    layer.hooks.afterInit.tap("LayerStylePlugin", () => {
-      layer.updateLayerConfig({});
-      const { autoFit, fitBoundsOptions } = layer.getLayerConfig();
-      if (autoFit) {
-        setTimeout(() => {
-          layer.fitBounds(fitBoundsOptions);
-        }, 100);
-      }
-    });
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inversify = require("inversify");
+
+require("reflect-metadata");
+
+var _dec, _class;
+
+var LayerStylePlugin = (
+/**
+ * 更新图层样式，初始图层相关配置
+ */
+_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+  function LayerStylePlugin() {
+    (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
-};
-LayerStylePlugin = __decorateClass([
-  (0, import_inversify.injectable)()
-], LayerStylePlugin);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});
+
+  (0, _createClass2.default)(LayerStylePlugin, [{
+    key: "apply",
+    value: function apply(layer) {
+      layer.hooks.afterInit.tap('LayerStylePlugin', function () {
+        // 更新图层默认状态
+        layer.updateLayerConfig({});
+
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            autoFit = _layer$getLayerConfig.autoFit,
+            fitBoundsOptions = _layer$getLayerConfig.fitBoundsOptions;
+
+        if (autoFit) {
+          setTimeout(function () {
+            layer.fitBounds(fitBoundsOptions);
+          }, 100);
+        }
+      });
+    }
+  }]);
+  return LayerStylePlugin;
+}()) || _class);
+exports.default = LayerStylePlugin;

package/lib/plugins/LightingPlugin.js

@@ -1,51 +1,40 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __decorateClass = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
-  for (var i = decorators.length - 1, decorator; i >= 0; i--)
-    if (decorator = decorators[i])
-      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
-  return result;
-};
+"use strict";
 
-// src/plugins/LightingPlugin.ts
-var LightingPlugin_exports = {};
-__export(LightingPlugin_exports, {
-  default: () => LightingPlugin,
-  generateLightingUniforms: () => generateLightingUniforms
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(LightingPlugin_exports);
-var import_inversify = require("inversify");
-var import_reflect_metadata = require("reflect-metadata");
+exports.default = void 0;
+exports.generateLightingUniforms = generateLightingUniforms;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+
+var _inversify = require("inversify");
+
+require("reflect-metadata");
+
+var _dec, _class;
+
+var _excluded = ["type"];
 var lightTypeUniformMap = {
   directional: {
-    lights: "u_DirectionalLights",
-    num: "u_NumOfDirectionalLights"
+    lights: 'u_DirectionalLights',
+    num: 'u_NumOfDirectionalLights'
   },
   spot: {
-    lights: "u_SpotLights",
-    num: "u_NumOfSpotLights"
+    lights: 'u_SpotLights',
+    num: 'u_NumOfSpotLights'
   }
 };
 var DEFAULT_LIGHT = {
-  type: "directional",
+  type: 'directional',
   direction: [1, 10.5, 12],
   ambient: [0.2, 0.2, 0.2],
   diffuse: [0.6, 0.6, 0.6],
@@ -70,44 +59,67 @@ var DEFAULT_SPOT_LIGHT = {
   exponent: 40,
   blur: 5
 };
+var COLOR_ATTRIBUTES = ['ambient', 'diffuse', 'specular'];
+
 function generateLightingUniforms(lights) {
-  const lightsMap = {
-    u_DirectionalLights: new Array(3).fill({ ...DEFAULT_DIRECTIONAL_LIGHT }),
+  var lightsMap = {
+    u_DirectionalLights: new Array(3).fill((0, _objectSpread2.default)({}, DEFAULT_DIRECTIONAL_LIGHT)),
     u_NumOfDirectionalLights: 0,
-    u_SpotLights: new Array(3).fill({ ...DEFAULT_SPOT_LIGHT }),
+    u_SpotLights: new Array(3).fill((0, _objectSpread2.default)({}, DEFAULT_SPOT_LIGHT)),
     u_NumOfSpotLights: 0
   };
+
   if (!lights || !lights.length) {
     lights = [DEFAULT_LIGHT];
   }
-  lights.forEach(({ type = "directional", ...rest }, i) => {
-    const lightsUniformName = lightTypeUniformMap[type].lights;
-    const lightsNumUniformName = lightTypeUniformMap[type].num;
-    const num = lightsMap[lightsNumUniformName];
-    lightsMap[lightsUniformName][num] = {
-      ...lightsMap[lightsUniformName][num],
-      ...rest
-    };
+
+  lights.forEach(function (_ref, i) {
+    var _ref$type = _ref.type,
+        type = _ref$type === void 0 ? 'directional' : _ref$type,
+        rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+    var lightsUniformName = lightTypeUniformMap[type].lights;
+    var lightsNumUniformName = lightTypeUniformMap[type].num; // Object.keys(rest).forEach(key => {
+    //   if (Util.isString(rest[key]) && COLOR_ATTRIBUTES.indexOf(key) > -1) {
+    //     rest[key] = ColorUtil.color2RGBA(rest[key]).slice(0, 3);
+    //   }
+    // });
+    // @ts-ignore
+
+    var num = lightsMap[lightsNumUniformName]; // @ts-ignore
+
+    lightsMap[lightsUniformName][num] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, lightsMap[lightsUniformName][num]), rest); // @ts-ignore
+
     lightsMap[lightsNumUniformName]++;
   });
   return lightsMap;
 }
-var LightingPlugin = class {
-  apply(layer) {
-    layer.hooks.beforeRender.tap("LightingPlugin", () => {
-      const { enableLighting } = layer.getLayerConfig();
-      if (enableLighting) {
-        layer.models.forEach((model) => model.addUniforms({
-          ...generateLightingUniforms()
-        }));
-      }
-    });
+/**
+ * 光照 & Shadow
+ */
+
+
+var LightingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+  function LightingPlugin() {
+    (0, _classCallCheck2.default)(this, LightingPlugin);
   }
-};
-LightingPlugin = __decorateClass([
-  (0, import_inversify.injectable)()
-], LightingPlugin);
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  generateLightingUniforms
-});
+
+  (0, _createClass2.default)(LightingPlugin, [{
+    key: "apply",
+    value: function apply(layer) {
+      layer.hooks.beforeRender.tap('LightingPlugin', function () {
+        var _layer$getLayerConfig = layer.getLayerConfig(),
+            enableLighting = _layer$getLayerConfig.enableLighting;
+
+        if (enableLighting) {
+          layer.models.forEach(function (model) {
+            return (// @ts-ignore
+              model.addUniforms((0, _objectSpread2.default)({}, generateLightingUniforms()))
+            );
+          });
+        }
+      });
+    }
+  }]);
+  return LightingPlugin;
+}()) || _class);
+exports.default = LightingPlugin;