@antv/l7-core - npm Package Compare versions

Comparing version 2.1.13 to 2.1.14

es/services/config/ConfigService.js

@@ -20,2 +20,3 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
   preserveDrawingBuffer: false,
+  pickBufferScale: 1.0,
   fitBoundsOptions: {
@@ -22,0 +23,0 @@ animate: false

es/services/config/IConfigService.d.ts

@@ -12,2 +12,3 @@ import { PositionName } from '../component/IControlService';
     fitBoundsOptions?: unknown;
+    pickBufferScale?: number;
 }
@@ -14,0 +15,0 @@ export interface IGlobalConfigService {

es/services/interaction/IPickingService.d.ts

 export interface IPickingService {
-    init(): void;
+    init(id: string): void;
 }

es/services/interaction/PickingService.d.ts

 import { IPickingService } from './IPickingService';
 export default class PickingService implements IPickingService {
     private rendererService;
+    private readonly configService;
     private interactionService;
@@ -10,3 +11,4 @@ private layerService;
     private alreadyInPicking;
-    init(): void;
+    private pickBufferScale;
+    init(id: string): void;
     private pickingAllLayer;
@@ -13,0 +15,0 @@ private pickingLayers;

es/services/interaction/PickingService.js

@@ -11,3 +11,3 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 
-var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3, _temp;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _temp;
 
@@ -23,4 +23,3 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 import { gl } from '../renderer/gl';
-var PICKSCALE = 1.0;
-var PickingService = (_dec = injectable(), _dec2 = inject(TYPES.IRendererService), _dec3 = inject(TYPES.IInteractionService), _dec4 = inject(TYPES.ILayerService), _dec(_class = (_class2 = (_temp = function () {
+var PickingService = (_dec = injectable(), _dec2 = inject(TYPES.IRendererService), _dec3 = inject(TYPES.IGlobalConfigService), _dec4 = inject(TYPES.IInteractionService), _dec5 = inject(TYPES.ILayerService), _dec(_class = (_class2 = (_temp = function () {
   function PickingService() {
@@ -33,6 +32,8 @@ var _this = this;
 
-    _initializerDefineProperty(this, "interactionService", _descriptor2, this);
+    _initializerDefineProperty(this, "configService", _descriptor2, this);
 
-    _initializerDefineProperty(this, "layerService", _descriptor3, this);
+    _initializerDefineProperty(this, "interactionService", _descriptor3, this);
 
+    _initializerDefineProperty(this, "layerService", _descriptor4, this);
+
     this.pickingFBO = void 0;
@@ -42,2 +43,3 @@ this.width = 0;
     this.alreadyInPicking = false;
+    this.pickBufferScale = 1.0;
 
@@ -73,4 +75,4 @@ this.pickFromPickingFBO = function (layer, _ref) {
       pickedColors = readPixels({
-        x: Math.floor(xInDevicePixel / PICKSCALE),
-        y: Math.floor((height - (y + 1) * window.devicePixelRatio) / PICKSCALE),
+        x: Math.floor(xInDevicePixel / _this.pickBufferScale),
+        y: Math.floor((height - (y + 1) * window.devicePixelRatio) / _this.pickBufferScale),
         width: 1,
@@ -148,3 +150,3 @@ height: 1,
     key: "init",
-    value: function init() {
+    value: function init(id) {
       var _this$rendererService2 = this.rendererService,
@@ -159,6 +161,7 @@ createTexture2D = _this$rendererService2.createTexture2D,
 
+      this.pickBufferScale = this.configService.getSceneConfig(id).pickBufferScale || 1;
       this.pickingFBO = createFramebuffer({
         color: createTexture2D({
-          width: width,
-          height: height,
+          width: Math.round(width / this.pickBufferScale),
+          height: Math.round(height / this.pickBufferScale),
           wrapS: gl.CLAMP_TO_EDGE,
@@ -225,4 +228,4 @@ wrapT: gl.CLAMP_TO_EDGE
                   this.pickingFBO.resize({
-                    width: Math.round(width / PICKSCALE),
-                    height: Math.round(height / PICKSCALE)
+                    width: Math.round(width / this.pickBufferScale),
+                    height: Math.round(height / this.pickBufferScale)
                   });
@@ -302,3 +305,3 @@ this.width = width;
   initializer: null
-}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "interactionService", [_dec3], {
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "configService", [_dec3], {
   configurable: true,
@@ -308,3 +311,3 @@ enumerable: true,
   initializer: null
-}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "layerService", [_dec4], {
+}), _descriptor3 = _applyDecoratedDescriptor(_class2.prototype, "interactionService", [_dec4], {
   configurable: true,
@@ -314,4 +317,9 @@ enumerable: true,
   initializer: null
+}), _descriptor4 = _applyDecoratedDescriptor(_class2.prototype, "layerService", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 export { PickingService as default };
 //# sourceMappingURL=PickingService.js.map

es/services/scene/SceneService.js

@@ -200,3 +200,3 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
               case 10:
-                _this2.pickingService.init();
+                _this2.pickingService.init(_this2.id);
 
@@ -203,0 +203,0 @@ _this2.logger.debug("scene ".concat(_this2.id, " renderer loaded"));

lib/services/config/ConfigService.js

@@ -34,2 +34,3 @@ "use strict";
   preserveDrawingBuffer: false,
+  pickBufferScale: 1.0,
   fitBoundsOptions: {
@@ -36,0 +37,0 @@ animate: false

lib/services/interaction/PickingService.js

@@ -38,3 +38,3 @@ "use strict";
 
-var _dec, _dec2, _dec3, _dec4, _class, _class2, _descriptor, _descriptor2, _descriptor3, _temp;
+var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _temp;
 
@@ -45,4 +45,3 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-var PICKSCALE = 1.0;
-var PickingService = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec3 = (0, _inversify.inject)(_types.TYPES.IInteractionService), _dec4 = (0, _inversify.inject)(_types.TYPES.ILayerService), _dec(_class = (_class2 = (_temp = function () {
+var PickingService = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_types.TYPES.IRendererService), _dec3 = (0, _inversify.inject)(_types.TYPES.IGlobalConfigService), _dec4 = (0, _inversify.inject)(_types.TYPES.IInteractionService), _dec5 = (0, _inversify.inject)(_types.TYPES.ILayerService), _dec(_class = (_class2 = (_temp = function () {
   function PickingService() {
@@ -53,4 +52,5 @@ var _this = this;
     (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor, this);
-    (0, _initializerDefineProperty2.default)(this, "interactionService", _descriptor2, this);
-    (0, _initializerDefineProperty2.default)(this, "layerService", _descriptor3, this);
+    (0, _initializerDefineProperty2.default)(this, "configService", _descriptor2, this);
+    (0, _initializerDefineProperty2.default)(this, "interactionService", _descriptor3, this);
+    (0, _initializerDefineProperty2.default)(this, "layerService", _descriptor4, this);
     this.pickingFBO = void 0;
@@ -60,2 +60,3 @@ this.width = 0;
     this.alreadyInPicking = false;
+    this.pickBufferScale = 1.0;
 
@@ -91,4 +92,4 @@ this.pickFromPickingFBO = function (layer, _ref) {
       pickedColors = readPixels({
-        x: Math.floor(xInDevicePixel / PICKSCALE),
-        y: Math.floor((height - (y + 1) * window.devicePixelRatio) / PICKSCALE),
+        x: Math.floor(xInDevicePixel / _this.pickBufferScale),
+        y: Math.floor((height - (y + 1) * window.devicePixelRatio) / _this.pickBufferScale),
         width: 1,
@@ -166,3 +167,3 @@ height: 1,
     key: "init",
-    value: function init() {
+    value: function init(id) {
       var _this$rendererService2 = this.rendererService,
@@ -177,6 +178,7 @@ createTexture2D = _this$rendererService2.createTexture2D,
 
+      this.pickBufferScale = this.configService.getSceneConfig(id).pickBufferScale || 1;
       this.pickingFBO = createFramebuffer({
         color: createTexture2D({
-          width: width,
-          height: height,
+          width: Math.round(width / this.pickBufferScale),
+          height: Math.round(height / this.pickBufferScale),
           wrapS: _gl.gl.CLAMP_TO_EDGE,
@@ -243,4 +245,4 @@ wrapT: _gl.gl.CLAMP_TO_EDGE
                   this.pickingFBO.resize({
-                    width: Math.round(width / PICKSCALE),
-                    height: Math.round(height / PICKSCALE)
+                    width: Math.round(width / this.pickBufferScale),
+                    height: Math.round(height / this.pickBufferScale)
                   });
@@ -319,3 +321,3 @@ this.width = width;
   initializer: null
-}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "interactionService", [_dec3], {
+}), _descriptor2 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "configService", [_dec3], {
   configurable: true,
@@ -325,3 +327,3 @@ enumerable: true,
   initializer: null
-}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "layerService", [_dec4], {
+}), _descriptor3 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "interactionService", [_dec4], {
   configurable: true,
@@ -331,4 +333,9 @@ enumerable: true,
   initializer: null
+}), _descriptor4 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "layerService", [_dec5], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 exports.default = PickingService;
 //# sourceMappingURL=PickingService.js.map

lib/services/scene/SceneService.js

@@ -212,3 +212,3 @@ "use strict";
               case 10:
-                _this2.pickingService.init();
+                _this2.pickingService.init(_this2.id);
 
@@ -215,0 +215,0 @@ _this2.logger.debug("scene ".concat(_this2.id, " renderer loaded"));

package.json

 {
   "name": "@antv/l7-core",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "",
@@ -26,3 +26,3 @@ "main": "lib/index.js",
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-utils": "2.1.13",
+    "@antv/l7-utils": "2.1.14",
     "@babel/runtime": "^7.7.7",
@@ -50,3 +50,3 @@ "@mapbox/tiny-sdf": "^1.1.1",
   },
-  "gitHead": "565dcff53e37a1bc11b3ad37fbf36ac99d5b8352",
+  "gitHead": "f5f5a71cbe415f8644a2b1b6b16d48b737acc5c7",
   "publishConfig": {
@@ -53,0 +53,0 @@ "access": "public"

No alert changes

Improved metrics

Total package byte prevSize

1376540

increased by0.22%

Lines of code

14839

increased by0.13%

Dependency changes

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

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

• Updated@antv/l7-utils@2.1.14