Commit Graph

1009 Commits

Author SHA1 Message Date
thinkinggis 502b6857b3 Merge branch 'mvt' of gitlab.alipay-inc.com:datavis/L7_beta into mvt 2019-06-18 20:10:30 +08:00
thinkinggis a15593bc12 refactor source 2019-06-18 20:10:10 +08:00
thinkinggis 624c0a7a0b refactor source 2019-06-18 20:10:10 +08:00
thinkinggis d3744aa252 merge master 2019-06-18 20:04:55 +08:00
thinkinggis 3b5fc3a7ec merge master 2019-06-18 20:04:55 +08:00
thinkinggis 2ec072375e 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 1deb8d1dac 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 69b10c3328 feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
yuqi.pyq 2214755b1d feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
xiaoiver 55ebcbb3be fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
yuqi.pyq 88349014fa fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
thinkinggis 533b7181b2 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
thinkinggis bc0e8c72d4 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
xiaoiver 9c3a25f528 feat: lighting 2019-06-13 19:47:49 +08:00
yuqi.pyq bfe3ab89e2 feat: lighting 2019-06-13 19:47:49 +08:00
thinkinggis df6b2bdb77 fix(mvt): source 2019-06-10 11:54:11 +08:00
thinkinggis 5b6c11090e fix(mvt): source 2019-06-10 11:54:11 +08:00
thinkinggis 336146e4c3 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 37049f4301 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 c352f97b17 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
yuqi.pyq a93f242600 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
xiaoiver e8e9301484 feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
yuqi.pyq 569dff2caa feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
thinkinggis 592a30a4c3 Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis 873264b6fc Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis 55cf7a0dda feat(layer): add controller 2019-05-29 15:35:24 +08:00
thinkinggis 838a9fff9e feat(layer): add controller 2019-05-29 15:35:24 +08:00
xiaoiver de26129fa1 feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
yuqi.pyq 3fd9526ca8 feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
xiaoiver ee152123aa fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
yuqi.pyq 7cb392a547 fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
thinkinggis 9f14540d81 Merge branch 'mvt' into 'master'
Mvt

Vector 瓦片

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

Vector 瓦片

See merge request !30
2019-05-28 17:39:57 +08:00
thinkinggis 5e4bddf7db fix(line): default activeId 2019-05-28 17:39:02 +08:00
thinkinggis a50f82f73d fix(line): default activeId 2019-05-28 17:39:02 +08:00
thinkinggis 22f1b7196e fix(merge master conflict 2019-05-28 15:29:56 +08:00
thinkinggis fbaf34f034 fix(merge master conflict 2019-05-28 15:29:56 +08:00
thinkinggis d601bc4ad9 fix(line) size 2019-05-28 11:50:07 +08:00
thinkinggis cb20fead4d fix(line) size 2019-05-28 11:50:07 +08:00
thinkinggis 9c79470cea fix(tile): vectorMap 2019-05-28 11:35:31 +08:00
thinkinggis af75f6439b fix(tile): vectorMap 2019-05-28 11:35:31 +08:00
thinkinggis 38ba8763d3 Merge branch 'dev-optimize-line' into 'master'
feat: support bevel joint, dashline & anti-alias

主要改进了 3 点:
1. 超过阈值(非常小的锐角)时,miter 接头转成 bevel 接头
2. 支持虚线 demo/dashline.html
3. anti-alias 边缘反走样,可配置模糊半径

See merge request !29
2019-05-28 11:34:54 +08:00
thinkinggis 2bec4bf32c Merge branch 'dev-optimize-line' into 'master'
feat: support bevel joint, dashline & anti-alias

主要改进了 3 点:
1. 超过阈值(非常小的锐角)时,miter 接头转成 bevel 接头
2. 支持虚线 demo/dashline.html
3. anti-alias 边缘反走样,可配置模糊半径

See merge request !29
2019-05-28 11:34:54 +08:00
xiaoiver 540261061a feat: support bevel joint, dashline & anti-alias 2019-05-27 20:42:17 +08:00
yuqi.pyq 91a0a0310c feat: support bevel joint, dashline & anti-alias 2019-05-27 20:42:17 +08:00
thinkinggis fa6ea34cf2 fix(tilelayer): point pickup 2019-05-27 14:14:45 +08:00
thinkinggis 6f6fe5428e fix(tilelayer): point pickup 2019-05-27 14:14:45 +08:00
thinkinggis 2bb6db2d7c feat(tile): fix point tile layer 2019-05-27 10:55:28 +08:00
thinkinggis 6b4bac65b1 feat(tile): fix point tile layer 2019-05-27 10:55:28 +08:00
thinkinggis 0d858fb5af refactor(layer): add register render 2019-05-16 21:43:23 +08:00