Commit Graph

195 Commits

Author SHA1 Message Date
thinkinggis fd43d31209 Merge branch 'mvt' into 'master'
Mvt

合并矢量瓦片

See merge request !34
2019-06-24 18:08:42 +08:00
thinkinggis edc9b11051 merge master 2019-06-24 18:07:08 +08:00
thinkinggis 7628aa2147 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
yuqi.pyq 16f436d174 fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
yuqi.pyq 1dd2904400 Merge branch 'master' into dev-lighting 2019-06-21 16:58:49 +08:00
yuqi.pyq d6ebedf27b feat(polygon-layer): 支持多个平行光源配置 2019-06-21 16:50:51 +08:00
thinkinggis 9892d9d1b1 fix(tile):data 2019-06-20 17:54:07 +08:00
thinkinggis 502b6857b3 Merge branch 'mvt' of gitlab.alipay-inc.com:datavis/L7_beta into mvt 2019-06-18 20:10:30 +08:00
thinkinggis 624c0a7a0b refactor source 2019-06-18 20:10:10 +08:00
thinkinggis 3b5fc3a7ec merge master 2019-06-18 20:04:55 +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
yuqi.pyq 2214755b1d feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
yuqi.pyq 88349014fa fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
thinkinggis bc0e8c72d4 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
yuqi.pyq bfe3ab89e2 feat: lighting 2019-06-13 19:47:49 +08:00
thinkinggis 5b6c11090e fix(mvt): source 2019-06-10 11:54:11 +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
yuqi.pyq a93f242600 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
yuqi.pyq 569dff2caa feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
thinkinggis 873264b6fc Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis 838a9fff9e feat(layer): add controller 2019-05-29 15:35:24 +08:00
yuqi.pyq 3fd9526ca8 feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
yuqi.pyq 7cb392a547 fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
thinkinggis 0a0bd69baf Merge branch 'mvt' into 'master'
Mvt

Vector 瓦片

See merge request !30
2019-05-28 17:39:57 +08:00
thinkinggis a50f82f73d fix(line): default activeId 2019-05-28 17:39:02 +08:00
thinkinggis fbaf34f034 fix(merge master conflict 2019-05-28 15:29:56 +08:00
thinkinggis cb20fead4d fix(line) size 2019-05-28 11:50:07 +08:00
thinkinggis af75f6439b fix(tile): vectorMap 2019-05-28 11:35:31 +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
yuqi.pyq 91a0a0310c feat: support bevel joint, dashline & anti-alias 2019-05-27 20:42:17 +08:00
thinkinggis 6f6fe5428e fix(tilelayer): point pickup 2019-05-27 14:14:45 +08:00
thinkinggis 6b4bac65b1 feat(tile): fix point tile layer 2019-05-27 10:55:28 +08:00
thinkinggis 9e6f6bb823 refactor(layer): add register render 2019-05-16 21:43:23 +08:00
thinkinggis d580f67342 Merge branch 'master' into mvt 2019-05-14 17:44:03 +08:00
thinkinggis 86a18cd0ff fix(Amap): fix mapstyle 2019-05-14 17:42:46 +08:00
thinkinggis d483759fa0 feat(tilelayer): add mask 2019-05-14 17:10:19 +08:00
thinkinggis 749891901f fix(heatmap): setValue 2019-05-07 19:52:33 +08:00
thinkinggis 43051a0c22 Merge branch 'tile' into 'master'
Tile

增加Image Tile Layer
过滤无效的geojson数据

See merge request !28
2019-05-06 15:20:32 +08:00
thinkinggis 3bd9559983 fix(scene): render 2019-05-06 13:57:09 +08:00
thinkinggis f57eacee8f Merge branch 'master' into tile 2019-05-06 12:05:01 +08:00
thinkinggis 38f24cfec2 fix tile layer caculate tile lod 2019-05-06 11:54:32 +08:00
thinkinggis f5e61d8229 Merge branch 'fix-raster' into 'master'
Fix raster

解决 type array clone 导致栅格数据渲染失败的问题

See merge request !27
2019-04-29 19:57:16 +08:00
thinkinggis d1c402cb27 fix(raster): layer clone typeArray 2019-04-29 18:16:04 +08:00
thinkinggis a4d193efa8 fix(source): geojson parser filter invalid 2019-04-24 09:44:03 +08:00
thinkinggis 9409bf65e6 Merge branch 'master' into tile 2019-04-23 10:23:01 +08:00
thinkinggis b4791d6b63 fix(geojson): geometry is null 2019-04-23 10:22:22 +08:00
thinkinggis 6979592cc5 fix test 2019-04-19 11:51:22 +08:00
thinkinggis cc96ec08e4 feat(tile): add image tile layer 2019-04-18 22:28:17 +08:00
thinkinggis a180c52277 feat(tile): add tile 2019-04-17 15:41:26 +08:00
thinkinggis f15fd72843 Merge branch 'map' into 'master'
Map

L7 实例化支持传入地图实例

See merge request !26
2019-04-16 11:24:16 +08:00