Commit Graph

213 Commits

Author SHA1 Message Date
yuqi.pyq 4ec14dfda5 feat: 增加对于点要素的自动标注 2019-08-14 19:52:44 +08:00
thinkinggis 821e180a74 Merge branch 'greatCircle' into 'master'
fix(scene):  engine run



See merge request !40
2019-07-15 11:47:16 +08:00
thinkinggis c15221cc3f fix(scene): engine run 2019-07-15 11:46:28 +08:00
thinkinggis e3c7e7f5d2 Merge branch 'greatCircle' into 'master'
feat(line): greatCircle

line 图层增加greatCircleshape

See merge request !39
2019-07-15 11:44:45 +08:00
thinkinggis ba8f6c0a3e fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis 3ca1c53bd5 feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 31cbf80917 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
izzy.cz 7010b98947 线支持pattern 2019-07-12 20:38:20 +08:00
thinkinggis 42c3a35228 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 13aa8b643b fix(map): map style map 2019-07-10 14:39:27 +08:00
thinkinggis 3dee4a57da fix(extrude): add geojson rewind 2019-07-10 12:08:11 +08:00
thinkinggis 9c848d1cbe Merge branch 'polygonJson' into 'master'
fix(poylygon): json source

修复 polygon对json数据源的支持

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

新增pattern数据映射

See merge request !35
2019-07-08 16:53:45 +08:00
thinkinggis 4f55374345 feat(attr): add pattern 2019-07-08 16:10:22 +08:00
thinkinggis 83f7cb545c update version 2019-07-02 20:54:49 +08:00
thinkinggis 8a2614191d fix(package): update version 2019-06-25 16:03:48 +08:00
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