Commit Graph

223 Commits

Author SHA1 Message Date
thinkinggis d2cb9cf4d1 refactor: line & polygon buffer 2019-07-23 21:43:52 +08:00
thinkinggis f451fd6cce merge greatCirlce 2019-07-23 21:09:07 +08:00
thinkinggis 59a66e93a6 fix(rewind):vector tile not rewind 2019-07-16 19:36:05 +08:00
thinkinggis 4e6ec5a2c4 Merge branch 'master' into rollup 2019-07-15 20:45:53 +08:00
thinkinggis d55ffff5aa fix(rendermask): maskmesh 2019-07-15 20:45:45 +08:00
thinkinggis 9d8e531df6 fix(scene): engine run 2019-07-15 11:46:28 +08:00
thinkinggis 926cc74a3e fix(shader): fix conflict 2019-07-15 11:42:00 +08:00
thinkinggis 6188d0783a feat(line): greatCircle 2019-07-15 11:35:07 +08:00
thinkinggis 55d6a94439 Merge branch 'patternline' into 'master'
线支持pattern



See merge request !38
2019-07-15 10:23:55 +08:00
izzy.cz 0785dc7631 线支持pattern 2019-07-12 20:38:20 +08:00
thinkinggis af8b0f247b merge master 2019-07-10 14:57:17 +08:00
thinkinggis f9797e6749 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 ac1056c3a2 fix(map): map style map 2019-07-10 14:39:27 +08:00
thinkinggis 12ca2c7e36 fix(extrude): add geojson rewind 2019-07-10 12:08:11 +08:00
thinkinggis 12d95157cd Merge branch 'polygonJson' into 'master'
fix(poylygon): json source

修复 polygon对json数据源的支持

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

新增pattern数据映射

See merge request !35
2019-07-08 16:53:45 +08:00
thinkinggis 1eef58a29a feat(attr): add pattern 2019-07-08 16:10:22 +08:00
thinkinggis 1a5faaea45 feat(worker): worker Source 2019-07-08 16:08:44 +08:00
thinkinggis d7d66a26f6 feat(worker): worker Source 2019-07-08 16:07:47 +08:00
thinkinggis 53f726872a feat(layer): style 增加blending 配置项 2019-07-03 10:58:58 +08:00
thinkinggis c5dd7a402a update version 2019-07-02 20:54:49 +08:00
thinkinggis 5a1cfded2d fix(worker):test 2019-07-02 20:27:23 +08:00
thinkinggis 5086aa1d73 refactor(src) file name 2019-06-26 14:30:29 +08:00
thinkinggis 1db0b47172 fix(package): update version 2019-06-25 16:03:48 +08:00
thinkinggis dce3adf9ed Merge branch 'mvt' into 'master'
Mvt

合并矢量瓦片

See merge request !34
2019-06-24 18:08:42 +08:00
thinkinggis e46980bc63 merge master 2019-06-24 18:07:08 +08:00
thinkinggis 907fd43017 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 f382bdbc0d fix(polygon-layer): 修复 demo 2019-06-21 17:30:24 +08:00
yuqi.pyq a21ad99d27 Merge branch 'master' into dev-lighting 2019-06-21 16:58:49 +08:00
yuqi.pyq 32cdcf83f3 feat(polygon-layer): 支持多个平行光源配置 2019-06-21 16:50:51 +08:00
thinkinggis 38fe731e52 fix(tile):data 2019-06-20 17:54:07 +08:00
thinkinggis 5dd2dcc2af Merge branch 'mvt' of gitlab.alipay-inc.com:datavis/L7_beta into mvt 2019-06-18 20:10:30 +08:00
thinkinggis b1f5c3272a refactor source 2019-06-18 20:10:10 +08:00
thinkinggis f0ee6ee175 merge master 2019-06-18 20:04:55 +08:00
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
yuqi.pyq ea548edaa6 feat(point-layer): use 2d sdf functions 2019-06-18 18:23:51 +08:00
yuqi.pyq badca0446d fix(line-layer): 修复相邻线段重叠情况下的接头处理 2019-06-17 16:55:18 +08:00
thinkinggis 4ce9d60256 feat(source): reuse tileSource 2019-06-14 10:08:42 +08:00
yuqi.pyq f8269ee35b feat: lighting 2019-06-13 19:47:49 +08:00
thinkinggis 6a4af99c29 fix(mvt): source 2019-06-10 11:54:11 +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
yuqi.pyq 865875d478 fix(point-layer): adjust shift bits in vertex compression 2019-05-30 16:26:34 +08:00
yuqi.pyq ef2a9dd957 feat(point-layer): vertex compression 2019-05-29 20:37:23 +08:00
thinkinggis f215a339f6 Merge branch 'master' into mvt 2019-05-29 15:35:48 +08:00
thinkinggis d562f86251 feat(layer): add controller 2019-05-29 15:35:24 +08:00
yuqi.pyq e8704a1e7e feat(point-layer): optimize 2d circle 2019-05-29 14:22:07 +08:00
yuqi.pyq dd8fcfab7a fix: bevel joint in dashline 2019-05-28 19:37:47 +08:00
thinkinggis 27f6f4dfbc Merge branch 'mvt' into 'master'
Mvt

Vector 瓦片

See merge request !30
2019-05-28 17:39:57 +08:00