Commit Graph

578 Commits

Author SHA1 Message Date
thinkinggis 1b0ace7f97 refactor(src) file name 2019-06-26 14:30:29 +08:00
thinkinggis 97cf2020f9 refactor(src) file name 2019-06-26 14:30:29 +08:00
thinkinggis 8755749c3f fix(package): update version 2019-06-25 16:03:48 +08:00
thinkinggis 8a2614191d 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 fd43d31209 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 edc9b11051 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
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
xiaoiver fc0fc28074 fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
yuqi.pyq 16f436d174 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
yuqi.pyq 1dd2904400 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
yuqi.pyq d6ebedf27b 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 9892d9d1b1 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 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