From 589ce2feb7b09ab9b51ae4cdb7a2078a258c8463 Mon Sep 17 00:00:00 2001 From: YiQianYao <42212176+2912401452@users.noreply.github.com> Date: Tue, 15 Feb 2022 17:34:50 +0800 Subject: [PATCH] Shihui (#964) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 增加 bloomPass1.0、修改渲染流程，让 multiPass 有正确的渲染顺序 * style: lint style * feat: 取消 bloom 在 postprocessor 中的多次渲染（没有明显优化） * feat: polygon extrude 模式支持配置固定高度 * style: lint style * feat: 优化后处理 bloom 的效果 * feat: 修改交替绘制 bloom 的写法 * style: lint style * feat: 完善 iconService 加载渲染和销毁 * style: lint style * feat: 补全 mapbox 模式下等面积点 * style: lint style * fix: 修复 pointLayer animate 模式 opacity 失效 * style: lint style * feat: 拆分 pointLayer 的 shader * style: lint sytle * feat: 拆分 lineLayer 的 linear 模式 * style: lint style * feat: 优化点击的拾取判断 * style: lint style * feat: 取消圆柱 shader 中的三元表达式、增强健壮性 * feat: 点图层圆柱体支持固定高度配置 heightfixed * feat: 点图层圆柱体支持拾取高亮颜色的光照计算 * style: lint style * style: lint style * feat: 拆分 lintLayer line 模式下的 dash line * style: lint style * chore: update version 2.7.11 -> 2.7.12 * feat: lineLayer simpleline 的 linear shader 代码拆分 * style: lint style * feat: 拆分 lineLayer arcLine linear shader 代码 * style: line style * feat: lineLayer arc line 在 shader 中移除 linear 部分计算 * feat: 拆分 lineLayer arc dash 虚线的 shader 代码 * style: lint style * feat: 拆分 lineLayer arc3d linear 部分的 shader 代码 * style: lint style * style: lint style --- lerna.json | 2 +- packages/component/package.json | 6 +++--- packages/core/package.json | 4 ++-- packages/l7/package.json | 16 ++++++++-------- packages/l7/src/version.ts | 2 +- packages/layers/package.json | 8 ++++---- packages/map/package.json | 4 ++-- packages/maps/package.json | 8 ++++---- packages/mini/package.json | 12 ++++++------ packages/renderer/package.json | 4 ++-- packages/scene/package.json | 14 +++++++------- packages/source/package.json | 6 +++--- packages/three/package.json | 8 ++++---- packages/utils/package.json | 2 +- .../Map/components/amap2demo_arcLineLinear.tsx | 15 ++++++--------- 15 files changed, 54 insertions(+), 57 deletions(-) diff --git a/lerna.json b/lerna.json index 54f5442fa6..87c3fdb968 100644 --- a/lerna.json +++ b/lerna.json @@ -14,7 +14,7 @@ "message": "chore: publish" } }, - "version": "2.7.11", + "version": "2.7.12", "npmClient": "yarn", "useWorkspaces": true, "publishConfig": { diff --git a/packages/component/package.json b/packages/component/package.json index 6322ebd037..b26b5683a2 100644 --- a/packages/component/package.json +++ b/packages/component/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-component", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -25,8 +25,8 @@ "author": "lzxue", "license": "ISC", "dependencies": { - "@antv/l7-core": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "eventemitter3": "^4.0.0", "inversify": "^5.0.1", diff --git a/packages/core/package.json b/packages/core/package.json index 7b095cea5d..8ce13baff4 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-core", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -24,7 +24,7 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "ajv": "^6.10.2", "element-resize-event": "^3.0.3", diff --git a/packages/l7/package.json b/packages/l7/package.json index 03a03054ef..9718e0820c 100644 --- a/packages/l7/package.json +++ b/packages/l7/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7", - "version": "2.7.11", + "version": "2.7.12", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,13 +25,13 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-component": "^2.7.11", - "@antv/l7-core": "^2.7.11", - "@antv/l7-layers": "^2.7.11", - "@antv/l7-maps": "^2.7.11", - "@antv/l7-scene": "^2.7.11", - "@antv/l7-source": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-component": "^2.7.12", + "@antv/l7-core": "^2.7.12", + "@antv/l7-layers": "^2.7.12", + "@antv/l7-maps": "^2.7.12", + "@antv/l7-scene": "^2.7.12", + "@antv/l7-source": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/l7/src/version.ts b/packages/l7/src/version.ts index d9fe093ead..4b6bc6b515 100644 --- a/packages/l7/src/version.ts +++ b/packages/l7/src/version.ts @@ -1,2 +1,2 @@ -const version = '2.7.11'; +const version = '2.7.12'; export { version }; diff --git a/packages/layers/package.json b/packages/layers/package.json index 712f212104..e4320da38a 100644 --- a/packages/layers/package.json +++ b/packages/layers/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-layers", - "version": "2.7.11", + "version": "2.7.12", "description": "L7's collection of built-in layers", "main": "lib/index.js", "module": "es/index.js", @@ -24,9 +24,9 @@ "license": "ISC", "dependencies": { "@antv/geo-coord": "^1.0.8", - "@antv/l7-core": "^2.7.11", - "@antv/l7-source": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-source": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "@mapbox/martini": "^0.2.0", "@turf/meta": "^6.0.2", diff --git a/packages/map/package.json b/packages/map/package.json index 5ea73ff826..c29c71ea6a 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-map", - "version": "2.7.11", + "version": "2.7.12", "description": "l7 map", "keywords": [], "author": "thinkinggis ", @@ -37,7 +37,7 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-utils": "^2.7.11", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "@mapbox/point-geometry": "^0.1.0", "@mapbox/unitbezier": "^0.0.0", diff --git a/packages/maps/package.json b/packages/maps/package.json index 1c95396c47..95898a1b7c 100644 --- a/packages/maps/package.json +++ b/packages/maps/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-maps", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -27,9 +27,9 @@ "license": "ISC", "dependencies": { "@amap/amap-jsapi-loader": "^0.0.3", - "@antv/l7-core": "^2.7.11", - "@antv/l7-map": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-map": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "@types/amap-js-api": "^1.4.6", "@types/mapbox-gl": "^1.11.2", diff --git a/packages/mini/package.json b/packages/mini/package.json index 664bea95d2..6552fa799f 100644 --- a/packages/mini/package.json +++ b/packages/mini/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-mini", - "version": "2.7.11", + "version": "2.7.12", "description": "A Large-scale WebGL-powered Geospatial Data Visualization", "main": "lib/index.js", "module": "es/index.js", @@ -25,11 +25,11 @@ "author": "antv", "license": "MIT", "dependencies": { - "@antv/l7-core": "^2.7.11", - "@antv/l7-layers": "^2.7.11", - "@antv/l7-maps": "^2.7.11", - "@antv/l7-scene": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-layers": "^2.7.12", + "@antv/l7-maps": "^2.7.12", + "@antv/l7-scene": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7" }, "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", diff --git a/packages/renderer/package.json b/packages/renderer/package.json index b323ec41da..53c9a013ae 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-renderer", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,7 +26,7 @@ "gl": "^4.4.0" }, "dependencies": { - "@antv/l7-core": "^2.7.11", + "@antv/l7-core": "^2.7.12", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "l7regl": "^0.0.16", diff --git a/packages/scene/package.json b/packages/scene/package.json index 5104b0219e..83690b7968 100644 --- a/packages/scene/package.json +++ b/packages/scene/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-scene", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -23,12 +23,12 @@ "author": "xiaoiver", "license": "ISC", "dependencies": { - "@antv/l7-component": "^2.7.11", - "@antv/l7-core": "^2.7.11", - "@antv/l7-layers": "^2.7.11", - "@antv/l7-maps": "^2.7.11", - "@antv/l7-renderer": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-component": "^2.7.12", + "@antv/l7-core": "^2.7.12", + "@antv/l7-layers": "^2.7.12", + "@antv/l7-maps": "^2.7.12", + "@antv/l7-renderer": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "mapbox-gl": "^1.2.1", diff --git a/packages/source/package.json b/packages/source/package.json index 8c0141a1a5..411cfcaed1 100644 --- a/packages/source/package.json +++ b/packages/source/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-source", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", @@ -26,8 +26,8 @@ "license": "ISC", "dependencies": { "@antv/async-hook": "^2.1.0", - "@antv/l7-core": "^2.7.11", - "@antv/l7-utils": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-utils": "^2.7.12", "@babel/runtime": "^7.7.7", "@mapbox/geojson-rewind": "^0.4.0", "@turf/helpers": "^6.1.4", diff --git a/packages/three/package.json b/packages/three/package.json index 81f16663de..edad057564 100644 --- a/packages/three/package.json +++ b/packages/three/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-three", - "version": "2.7.11", + "version": "2.7.12", "description": "three for L7 ", "keywords": [ "3D", @@ -44,9 +44,9 @@ }, "homepage": "https://github.com/antvis/L7#readme", "dependencies": { - "@antv/l7-core": "^2.7.11", - "@antv/l7-layers": "^2.7.11", - "@antv/l7-scene": "^2.7.11", + "@antv/l7-core": "^2.7.12", + "@antv/l7-layers": "^2.7.12", + "@antv/l7-scene": "^2.7.12", "@babel/runtime": "^7.7.7", "inversify": "^5.0.1", "reflect-metadata": "^0.1.13", diff --git a/packages/utils/package.json b/packages/utils/package.json index 02e45c8720..3bb917cd6b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@antv/l7-utils", - "version": "2.7.11", + "version": "2.7.12", "description": "", "main": "lib/index.js", "module": "es/index.js", diff --git a/stories/Map/components/amap2demo_arcLineLinear.tsx b/stories/Map/components/amap2demo_arcLineLinear.tsx index 5c1f3fafe7..208d0b5dd6 100644 --- a/stories/Map/components/amap2demo_arcLineLinear.tsx +++ b/stories/Map/components/amap2demo_arcLineLinear.tsx @@ -15,7 +15,7 @@ export default class Amap2demo_arcLineLinear extends React.Component { id: 'map', map: new GaodeMapV2({ pitch: 40, - center: [107.77791556935472, 35.443286920228644], + center: [60, 40], zoom: 2.9142882493605033, viewMode: '3D', style: 'dark', @@ -25,11 +25,6 @@ export default class Amap2demo_arcLineLinear extends React.Component { this.scene = scene; scene.on('loaded', () => { - scene.addImage( - '02', - 'https://gw.alipayobjects.com/zos/bmw-prod/0ca1668e-38c2-4010-8568-b57cb33839b9.svg', - ); - let data = [ { lng1: 75.76171875, @@ -38,7 +33,6 @@ export default class Amap2demo_arcLineLinear extends React.Component { lat2: 52.802761415419674, }, ]; - // @ts-ignore const layer = new LineLayer({ blend: 'normal', }) @@ -54,10 +48,9 @@ export default class Amap2demo_arcLineLinear extends React.Component { .size(20) .shape('arc') .color('#f00') + .active(true) .style({ // forward: false, - lineTexture: true, // 开启线的贴图功能 - iconStep: 30, // 设置贴图纹理的间距 // opacity: 0.5, // opacity: 0.2, // lineType: 'dash', @@ -74,6 +67,10 @@ export default class Amap2demo_arcLineLinear extends React.Component { // trailLength: 0.1, // }); scene.addLayer(layer); + + layer.on('click', (e) => { + console.log(e); + }); }); }