Commit Graph

553 Commits

Author SHA1 Message Date
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
thinkinggis 4c59dcd8ca fix(line) size 2019-05-28 11:50:07 +08:00
thinkinggis fe345e1579 fix(tile): vectorMap 2019-05-28 11:35:31 +08:00
thinkinggis 0888f31769 fix(tile): vectorMap 2019-05-28 11:35:31 +08:00
thinkinggis 713140033c 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 6c0992b6ec 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 c0ea754522 feat: support bevel joint, dashline & anti-alias 2019-05-27 20:42:17 +08:00
yuqi.pyq 393c5d0c5a feat: support bevel joint, dashline & anti-alias 2019-05-27 20:42:17 +08:00
thinkinggis facce2a255 fix(tilelayer): point pickup 2019-05-27 14:14:45 +08:00
thinkinggis cef72bc497 fix(tilelayer): point pickup 2019-05-27 14:14:45 +08:00
thinkinggis f0a10992dd feat(tile): fix point tile layer 2019-05-27 10:55:28 +08:00
thinkinggis b6d2109a68 feat(tile): fix point tile layer 2019-05-27 10:55:28 +08:00
thinkinggis e0de889c8c refactor(layer): add register render 2019-05-16 21:43:23 +08:00
thinkinggis 44d405ce93 refactor(layer): add register render 2019-05-16 21:43:23 +08:00
thinkinggis 736a53df82 Merge branch 'master' into mvt 2019-05-14 17:44:03 +08:00
thinkinggis 2ceb4069e6 Merge branch 'master' into mvt 2019-05-14 17:44:03 +08:00
thinkinggis 83df28b246 fix(Amap): fix mapstyle 2019-05-14 17:42:46 +08:00
thinkinggis 9be646b8ab fix(Amap): fix mapstyle 2019-05-14 17:42:46 +08:00
thinkinggis e018661b7a feat(tilelayer): add mask 2019-05-14 17:10:19 +08:00