p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
921 Commits 22 Branches 197 Tags 697 MiB
Commit Graph

921 Commits

Author SHA1 Message Date
thinkinggis e46980bc63 merge master 2019-06-24 18:07:08 +08:00
thinkinggis 96eb63e18e Merge branch 'dev-lighting' into 'master' 
PolygonLayer 支持最多3个平行光源配置

PolygonLayer 支持最多 3 个平行光源配置
```javascript
.style({
  lights: [
    {
      type: 'directional',
      direction: [ 1, 10.5, 12 ],
      ambient: [ 0.2, 0.2, 0.2 ],
      diffuse: 'red',
      specular: [ 0.1, 0.1, 0.1 ]
    },
    {
      type: 'directional',
      direction: [ 1, -10.5, 12 ],
      ambient: [ 0.2, 0.2, 0.2 ],
      diffuse: 'green',
      specular: [ 0.1, 0.1, 0.1 ]
    },
  ]
})
```

See merge request !33
 2019-06-24 16:26:33 +08:00
thinkinggis 907fd43017 Merge branch 'dev-lighting' into 'master' 
PolygonLayer 支持最多3个平行光源配置

PolygonLayer 支持最多 3 个平行光源配置
```javascript
.style({
  lights: [
    {
      type: 'directional',
      direction: [ 1, 10.5, 12 ],
      ambient: [ 0.2, 0.2, 0.2 ],
      diffuse: 'red',
      specular: [ 0.1, 0.1, 0.1 ]
    },
    {
      type: 'directional',
      direction: [ 1, -10.5, 12 ],
      ambient: [ 0.2, 0.2, 0.2 ],
      diffuse: 'green',
      specular: [ 0.1, 0.1, 0.1 ]
    },
  ]
})
```

See merge request !33
 2019-06-24 16:26:33 +08:00
xiaoiver b4fdc97b56 fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
yuqi.pyq f382bdbc0d fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
xiaoiver d3b5b573a6 Merge branch 'master' into dev-lighting 2019-06-21 16:58:49 +08:00
yuqi.pyq a21ad99d27 Merge branch 'master' into dev-lighting 2019-06-21 16:58:49 +08:00
xiaoiver 63e70a3679 feat(polygon-layer): 支持多个平行光源配置 2019-06-21 16:50:51 +08:00
yuqi.pyq 32cdcf83f3 feat(polygon-layer): 支持多个平行光源配置 2019-06-21 16:50:51 +08:00
thinkinggis 3bff625387 fix(tile):data 2019-06-20 17:54:07 +08:00
thinkinggis 38fe731e52 fix(tile):data 2019-06-20 17:54:07 +08:00
thinkinggis cee221020c Merge branch 'mvt' of gitlab.alipay-inc.com:datavis/L7_beta into mvt 2019-06-18 20:10:30 +08:00
thinkinggis 5dd2dcc2af Merge branch 'mvt' of gitlab.alipay-inc.com:datavis/L7_beta into mvt 2019-06-18 20:10:30 +08:00
thinkinggis 42fa9363a3 refactor source 2019-06-18 20:10:10 +08:00
thinkinggis b1f5c3272a refactor source 2019-06-18 20:10:10 +08:00
thinkinggis 19ff35a71a merge master 2019-06-18 20:04:55 +08:00
thinkinggis f0ee6ee175 merge master 2019-06-18 20:04:55 +08:00
thinkinggis 3ec4f72846 Merge branch 'dev-2d-df' into 'master' 
feat(point-layer): use 2d sdf functions

PointLayer 中使用 2D 距离场绘制，支持描边、反走样效果。

目前支持以下基础图形：
`'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'`


同时支持映射数据到形状：
```
.shape('point_count', [ 'circle', 'triangle', 'hexagon' ])
```

See merge request !32
 2019-06-18 19:31:01 +08:00
thinkinggis 4fc0106b61 Merge branch 'dev-2d-df' into 'master' 
feat(point-layer): use 2d sdf functions

PointLayer 中使用 2D 距离场绘制，支持描边、反走样效果。

目前支持以下基础图形：
`'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'`


同时支持映射数据到形状：
```
.shape('point_count', [ 'circle', 'triangle', 'hexagon' ])
```

See merge request !32
 2019-06-18 19:31:01 +08:00
xiaoiver 6ec70396b9 feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
yuqi.pyq ea548edaa6 feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
xiaoiver d4a8f2943e fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
yuqi.pyq badca0446d fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
thinkinggis a9d2c276d7 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
thinkinggis 4ce9d60256 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
xiaoiver 4d1958467e feat: lighting 2019-06-13 19:47:49 +08:00
yuqi.pyq f8269ee35b feat: lighting 2019-06-13 19:47:49 +08:00
thinkinggis 5bf076a9d5 fix(mvt): source 2019-06-10 11:54:11 +08:00
thinkinggis 6a4af99c29 fix(mvt): source 2019-06-10 11:54:11 +08:00
thinkinggis 1733971fcf Merge branch 'dev-vertex-compression' into 'master' 
Dev vertex compression

对于 point layer(circle) 压缩顶点数据
https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/wxv543#xzVLo

优化后每个顶点只需要一个 vec4 存储颜色、pickingId 等数据：
vec4(color, color, pickingId, (extrude.x, extrude.y, radius))

See merge request !31
 2019-05-30 16:45:40 +08:00
thinkinggis a233c588f4 Merge branch 'dev-vertex-compression' into 'master' 
Dev vertex compression

对于 point layer(circle) 压缩顶点数据
https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/wxv543#xzVLo

优化后每个顶点只需要一个 vec4 存储颜色、pickingId 等数据：
vec4(color, color, pickingId, (extrude.x, extrude.y, radius))

See merge request !31
 2019-05-30 16:45:40 +08:00
xiaoiver 1104e3afc5 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
yuqi.pyq 865875d478 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
xiaoiver 5e0bac0fe4 feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
yuqi.pyq ef2a9dd957 feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
thinkinggis db50ae496e Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis f215a339f6 Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis 7d33a17f4d feat(layer): add controller 2019-05-29 15:35:24 +08:00
thinkinggis d562f86251 feat(layer): add controller 2019-05-29 15:35:24 +08:00
xiaoiver ee5611d892 feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
yuqi.pyq e8704a1e7e feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
xiaoiver 03ce45c7ca fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
yuqi.pyq dd8fcfab7a fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
thinkinggis 209391edda Merge branch 'mvt' into 'master' 
Mvt

Vector 瓦片

See merge request !30
 2019-05-28 17:39:57 +08:00
thinkinggis 27f6f4dfbc Merge branch 'mvt' into 'master' 
Mvt

Vector 瓦片

See merge request !30
 2019-05-28 17:39:57 +08:00
thinkinggis fdec4b1a49 fix(line): default activeId 2019-05-28 17:39:02 +08:00
thinkinggis 1491a7b0aa fix(line): default activeId 2019-05-28 17:39:02 +08:00
thinkinggis a41ae2e485 fix(merge master conflict 2019-05-28 15:29:56 +08:00
thinkinggis a22ef03ec8 fix(merge master conflict 2019-05-28 15:29:56 +08:00
thinkinggis 7bd67d716b fix(line) size 2019-05-28 11:50:07 +08:00