Commit Graph

210 Commits

Author SHA1 Message Date
thinkinggis cc4460ba6f fix(scene): engine run 2019-07-15 11:46:28 +08:00
thinkinggis 38ebb3ccb9 fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis ca3df19c20 feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 56e986cd33 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
izzy.cz 5f61ee5f07 线支持pattern 2019-07-12 20:38:20 +08:00
thinkinggis 7d11de3748 Merge branch 'polygonJson' into 'master'
fix(extrude): add geojson rewind

增加geojson-rewind 自动转换

See merge request !37
2019-07-10 14:40:26 +08:00
thinkinggis 775c8452cb fix(map): map style map 2019-07-10 14:39:27 +08:00
thinkinggis e90dd7ef82 fix(extrude): add geojson rewind 2019-07-10 12:08:11 +08:00
thinkinggis ac60f04203 Merge branch 'polygonJson' into 'master'
fix(poylygon): json source

修复 polygon对json数据源的支持

See merge request !36
2019-07-10 11:27:21 +08:00
thinkinggis cd00d33fcc update version 2019-07-10 11:26:29 +08:00
thinkinggis 4b4e33dc9f fix(poylygon): json source 2019-07-10 11:18:40 +08:00
thinkinggis 9a13a18a89 Merge branch 'pattern' into 'master'
Pattern

新增pattern数据映射

See merge request !35
2019-07-08 16:53:45 +08:00
thinkinggis 5e7447b2cb feat(attr): add pattern 2019-07-08 16:10:22 +08:00
thinkinggis 917a076e46 update version 2019-07-02 20:54:49 +08:00
thinkinggis 8755749c3f fix(package): update version 2019-06-25 16:03:48 +08:00
thinkinggis f6d0c9de11 Merge branch 'mvt' into 'master'
Mvt

合并矢量瓦片

See merge request !34
2019-06-24 18:08:42 +08:00
thinkinggis 80b2740d86 merge master 2019-06-24 18:07:08 +08:00
thinkinggis 3bdbf3c98c 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 fc0fc28074 fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
xiaoiver 122f5012d5 Merge branch 'master' into dev-lighting 2019-06-21 16:58:49 +08:00
xiaoiver d4525257e4 feat(polygon-layer): 支持多个平行光源配置 2019-06-21 16:50:51 +08:00
thinkinggis a99c7affff fix(tile):data 2019-06-20 17:54:07 +08:00
thinkinggis 3d12bd4638 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 d3744aa252 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
xiaoiver 69b10c3328 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
thinkinggis 533b7181b2 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
xiaoiver 9c3a25f528 feat: lighting 2019-06-13 19:47:49 +08:00
thinkinggis df6b2bdb77 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
xiaoiver c352f97b17 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
thinkinggis 592a30a4c3 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
xiaoiver de26129fa1 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
thinkinggis 9f14540d81 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 22f1b7196e 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 9c79470cea 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
xiaoiver 540261061a 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 2bb6db2d7c 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
thinkinggis e851483951 Merge branch 'master' into mvt 2019-05-14 17:44:03 +08:00
thinkinggis 6154a1cc77 fix(Amap): fix mapstyle 2019-05-14 17:42:46 +08:00