p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shihui (#964) 

* 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
This commit is contained in:
YiQianYao 2022-02-15 17:34:50 +08:00 committed by GitHub
parent 7b91e55ce5
commit 589ce2feb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -14,7 +14,7 @@
"message": "chore: publish" "message": "chore: publish"
} }
}, },
"version": "2.7.11", "version": "2.7.12",
"npmClient": "yarn", "npmClient": "yarn",
"useWorkspaces": true, "useWorkspaces": true,
"publishConfig": { "publishConfig": {

6
packages/component/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-component", "name": "@antv/l7-component",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,8 +25,8 @@
"author": "lzxue", "author": "lzxue",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.0",
"inversify": "^5.0.1", "inversify": "^5.0.1",

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-core", "name": "@antv/l7-core",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,7 +24,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"ajv": "^6.10.2", "ajv": "^6.10.2",
"element-resize-event": "^3.0.3", "element-resize-event": "^3.0.3",

16
packages/l7/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7", "name": "@antv/l7",
"version": "2.7.11", "version": "2.7.12",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,13 +25,13 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.7.11", "@antv/l7-component": "^2.7.12",
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-layers": "^2.7.11", "@antv/l7-layers": "^2.7.12",
"@antv/l7-maps": "^2.7.11", "@antv/l7-maps": "^2.7.12",
"@antv/l7-scene": "^2.7.11", "@antv/l7-scene": "^2.7.12",
"@antv/l7-source": "^2.7.11", "@antv/l7-source": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

2
packages/l7/src/version.ts
View File

@ -1,2 +1,2 @@
const version = '2.7.11'; const version = '2.7.12';
export { version }; export { version };

8
packages/layers/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-layers", "name": "@antv/l7-layers",
"version": "2.7.11", "version": "2.7.12",
"description": "L7's collection of built-in layers", "description": "L7's collection of built-in layers",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -24,9 +24,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/geo-coord": "^1.0.8", "@antv/geo-coord": "^1.0.8",
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-source": "^2.7.11", "@antv/l7-source": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/martini": "^0.2.0", "@mapbox/martini": "^0.2.0",
"@turf/meta": "^6.0.2", "@turf/meta": "^6.0.2",

4
packages/map/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-map", "name": "@antv/l7-map",
"version": "2.7.11", "version": "2.7.12",
"description": "l7 map", "description": "l7 map",
"keywords": [], "keywords": [],
"author": "thinkinggis <lzx199065@gmail.com>", "author": "thinkinggis <lzx199065@gmail.com>",
@ -37,7 +37,7 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/point-geometry": "^0.1.0", "@mapbox/point-geometry": "^0.1.0",
"@mapbox/unitbezier": "^0.0.0", "@mapbox/unitbezier": "^0.0.0",

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-maps", "name": "@antv/l7-maps",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -27,9 +27,9 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@amap/amap-jsapi-loader": "^0.0.3", "@amap/amap-jsapi-loader": "^0.0.3",
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-map": "^2.7.11", "@antv/l7-map": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6", "@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2", "@types/mapbox-gl": "^1.11.2",

12
packages/mini/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-mini", "name": "@antv/l7-mini",
"version": "2.7.11", "version": "2.7.12",
"description": "A Large-scale WebGL-powered Geospatial Data Visualization", "description": "A Large-scale WebGL-powered Geospatial Data Visualization",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -25,11 +25,11 @@
"author": "antv", "author": "antv",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-layers": "^2.7.11", "@antv/l7-layers": "^2.7.12",
"@antv/l7-maps": "^2.7.11", "@antv/l7-maps": "^2.7.12",
"@antv/l7-scene": "^2.7.11", "@antv/l7-scene": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7" "@babel/runtime": "^7.7.7"
}, },
"gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31", "gitHead": "684ba4eb806a798713496d3fc0b4d1e17517dc31",

4
packages/renderer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-renderer", "name": "@antv/l7-renderer",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,7 +26,7 @@
"gl": "^4.4.0" "gl": "^4.4.0"
}, },
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"l7regl": "^0.0.16", "l7regl": "^0.0.16",

14
packages/scene/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-scene", "name": "@antv/l7-scene",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -23,12 +23,12 @@
"author": "xiaoiver", "author": "xiaoiver",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/l7-component": "^2.7.11", "@antv/l7-component": "^2.7.12",
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-layers": "^2.7.11", "@antv/l7-layers": "^2.7.12",
"@antv/l7-maps": "^2.7.11", "@antv/l7-maps": "^2.7.12",
"@antv/l7-renderer": "^2.7.11", "@antv/l7-renderer": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"mapbox-gl": "^1.2.1", "mapbox-gl": "^1.2.1",

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-source", "name": "@antv/l7-source",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",
@ -26,8 +26,8 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@antv/async-hook": "^2.1.0", "@antv/async-hook": "^2.1.0",
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-utils": "^2.7.11", "@antv/l7-utils": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0", "@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4", "@turf/helpers": "^6.1.4",

8
packages/three/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-three", "name": "@antv/l7-three",
"version": "2.7.11", "version": "2.7.12",
"description": "three for L7 ", "description": "three for L7 ",
"keywords": [ "keywords": [
"3D", "3D",
@ -44,9 +44,9 @@
}, },
"homepage": "https://github.com/antvis/L7#readme", "homepage": "https://github.com/antvis/L7#readme",
"dependencies": { "dependencies": {
"@antv/l7-core": "^2.7.11", "@antv/l7-core": "^2.7.12",
"@antv/l7-layers": "^2.7.11", "@antv/l7-layers": "^2.7.12",
"@antv/l7-scene": "^2.7.11", "@antv/l7-scene": "^2.7.12",
"@babel/runtime": "^7.7.7", "@babel/runtime": "^7.7.7",
"inversify": "^5.0.1", "inversify": "^5.0.1",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@antv/l7-utils", "name": "@antv/l7-utils",
"version": "2.7.11", "version": "2.7.12",
"description": "", "description": "",
"main": "lib/index.js", "main": "lib/index.js",
"module": "es/index.js", "module": "es/index.js",

15
stories/Map/components/amap2demo_arcLineLinear.tsx
View File

@ -15,7 +15,7 @@ export default class Amap2demo_arcLineLinear extends React.Component {
id: 'map', id: 'map',
map: new GaodeMapV2({ map: new GaodeMapV2({
pitch: 40, pitch: 40,
center: [107.77791556935472, 35.443286920228644], center: [60, 40],
zoom: 2.9142882493605033, zoom: 2.9142882493605033,
viewMode: '3D', viewMode: '3D',
style: 'dark', style: 'dark',
@ -25,11 +25,6 @@ export default class Amap2demo_arcLineLinear extends React.Component {
this.scene = scene; this.scene = scene;
scene.on('loaded', () => { scene.on('loaded', () => {
scene.addImage(
'02',
'https://gw.alipayobjects.com/zos/bmw-prod/0ca1668e-38c2-4010-8568-b57cb33839b9.svg',
);
let data = [ let data = [
{ {
lng1: 75.76171875, lng1: 75.76171875,
@ -38,7 +33,6 @@ export default class Amap2demo_arcLineLinear extends React.Component {
lat2: 52.802761415419674, lat2: 52.802761415419674,
}, },
]; ];
// @ts-ignore
const layer = new LineLayer({ const layer = new LineLayer({
blend: 'normal', blend: 'normal',
}) })
@ -54,10 +48,9 @@ export default class Amap2demo_arcLineLinear extends React.Component {
.size(20) .size(20)
.shape('arc') .shape('arc')
.color('#f00') .color('#f00')
.active(true)
.style({ .style({
// forward: false, // forward: false,
lineTexture: true, // 开启线的贴图功能
iconStep: 30, // 设置贴图纹理的间距
// opacity: 0.5, // opacity: 0.5,
// opacity: 0.2, // opacity: 0.2,
// lineType: 'dash', // lineType: 'dash',
@ -74,6 +67,10 @@ export default class Amap2demo_arcLineLinear extends React.Component {
// trailLength: 0.1, // trailLength: 0.1,
// }); // });
scene.addLayer(layer); scene.addLayer(layer);
layer.on('click', (e) => {
console.log(e);
});
}); });
} }