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

Shihui dev (#797) 

* feat: add getModelMatrix into viewport

* feat: 新增地球模式 （初步构建）

* feat: 完善地球交互

* style: lint style

* feat: 调整地球图层缩放的方向

* style: lint style

* feat: 增加地球模式的 pointLayer/fill 图层

* style: lint style

* feat: 增加地球、太阳的简单运动系统，优化部分代码结构

* fix: 修复时间点击出错

* style: lint style

* fix: 修复地图 panBy 方法参数错误

* style: lint style

* feat: pointLayer/cylinder 圆柱兼容地球模式

* style: lint style

* feat: 修复 pointLayer/fill 在拾取是破面严重的情况

* style: lint style

* feat: 增加 arc 弧度调节

* feat: 增加 lineLayer/arc3d 兼容地球模式

* style: lint style

* feat: 增加地球图层 - 大气层

* style: lint style

* feat: 增加设置可视化层背景色的能力

* style: lint style

* feat: 增加地球外发光效果

* style: lint style

* feat: 允许用户不使用 layer 的 source 方法 - 地球模式下光晕图层不需要传数据

* style: lint style

* feat: 调整光晕的 shader 计算

* chore: update version 2.5.32 -> 2.5.33

* feat: 调整地球大气层的渲染层级

* style: lint style

* feat: 调整案例

* style: lint style
This commit is contained in:
YiQianYao 2021-10-12 14:39:08 +08:00 committed by GitHub
parent b296595858
commit 7bfdb4b7c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 87 additions and 80 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"
}
},
"version": "2.5.32",
"version": "2.5.33",
"npmClient": "yarn",
"useWorkspaces": true,
"publishConfig": {

6
packages/component/package.json
View File

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

4
packages/core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-core",
"version": "2.5.32",
"version": "2.5.33",
"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.5.32",
"@antv/l7-utils": "^2.5.33",
"@babel/runtime": "^7.7.7",
"@mapbox/tiny-sdf": "^1.1.1",
"ajv": "^6.10.2",

14
packages/l7/package.json
View File

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

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

@ -1,2 +1,2 @@
const version = '2.5.32';
const version = '2.5.33';
export { version };

8
packages/layers/package.json
View File

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

2
packages/layers/src/earth/models/atmosphere.ts
View File

@ -34,6 +34,8 @@ export default class EarthAtomSphereModel extends BaseModel {
}
public buildModels(): IModel[] {
// TODO: 调整图层的绘制顺序 地球大气层
this.layer.zIndex = -997;
return [
this.layer.buildLayerModel({
moduleName: 'earthAtmoSphere',

2
packages/layers/src/earth/models/base.ts
View File

@ -91,6 +91,8 @@ export default class BaseEarthModel extends BaseModel {
}
public buildModels(): IModel[] {
// TODO: 调整图层的绘制顺序 地球大气层
this.layer.zIndex = -998;
return [
this.layer.buildLayerModel({
moduleName: 'baseEarth',

4
packages/map/package.json
View File

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

8
packages/maps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-maps",
"version": "2.5.32",
"version": "2.5.33",
"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.5.32",
"@antv/l7-map": "^2.5.32",
"@antv/l7-utils": "^2.5.32",
"@antv/l7-core": "^2.5.33",
"@antv/l7-map": "^2.5.33",
"@antv/l7-utils": "^2.5.33",
"@babel/runtime": "^7.7.7",
"@types/amap-js-api": "^1.4.6",
"@types/mapbox-gl": "^1.11.2",

4
packages/renderer/package.json
View File

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

14
packages/scene/package.json
View File

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

6
packages/source/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@antv/l7-source",
"version": "2.5.32",
"version": "2.5.33",
"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.5.32",
"@antv/l7-utils": "^2.5.32",
"@antv/l7-core": "^2.5.33",
"@antv/l7-utils": "^2.5.33",
"@babel/runtime": "^7.7.7",
"@mapbox/geojson-rewind": "^0.4.0",
"@turf/helpers": "^6.1.4",

8
packages/three/package.json
View File

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

2
packages/utils/package.json
View File

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

48
stories/customMap/components/earth.tsx
View File

@ -22,6 +22,28 @@ export default class ScaleComponent extends React.Component {
});
var d = [
{ lng: 121.61865234375, lat: 25.29437116258816 },
{ lng: 121.058349609375, lat: 25.015928763367857 },
{ lng: 120.7177734375, lat: 24.587090339209634 },
{ lng: 120.28930664062499, lat: 23.936054914599815 },
{ lng: 120.12451171875, lat: 23.553916518321625 },
{ lng: 120.08056640625, lat: 23.120153621695614 },
{ lng: 120.234375, lat: 22.867317960075614 },
{ lng: 120.43212890625, lat: 22.52270570348246 },
{ lng: 120.65185546875, lat: 22.370396344320053 },
{ lng: 120.750732421875, lat: 21.922663209325922 },
{ lng: 120.948486328125, lat: 22.268764039073968 },
{ lng: 121.124267578125, lat: 22.806567100271522 },
{ lng: 121.56372070312499, lat: 23.915970370510227 },
{ lng: 121.88232421875, lat: 24.557116164309626 },
{ lng: 121.95922851562501, lat: 25.075648445630527 },
{ lng: 109.97314453125, lat: 20.076570104545173 },
{ lng: 108.896484375, lat: 19.663280219987662 },
{ lng: 108.61083984375, lat: 18.979025953255267 },
{ lng: 108.80859375, lat: 18.47960905583197 },
{ lng: 109.599609375, lat: 18.35452552912664 },
{ lng: 110.32470703125, lat: 18.771115062337024 },
{ lng: 111.005859375, lat: 19.78738018198621 },
{ lng: 110, lat: 30 },
{ lng: 127.657407, lat: 49.76027 },
{ lng: 129.397818, lat: 49.4406 },
@ -352,11 +374,11 @@ export default class ScaleComponent extends React.Component {
},
},
)
.shape('circle')
// .shape('cylinder')
// .shape('circle')
.shape('cylinder')
.color('#f00')
// .size('', () => [1, 1, 10])
.size(20)
.size('', () => [1, 1, 10])
// .size(20)
.style({
// opacity: 0.6,
})
@ -407,13 +429,25 @@ export default class ScaleComponent extends React.Component {
// earthTime: 4.0
earthTime: 0.1,
},
});
// .animate(true);
})
.animate(true);
// earthlayer.setEarthTime(4.0)
const atomLayer = new EarthLayer()
.color('#2E8AE6')
.shape('atomSphere')
.style({
opacity: 1,
});
const bloomLayer = new EarthLayer().color('#fff').shape('bloomSphere');
scene.on('loaded', () => {
scene.addLayer(earthlayer);
scene.addLayer(pointlayer);
// console.log(pointlayer)
scene.addLayer(atomLayer);
scene.addLayer(bloomLayer);
earthlayer.setEarthTime(4.0);
});

33
stories/customMap/components/earth2.tsx
View File

@ -23,36 +23,6 @@ export default class ScaleComponent extends React.Component {
scene.setBgColor('#333');
let data = [
{
lng1: 100,
lat1: 30.0,
lng2: 130,
lat2: 30,
},
];
const lineLayer = new LineLayer({
blend: 'normal',
})
.source(data, {
parser: {
type: 'json',
x: 'lng1',
y: 'lat1',
x1: 'lng2',
y1: 'lat2',
},
})
.size(2)
.shape('arc3d')
.color('#8C1EB2');
// .animate(true)
// .animate({
// duration: 50,
// interval: 0.2,
// trailLength: 0.05,
// });
fetch(
'https://gw.alipayobjects.com/os/basement_prod/a5ac7bce-181b-40d1-8a16-271356264ad8.json',
)
@ -79,7 +49,7 @@ export default class ScaleComponent extends React.Component {
})
.color('#b97feb')
.shape('arc3d')
.size(1)
.size(0.5)
.active(true)
.animate({
interval: 2,
@ -143,7 +113,6 @@ export default class ScaleComponent extends React.Component {
// earthlayer.setEarthTime(4.0);
scene.addLayer(atomLayer);
scene.addLayer(bloomLayer);
scene.addLayer(lineLayer);
});
}