@antv/l7-core - npm Package Compare versions

Comparing version 2.13.5 to 2.13.6

es/index.d.ts

@@ -20,2 +20,3 @@ import container, { createLayerContainer, createSceneContainer, lazyInject, lazyMultiInject } from './inversify.config';
 export * from './services/layer/ILayerService';
+export * from './services/debug/IDebugService';
 export * from './services/layer/IStyleAttributeService';
@@ -22,0 +23,0 @@ export * from './services/source/ISourceService';

es/index.js

@@ -21,2 +21,3 @@ import container, { createLayerContainer, createSceneContainer, lazyInject, lazyMultiInject } from "./inversify.config";
 export * from "./services/layer/ILayerService";
+export * from "./services/debug/IDebugService";
 export * from "./services/layer/IStyleAttributeService";
@@ -23,0 +24,0 @@ export * from "./services/source/ISourceService";

es/inversify.config.js

@@ -24,2 +24,3 @@ /**
 import LayerService from "./services/layer/LayerService";
+import DebugService from "./services/debug/DebugService";
 import StyleAttributeService from "./services/layer/StyleAttributeService";
@@ -103,2 +104,3 @@ import SceneService from "./services/scene/SceneService";
   sceneContainer.bind(TYPES.ILayerService).to(LayerService).inSingletonScope();
+  sceneContainer.bind(TYPES.IDebugService).to(DebugService).inSingletonScope();
   sceneContainer.bind(TYPES.ISceneService).to(SceneService).inSingletonScope();
@@ -105,0 +107,0 @@ sceneContainer.bind(TYPES.ICameraService).to(CameraService).inSingletonScope();

es/services/config/IConfigService.d.ts

@@ -18,2 +18,3 @@ import { PositionName } from '../component/IControlService';
     stencil?: boolean;
+    debug?: boolean;
 }
@@ -20,0 +21,0 @@ export interface IGlobalConfigService {

es/services/interaction/PickingService.js

@@ -381,10 +381,22 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
       // this.alreadyInPicking 避免多次重复拾取
-      if (this.alreadyInPicking) return false; // this.layerService.alreadyInRendering 一个渲染序列中只进行一次拾取操作
+      if (this.alreadyInPicking) {
+        return false;
+      } // this.layerService.alreadyInRendering 一个渲染序列中只进行一次拾取操作
 
-      if (this.layerService.alreadyInRendering) return false; // this.interactionService.dragging amap2 在点击操作的时候同时会触发 dragging 的情况（避免舍去）
 
-      if (this.interactionService.indragging) return false; // 判断当前进行 shader pick 拾取判断
+      if (this.layerService.alreadyInRendering) {
+        return false;
+      } // this.interactionService.dragging amap2 在点击操作的时候同时会触发 dragging 的情况（避免舍去）
 
-      if (!this.layerService.getShaderPickStat()) return false; // 进行拾取
 
+      if (this.interactionService.indragging) {
+        return false;
+      } // 判断当前进行 shader pick 拾取判断
+
+
+      if (!this.layerService.getShaderPickStat()) {
+        return false;
+      } // 进行拾取
+
+
       return true;
@@ -391,0 +403,0 @@ }

es/services/layer/ILayerService.d.ts

@@ -345,2 +345,3 @@ import { SyncBailHook, SyncHook, AsyncSeriesBailHook, AsyncWaterfallHook } from '@antv/async-hook';
     get(name: string): number;
+    log(type: string, time?: number): void;
     setBlend(type: keyof typeof BlendType): ILayer;
@@ -347,0 +348,0 @@ setMultiPass(multipass: boolean, passes?: Array<string | [string, {

es/services/layer/LayerService.d.ts

@@ -18,2 +18,3 @@ import { EventEmitter } from 'eventemitter3';
     private readonly mapService;
+    private readonly debugService;
     reRender: import("lodash").DebouncedFunc<() => void>;
@@ -20,0 +21,0 @@ throttleRenderLayers: import("lodash").DebouncedFunc<() => void>;

es/services/layer/LayerService.js

@@ -13,3 +13,3 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
 
@@ -35,3 +35,3 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 import Clock from "../../utils/clock";
-var LayerService = (_dec = injectable(), _dec2 = inject(TYPES.IRendererService), _dec3 = inject(TYPES.IMapService), _dec(_class = (_class2 = /*#__PURE__*/function (_ref) {
+var LayerService = (_dec = injectable(), _dec2 = inject(TYPES.IRendererService), _dec3 = inject(TYPES.IMapService), _dec4 = inject(TYPES.IDebugService), _dec(_class = (_class2 = /*#__PURE__*/function (_ref) {
   _inherits(LayerService, _ref);
@@ -76,2 +76,4 @@
 
+    _initializerDefineProperty(_assertThisInitialized(_this), "debugService", _descriptor3, _assertThisInitialized(_this));
+
     _defineProperty(_assertThisInitialized(_this), "reRender", throttle(function () {
@@ -285,3 +287,3 @@ _this.updateLayerRenderList();
       var _renderLayers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-        var _iterator, _step, layer;
+        var renderUid, _iterator, _step, layer;
 
@@ -300,12 +302,14 @@ return _regeneratorRuntime.wrap(function _callee6$(_context6) {
               case 2:
+                renderUid = this.debugService.generateRenderUid();
+                this.debugService.renderStart(renderUid);
                 this.alreadyInRendering = true;
                 this.clear();
                 _iterator = _createForOfIteratorHelper(this.layerList);
-                _context6.prev = 5;
+                _context6.prev = 7;
 
                 _iterator.s();
 
-              case 7:
+              case 9:
                 if ((_step = _iterator.n()).done) {
-                  _context6.next = 19;
+                  _context6.next = 21;
                   break;
@@ -348,42 +352,43 @@ }
                 if (!layer.getLayerConfig().enableMultiPassRenderer) {
-                  _context6.next = 15;
+                  _context6.next = 17;
                   break;
                 }
 
-                _context6.next = 13;
+                _context6.next = 15;
                 return layer.renderMultiPass();
 
-              case 13:
-                _context6.next = 17;
+              case 15:
+                _context6.next = 19;
                 break;
 
-              case 15:
-                _context6.next = 17;
+              case 17:
+                _context6.next = 19;
                 return layer.render();
 
-              case 17:
-                _context6.next = 7;
-                break;
-
               case 19:
-                _context6.next = 24;
+                _context6.next = 9;
                 break;
 
               case 21:
-                _context6.prev = 21;
-                _context6.t0 = _context6["catch"](5);
+                _context6.next = 26;
+                break;
 
+              case 23:
+                _context6.prev = 23;
+                _context6.t0 = _context6["catch"](7);
+
                 _iterator.e(_context6.t0);
 
-              case 24:
-                _context6.prev = 24;
+              case 26:
+                _context6.prev = 26;
 
                 _iterator.f();
 
-                return _context6.finish(24);
+                return _context6.finish(26);
 
-              case 27:
+              case 29:
+                this.debugService.renderEnd(renderUid);
                 this.alreadyInRendering = false;
 
-              case 28:
+              case 31:
               case "end":
@@ -393,3 +398,3 @@ return _context6.stop();
           }
-        }, _callee6, this, [[5, 21, 24, 27]]);
+        }, _callee6, this, [[7, 23, 26, 29]]);
       }));
@@ -599,3 +604,8 @@
   initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "debugService", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 export { LayerService as default };

es/services/scene/SceneService.d.ts

@@ -24,2 +24,3 @@ import { EventEmitter } from 'eventemitter3';
     private readonly layerService;
+    private readonly debugService;
     private readonly cameraService;
@@ -46,2 +47,3 @@ private readonly interactionService;
     init(sceneConfig: ISceneConfig): void;
+    private registerContextLost;
     /**
@@ -48,0 +50,0 @@ * 小程序环境下初始化 Scene

es/services/scene/SceneService.js

@@ -13,3 +13,3 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16;
 
@@ -36,3 +36,3 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
  */
-_dec = injectable(), _dec2 = inject(TYPES.SceneID), _dec3 = inject(TYPES.IIconService), _dec4 = inject(TYPES.IFontService), _dec5 = inject(TYPES.IControlService), _dec6 = inject(TYPES.IGlobalConfigService), _dec7 = inject(TYPES.IMapService), _dec8 = inject(TYPES.ICoordinateSystemService), _dec9 = inject(TYPES.IRendererService), _dec10 = inject(TYPES.ILayerService), _dec11 = inject(TYPES.ICameraService), _dec12 = inject(TYPES.IInteractionService), _dec13 = inject(TYPES.IPickingService), _dec14 = inject(TYPES.IShaderModuleService), _dec15 = inject(TYPES.IMarkerService), _dec16 = inject(TYPES.IPopupService), _dec(_class = (_class2 = /*#__PURE__*/function (_EventEmitter) {
+_dec = injectable(), _dec2 = inject(TYPES.SceneID), _dec3 = inject(TYPES.IIconService), _dec4 = inject(TYPES.IFontService), _dec5 = inject(TYPES.IControlService), _dec6 = inject(TYPES.IGlobalConfigService), _dec7 = inject(TYPES.IMapService), _dec8 = inject(TYPES.ICoordinateSystemService), _dec9 = inject(TYPES.IRendererService), _dec10 = inject(TYPES.ILayerService), _dec11 = inject(TYPES.IDebugService), _dec12 = inject(TYPES.ICameraService), _dec13 = inject(TYPES.IInteractionService), _dec14 = inject(TYPES.IPickingService), _dec15 = inject(TYPES.IShaderModuleService), _dec16 = inject(TYPES.IMarkerService), _dec17 = inject(TYPES.IPopupService), _dec(_class = (_class2 = /*#__PURE__*/function (_EventEmitter) {
   _inherits(Scene, _EventEmitter);
@@ -83,14 +83,16 @@
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "cameraService", _descriptor10, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "debugService", _descriptor10, _assertThisInitialized(_this));
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "interactionService", _descriptor11, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "cameraService", _descriptor11, _assertThisInitialized(_this));
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "pickingService", _descriptor12, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "interactionService", _descriptor12, _assertThisInitialized(_this));
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "shaderModuleService", _descriptor13, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "pickingService", _descriptor13, _assertThisInitialized(_this));
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "markerService", _descriptor14, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "shaderModuleService", _descriptor14, _assertThisInitialized(_this));
 
-    _initializerDefineProperty(_assertThisInitialized(_this), "popupService", _descriptor15, _assertThisInitialized(_this));
+    _initializerDefineProperty(_assertThisInitialized(_this), "markerService", _descriptor15, _assertThisInitialized(_this));
 
+    _initializerDefineProperty(_assertThisInitialized(_this), "popupService", _descriptor16, _assertThisInitialized(_this));
+
     _defineProperty(_assertThisInitialized(_this), "inited", false);
@@ -167,3 +169,8 @@
               case 0:
-                _context.next = 2;
+                _this2.debugService.log('map.mapInitStart', {
+                  type: _this2.map.version
+                }); // 等待首次相机同步
+
+
+                _context.next = 3;
                 return new Promise(function (resolve) {
@@ -181,3 +188,3 @@ _this2.map.onCameraChanged(function (viewport) {
 
-              case 2:
+              case 3:
                 // 重新绑定非首次相机更新事件
@@ -200,3 +207,3 @@ _this2.map.onCameraChanged(_this2.handleMapCameraChanged);
 
-              case 9:
+              case 10:
               case "end":
@@ -229,3 +236,3 @@ return _context.stop();
                 if (!_this2.$container) {
-                  _context2.next = 12;
+                  _context2.next = 13;
                   break;
@@ -243,2 +250,4 @@ }
               case 7:
+                _this2.registerContextLost();
+
                 _this2.initContainer();
@@ -252,12 +261,12 @@
 
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
 
-              case 12:
+              case 13:
                 console.error('容器 id 不存在');
 
-              case 13:
+              case 14:
                 _this2.pickingService.init(_this2.id);
 
-              case 14:
+              case 15:
               case "end":
@@ -271,2 +280,15 @@ return _context2.stop();
     }
+  }, {
+    key: "registerContextLost",
+    value: function registerContextLost() {
+      var _this3 = this;
+
+      var canvas = this.rendererService.getCanvas();
+
+      if (canvas) {
+        canvas.addEventListener('webglcontextlost', function () {
+          return _this3.emit('webglcontextlost');
+        });
+      }
+    }
     /**
@@ -280,3 +302,3 @@ * 小程序环境下初始化 Scene
     value: function initMiniScene(sceneConfig) {
-      var _this3 = this;
+      var _this4 = this;
 
@@ -290,3 +312,3 @@ // 设置场景配置项
       this.iconService.on('imageUpdate', function () {
-        return _this3.render();
+        return _this4.render();
       }); // 字体资源
@@ -306,8 +328,8 @@
                 return new Promise(function (resolve) {
-                  _this3.map.onCameraChanged(function (viewport) {
-                    _this3.cameraService.init();
+                  _this4.map.onCameraChanged(function (viewport) {
+                    _this4.cameraService.init();
 
-                    _this3.cameraService.update(viewport);
+                    _this4.cameraService.update(viewport);
 
-                    if (_this3.map.version !== 'GAODE2.x') {
+                    if (_this4.map.version !== 'GAODE2.x') {
                       // not amap2
@@ -319,3 +341,3 @@ resolve();
 
-                  _this3.map.initMiniMap();
+                  _this4.map.initMiniMap();
                 });
@@ -325,8 +347,8 @@
                 // 重新绑定非首次相机更新事件
-                _this3.map.onCameraChanged(_this3.handleMapCameraChanged); // 地图初始化之后 才能初始化 container 上的交互
+                _this4.map.onCameraChanged(_this4.handleMapCameraChanged); // 地图初始化之后 才能初始化 container 上的交互
 
 
-                _this3.interactionService.init();
+                _this4.interactionService.init();
 
-                _this3.interactionService.on(InteractionEvent.Drag, _this3.addSceneEvent.bind(_this3));
+                _this4.interactionService.on(InteractionEvent.Drag, _this4.addSceneEvent.bind(_this4));
 
@@ -353,5 +375,5 @@ case 5:
 
-                _this3.$container = $container ? $container : null;
+                _this4.$container = $container ? $container : null;
 
-                if (!_this3.$container) {
+                if (!_this4.$container) {
                   _context4.next = 7;
@@ -362,4 +384,4 @@ break;
                 _context4.next = 5;
-                return _this3.rendererService.init( // @ts-ignore
-                sceneConfig.canvas, _this3.configService.getSceneConfig(_this3.id), undefined);
+                return _this4.rendererService.init( // @ts-ignore
+                sceneConfig.canvas, _this4.configService.getSceneConfig(_this4.id), undefined);
 
@@ -374,3 +396,3 @@ case 5:
               case 8:
-                _this3.pickingService.init(_this3.id);
+                _this4.pickingService.init(_this4.id);
 
@@ -551,3 +573,3 @@ case 9:
     value: function destroy() {
-      var _this4 = this,
+      var _this5 = this,
           _this$$container2,
@@ -581,10 +603,10 @@ _this$$container2$par;
       setTimeout(function () {
-        var _this4$$container;
+        var _this5$$container;
 
-        (_this4$$container = _this4.$container) === null || _this4$$container === void 0 ? void 0 : _this4$$container.removeChild(_this4.canvas); // this.canvas = null 清除对 webgl 实例的引用
+        (_this5$$container = _this5.$container) === null || _this5$$container === void 0 ? void 0 : _this5$$container.removeChild(_this5.canvas); // this.canvas = null 清除对 webgl 实例的引用
         // @ts-ignore
 
-        _this4.canvas = null; // Tip: 把这一部分销毁放到写下一个事件循环中执行，兼容 L7React 中 scene 和 layer 同时销毁的情况
+        _this5.canvas = null; // Tip: 把这一部分销毁放到写下一个事件循环中执行，兼容 L7React 中 scene 和 layer 同时销毁的情况
 
-        _this4.rendererService.destroy();
+        _this5.rendererService.destroy();
       }); // 销毁 container 容器
@@ -687,3 +709,3 @@
   initializer: null
-}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec11], {
+}), _descriptor10 = _applyDecoratedDescriptor(_class2.prototype, "debugService", [_dec11], {
   configurable: true,
@@ -693,3 +715,3 @@ enumerable: true,
   initializer: null
-}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "interactionService", [_dec12], {
+}), _descriptor11 = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec12], {
   configurable: true,
@@ -699,3 +721,3 @@ enumerable: true,
   initializer: null
-}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "pickingService", [_dec13], {
+}), _descriptor12 = _applyDecoratedDescriptor(_class2.prototype, "interactionService", [_dec13], {
   configurable: true,
@@ -705,3 +727,3 @@ enumerable: true,
   initializer: null
-}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "shaderModuleService", [_dec14], {
+}), _descriptor13 = _applyDecoratedDescriptor(_class2.prototype, "pickingService", [_dec14], {
   configurable: true,
@@ -711,3 +733,3 @@ enumerable: true,
   initializer: null
-}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "markerService", [_dec15], {
+}), _descriptor14 = _applyDecoratedDescriptor(_class2.prototype, "shaderModuleService", [_dec15], {
   configurable: true,
@@ -717,3 +739,3 @@ enumerable: true,
   initializer: null
-}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "popupService", [_dec16], {
+}), _descriptor15 = _applyDecoratedDescriptor(_class2.prototype, "markerService", [_dec16], {
   configurable: true,
@@ -723,3 +745,8 @@ enumerable: true,
   initializer: null
+}), _descriptor16 = _applyDecoratedDescriptor(_class2.prototype, "popupService", [_dec17], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 export { Scene as default };

es/types.d.ts

@@ -8,2 +8,3 @@ declare const TYPES: {
     ILayerService: symbol;
+    IDebugService: symbol;
     ILayerMappingService: symbol;
@@ -10,0 +11,0 @@ ILayerStyleService: symbol;

es/types.js

@@ -8,2 +8,3 @@ var TYPES = {
   ILayerService: Symbol.for('ILayerService'),
+  IDebugService: Symbol.for('IDebugService'),
   ILayerMappingService: Symbol.for('ILayerMappingService'),
@@ -10,0 +11,0 @@ ILayerStyleService: Symbol.for('ILayerStyleService'),

lib/index.js

@@ -91,2 +91,16 @@ "use strict";
 
+var _IDebugService = require("./services/debug/IDebugService");
+
+Object.keys(_IDebugService).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _IDebugService[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _IDebugService[key];
+    }
+  });
+});
+
 var _IStyleAttributeService = require("./services/layer/IStyleAttributeService");
@@ -93,0 +107,0 @@

lib/inversify.config.js

@@ -44,2 +44,4 @@ "use strict";
 
+var _DebugService = _interopRequireDefault(require("./services/debug/DebugService"));
+
 var _StyleAttributeService = _interopRequireDefault(require("./services/layer/StyleAttributeService"));
@@ -153,2 +155,3 @@
   sceneContainer.bind(_types.TYPES.ILayerService).to(_LayerService.default).inSingletonScope();
+  sceneContainer.bind(_types.TYPES.IDebugService).to(_DebugService.default).inSingletonScope();
   sceneContainer.bind(_types.TYPES.ISceneService).to(_SceneService.default).inSingletonScope();
@@ -155,0 +158,0 @@ sceneContainer.bind(_types.TYPES.ICameraService).to(_CameraService.default).inSingletonScope();

lib/services/interaction/PickingService.js

@@ -393,10 +393,22 @@ "use strict";
       // this.alreadyInPicking 避免多次重复拾取
-      if (this.alreadyInPicking) return false; // this.layerService.alreadyInRendering 一个渲染序列中只进行一次拾取操作
+      if (this.alreadyInPicking) {
+        return false;
+      } // this.layerService.alreadyInRendering 一个渲染序列中只进行一次拾取操作
 
-      if (this.layerService.alreadyInRendering) return false; // this.interactionService.dragging amap2 在点击操作的时候同时会触发 dragging 的情况（避免舍去）
 
-      if (this.interactionService.indragging) return false; // 判断当前进行 shader pick 拾取判断
+      if (this.layerService.alreadyInRendering) {
+        return false;
+      } // this.interactionService.dragging amap2 在点击操作的时候同时会触发 dragging 的情况（避免舍去）
 
-      if (!this.layerService.getShaderPickStat()) return false; // 进行拾取
 
+      if (this.interactionService.indragging) {
+        return false;
+      } // 判断当前进行 shader pick 拾取判断
+
+
+      if (!this.layerService.getShaderPickStat()) {
+        return false;
+      } // 进行拾取
+
+
       return true;
@@ -403,0 +415,0 @@ }

lib/services/layer/LayerService.js

@@ -48,3 +48,3 @@ "use strict";
 
-var _dec, _dec2, _dec3, _class, _class2, _descriptor, _descriptor2;
+var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3;
 
@@ -61,3 +61,3 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-var LayerService = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec3 = (0, _inversify.inject)(_types.TYPES.IMapService), _dec(_class = (_class2 = /*#__PURE__*/function (_ref) {
+var LayerService = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec3 = (0, _inversify.inject)(_types.TYPES.IMapService), _dec4 = (0, _inversify.inject)(_types.TYPES.IDebugService), _dec(_class = (_class2 = /*#__PURE__*/function (_ref) {
   (0, _inherits2.default)(LayerService, _ref);
@@ -89,2 +89,3 @@
     (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "mapService", _descriptor2, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "debugService", _descriptor3, (0, _assertThisInitialized2.default)(_this));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "reRender", (0, _lodash.throttle)(function () {
@@ -296,3 +297,3 @@ _this.updateLayerRenderList();
       var _renderLayers = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
-        var _iterator, _step, layer;
+        var renderUid, _iterator, _step, layer;
 
@@ -311,12 +312,14 @@ return _regenerator.default.wrap(function _callee6$(_context6) {
               case 2:
+                renderUid = this.debugService.generateRenderUid();
+                this.debugService.renderStart(renderUid);
                 this.alreadyInRendering = true;
                 this.clear();
                 _iterator = _createForOfIteratorHelper(this.layerList);
-                _context6.prev = 5;
+                _context6.prev = 7;
 
                 _iterator.s();
 
-              case 7:
+              case 9:
                 if ((_step = _iterator.n()).done) {
-                  _context6.next = 19;
+                  _context6.next = 21;
                   break;
@@ -359,42 +362,43 @@ }
                 if (!layer.getLayerConfig().enableMultiPassRenderer) {
-                  _context6.next = 15;
+                  _context6.next = 17;
                   break;
                 }
 
-                _context6.next = 13;
+                _context6.next = 15;
                 return layer.renderMultiPass();
 
-              case 13:
-                _context6.next = 17;
+              case 15:
+                _context6.next = 19;
                 break;
 
-              case 15:
-                _context6.next = 17;
+              case 17:
+                _context6.next = 19;
                 return layer.render();
 
-              case 17:
-                _context6.next = 7;
-                break;
-
               case 19:
-                _context6.next = 24;
+                _context6.next = 9;
                 break;
 
               case 21:
-                _context6.prev = 21;
-                _context6.t0 = _context6["catch"](5);
+                _context6.next = 26;
+                break;
 
+              case 23:
+                _context6.prev = 23;
+                _context6.t0 = _context6["catch"](7);
+
                 _iterator.e(_context6.t0);
 
-              case 24:
-                _context6.prev = 24;
+              case 26:
+                _context6.prev = 26;
 
                 _iterator.f();
 
-                return _context6.finish(24);
+                return _context6.finish(26);
 
-              case 27:
+              case 29:
+                this.debugService.renderEnd(renderUid);
                 this.alreadyInRendering = false;
 
-              case 28:
+              case 31:
               case "end":
@@ -404,3 +408,3 @@ return _context6.stop();
           }
-        }, _callee6, this, [[5, 21, 24, 27]]);
+        }, _callee6, this, [[7, 23, 26, 29]]);
       }));
@@ -609,3 +613,8 @@
   initializer: null
+}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "debugService", [_dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 exports.default = LayerService;

lib/services/scene/SceneService.js

@@ -54,3 +54,3 @@ "use strict";
 
-var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _dec7, _dec8, _dec9, _dec10, _dec11, _dec12, _dec13, _dec14, _dec15, _dec16, _dec17, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor10, _descriptor11, _descriptor12, _descriptor13, _descriptor14, _descriptor15, _descriptor16;
 
@@ -69,3 +69,3 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
  */
-_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.SceneID), _dec3 = (0, _inversify.inject)(_types.TYPES.IIconService), _dec4 = (0, _inversify.inject)(_types.TYPES.IFontService), _dec5 = (0, _inversify.inject)(_types.TYPES.IControlService), _dec6 = (0, _inversify.inject)(_types.TYPES.IGlobalConfigService), _dec7 = (0, _inversify.inject)(_types.TYPES.IMapService), _dec8 = (0, _inversify.inject)(_types.TYPES.ICoordinateSystemService), _dec9 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec10 = (0, _inversify.inject)(_types.TYPES.ILayerService), _dec11 = (0, _inversify.inject)(_types.TYPES.ICameraService), _dec12 = (0, _inversify.inject)(_types.TYPES.IInteractionService), _dec13 = (0, _inversify.inject)(_types.TYPES.IPickingService), _dec14 = (0, _inversify.inject)(_types.TYPES.IShaderModuleService), _dec15 = (0, _inversify.inject)(_types.TYPES.IMarkerService), _dec16 = (0, _inversify.inject)(_types.TYPES.IPopupService), _dec(_class = (_class2 = /*#__PURE__*/function (_EventEmitter) {
+_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.SceneID), _dec3 = (0, _inversify.inject)(_types.TYPES.IIconService), _dec4 = (0, _inversify.inject)(_types.TYPES.IFontService), _dec5 = (0, _inversify.inject)(_types.TYPES.IControlService), _dec6 = (0, _inversify.inject)(_types.TYPES.IGlobalConfigService), _dec7 = (0, _inversify.inject)(_types.TYPES.IMapService), _dec8 = (0, _inversify.inject)(_types.TYPES.ICoordinateSystemService), _dec9 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec10 = (0, _inversify.inject)(_types.TYPES.ILayerService), _dec11 = (0, _inversify.inject)(_types.TYPES.IDebugService), _dec12 = (0, _inversify.inject)(_types.TYPES.ICameraService), _dec13 = (0, _inversify.inject)(_types.TYPES.IInteractionService), _dec14 = (0, _inversify.inject)(_types.TYPES.IPickingService), _dec15 = (0, _inversify.inject)(_types.TYPES.IShaderModuleService), _dec16 = (0, _inversify.inject)(_types.TYPES.IMarkerService), _dec17 = (0, _inversify.inject)(_types.TYPES.IPopupService), _dec(_class = (_class2 = /*#__PURE__*/function (_EventEmitter) {
   (0, _inherits2.default)(Scene, _EventEmitter);
@@ -104,8 +104,9 @@
     (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "layerService", _descriptor9, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "cameraService", _descriptor10, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "interactionService", _descriptor11, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickingService", _descriptor12, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "shaderModuleService", _descriptor13, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "markerService", _descriptor14, (0, _assertThisInitialized2.default)(_this));
-    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "popupService", _descriptor15, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "debugService", _descriptor10, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "cameraService", _descriptor11, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "interactionService", _descriptor12, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "pickingService", _descriptor13, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "shaderModuleService", _descriptor14, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "markerService", _descriptor15, (0, _assertThisInitialized2.default)(_this));
+    (0, _initializerDefineProperty2.default)((0, _assertThisInitialized2.default)(_this), "popupService", _descriptor16, (0, _assertThisInitialized2.default)(_this));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "inited", false);
@@ -174,3 +175,8 @@ (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "initPromise", void 0);
               case 0:
-                _context.next = 2;
+                _this2.debugService.log('map.mapInitStart', {
+                  type: _this2.map.version
+                }); // 等待首次相机同步
+
+
+                _context.next = 3;
                 return new Promise(function (resolve) {
@@ -188,3 +194,3 @@ _this2.map.onCameraChanged(function (viewport) {
 
-              case 2:
+              case 3:
                 // 重新绑定非首次相机更新事件
@@ -207,3 +213,3 @@ _this2.map.onCameraChanged(_this2.handleMapCameraChanged);
 
-              case 9:
+              case 10:
               case "end":
@@ -236,3 +242,3 @@ return _context.stop();
                 if (!_this2.$container) {
-                  _context2.next = 12;
+                  _context2.next = 13;
                   break;
@@ -250,2 +256,4 @@ }
               case 7:
+                _this2.registerContextLost();
+
                 _this2.initContainer();
@@ -259,12 +267,12 @@
 
-                _context2.next = 13;
+                _context2.next = 14;
                 break;
 
-              case 12:
+              case 13:
                 console.error('容器 id 不存在');
 
-              case 13:
+              case 14:
                 _this2.pickingService.init(_this2.id);
 
-              case 14:
+              case 15:
               case "end":
@@ -278,2 +286,15 @@ return _context2.stop();
     }
+  }, {
+    key: "registerContextLost",
+    value: function registerContextLost() {
+      var _this3 = this;
+
+      var canvas = this.rendererService.getCanvas();
+
+      if (canvas) {
+        canvas.addEventListener('webglcontextlost', function () {
+          return _this3.emit('webglcontextlost');
+        });
+      }
+    }
     /**
@@ -287,3 +308,3 @@ * 小程序环境下初始化 Scene
     value: function initMiniScene(sceneConfig) {
-      var _this3 = this;
+      var _this4 = this;
 
@@ -297,3 +318,3 @@ // 设置场景配置项
       this.iconService.on('imageUpdate', function () {
-        return _this3.render();
+        return _this4.render();
       }); // 字体资源
@@ -313,8 +334,8 @@
                 return new Promise(function (resolve) {
-                  _this3.map.onCameraChanged(function (viewport) {
-                    _this3.cameraService.init();
+                  _this4.map.onCameraChanged(function (viewport) {
+                    _this4.cameraService.init();
 
-                    _this3.cameraService.update(viewport);
+                    _this4.cameraService.update(viewport);
 
-                    if (_this3.map.version !== 'GAODE2.x') {
+                    if (_this4.map.version !== 'GAODE2.x') {
                       // not amap2
@@ -326,3 +347,3 @@ resolve();
 
-                  _this3.map.initMiniMap();
+                  _this4.map.initMiniMap();
                 });
@@ -332,8 +353,8 @@
                 // 重新绑定非首次相机更新事件
-                _this3.map.onCameraChanged(_this3.handleMapCameraChanged); // 地图初始化之后 才能初始化 container 上的交互
+                _this4.map.onCameraChanged(_this4.handleMapCameraChanged); // 地图初始化之后 才能初始化 container 上的交互
 
 
-                _this3.interactionService.init();
+                _this4.interactionService.init();
 
-                _this3.interactionService.on(_IInteractionService.InteractionEvent.Drag, _this3.addSceneEvent.bind(_this3));
+                _this4.interactionService.on(_IInteractionService.InteractionEvent.Drag, _this4.addSceneEvent.bind(_this4));
 
@@ -360,5 +381,5 @@ case 5:
 
-                _this3.$container = $container ? $container : null;
+                _this4.$container = $container ? $container : null;
 
-                if (!_this3.$container) {
+                if (!_this4.$container) {
                   _context4.next = 7;
@@ -369,4 +390,4 @@ break;
                 _context4.next = 5;
-                return _this3.rendererService.init( // @ts-ignore
-                sceneConfig.canvas, _this3.configService.getSceneConfig(_this3.id), undefined);
+                return _this4.rendererService.init( // @ts-ignore
+                sceneConfig.canvas, _this4.configService.getSceneConfig(_this4.id), undefined);
 
@@ -381,3 +402,3 @@ case 5:
               case 8:
-                _this3.pickingService.init(_this3.id);
+                _this4.pickingService.init(_this4.id);
 
@@ -558,3 +579,3 @@ case 9:
     value: function destroy() {
-      var _this4 = this,
+      var _this5 = this,
           _this$$container2,
@@ -588,10 +609,10 @@ _this$$container2$par;
       setTimeout(function () {
-        var _this4$$container;
+        var _this5$$container;
 
-        (_this4$$container = _this4.$container) === null || _this4$$container === void 0 ? void 0 : _this4$$container.removeChild(_this4.canvas); // this.canvas = null 清除对 webgl 实例的引用
+        (_this5$$container = _this5.$container) === null || _this5$$container === void 0 ? void 0 : _this5$$container.removeChild(_this5.canvas); // this.canvas = null 清除对 webgl 实例的引用
         // @ts-ignore
 
-        _this4.canvas = null; // Tip: 把这一部分销毁放到写下一个事件循环中执行，兼容 L7React 中 scene 和 layer 同时销毁的情况
+        _this5.canvas = null; // Tip: 把这一部分销毁放到写下一个事件循环中执行，兼容 L7React 中 scene 和 layer 同时销毁的情况
 
-        _this4.rendererService.destroy();
+        _this5.rendererService.destroy();
       }); // 销毁 container 容器
@@ -693,3 +714,3 @@
   initializer: null
-}), _descriptor10 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec11], {
+}), _descriptor10 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "debugService", [_dec11], {
   configurable: true,
@@ -699,3 +720,3 @@ enumerable: true,
   initializer: null
-}), _descriptor11 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "interactionService", [_dec12], {
+}), _descriptor11 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec12], {
   configurable: true,
@@ -705,3 +726,3 @@ enumerable: true,
   initializer: null
-}), _descriptor12 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "pickingService", [_dec13], {
+}), _descriptor12 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "interactionService", [_dec13], {
   configurable: true,
@@ -711,3 +732,3 @@ enumerable: true,
   initializer: null
-}), _descriptor13 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "shaderModuleService", [_dec14], {
+}), _descriptor13 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "pickingService", [_dec14], {
   configurable: true,
@@ -717,3 +738,3 @@ enumerable: true,
   initializer: null
-}), _descriptor14 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "markerService", [_dec15], {
+}), _descriptor14 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "shaderModuleService", [_dec15], {
   configurable: true,
@@ -723,3 +744,3 @@ enumerable: true,
   initializer: null
-}), _descriptor15 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "popupService", [_dec16], {
+}), _descriptor15 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "markerService", [_dec16], {
   configurable: true,
@@ -729,3 +750,8 @@ enumerable: true,
   initializer: null
+}), _descriptor16 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "popupService", [_dec17], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 exports.default = Scene;

lib/types.js

@@ -14,2 +14,3 @@ "use strict";
   ILayerService: Symbol.for('ILayerService'),
+  IDebugService: Symbol.for('IDebugService'),
   ILayerMappingService: Symbol.for('ILayerMappingService'),
@@ -16,0 +17,0 @@ ILayerStyleService: Symbol.for('ILayerStyleService'),

package.json

 {
   "name": "@antv/l7-core",
-  "version": "2.13.5",
+  "version": "2.13.6",
   "description": "",
@@ -28,3 +28,3 @@ "main": "lib/index.js",
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-utils": "2.13.5",
+    "@antv/l7-utils": "2.13.6",
     "@babel/runtime": "^7.7.7",
@@ -52,3 +52,3 @@ "@turf/helpers": "^6.1.4",
   },
-  "gitHead": "0b3af09f76cb5e7ee27b495678ad4833fdb53434",
+  "gitHead": "dc11ec312f2078704e548ba540d3289e1f752441",
   "publishConfig": {
@@ -55,0 +55,0 @@ "access": "public"

No alert changes

Improved metrics

Total package byte prevSize

992362

increased by1.94%

Number of package files

287

increased by2.14%

Lines of code

20093

increased by2.48%

Dependency changes

• + Added@antv/l7-utils@2.13.6(transitive)

• - Removed@antv/l7-utils@2.13.5(transitive)

• Updated@antv/l7-utils@2.13.6