p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
260 Commits 22 Branches 197 Tags 697 MiB
Commit Graph

260 Commits

Author SHA1 Message Date
thinkinggis 77e4a4291c Merge branch 'heatmap-fix' into 'master' 
Heatmap fix



See merge request !15
 2019-03-18 11:59:11 +08:00
thinkinggis 4649e38a14 Merge branch 'heatmap-fix' into 'master' 
Heatmap fix



See merge request !15
 2019-03-18 11:59:09 +08:00
thinkinggis 724d73bd84 fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 9a008a0caf Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis ee54e529b2 fix(l7): update package 2019-03-16 20:49:30 +08:00
thinkinggis c4fed7bd23 Merge branch 'fix-renderPass' into 'master' 
fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题

threeJs版本更新后，对于renderTarget的使用应为：
```
renderer.setRenderTarget( target );
renderer.render( scene, camera );
//渲染到屏幕
renderer.setRenderTarget (null); 
```
但是不知为何，这样挂载renderTarget的效果是错误的，具体原因还没看。
heatmap和其他layer无法混用的问题，目前采用这种方式解决：
```
renderer.render(scene,camera,target,true);
renderer.setRenderTarget(null);
```

See merge request !14
 2019-03-16 20:47:53 +08:00
mipha.ly a2e00e382b fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
thinkinggis 7c555c2cf1 fix(util): geo convert 2019-03-14 15:58:54 +08:00
thinkinggis 7bbf1b7ad7 Merge branch 'pick' into 'master' 
fix(util): extent

修复extent计算问题

See merge request !13
 2019-03-14 15:16:35 +08:00
thinkinggis 1f5474180f fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis 550b4f1eed fix(layer): conflict 2019-03-14 15:14:34 +08:00
thinkinggis 9f48dfc57f Merge branch 'fix-heatmap' into 'master' 
fix(heat-map): 修复bbox计算逻辑



See merge request !12
 2019-03-14 15:07:45 +08:00
thinkinggis e20c4cabcf fix(util): extent 2019-03-14 15:04:47 +08:00
mipha.ly 13583eab7a fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly 62932e093f fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
thinkinggis 3e3e73a9c4 Merge branch 'pick' into 'master' 
Pick

统一shader拾取方法


See merge request !11
 2019-03-13 11:57:21 +08:00
thinkinggis 1926d500a9 update version 2019-03-13 10:30:17 +08:00
thinkinggis 25f9af30bb feat(package): update version 2019-03-13 10:26:14 +08:00
thinkinggis 2b21158568 feat(pick): update pick method 2019-03-12 15:58:44 +08:00
thinkinggis 609467013e fix pick 2019-03-07 16:06:52 +08:00
thinkinggis 1bb6375a7c Merge branch 'pick' into 'master' 
Pick

修复了geojson 面状图形高亮颜色错乱的问题

See merge request !10
 2019-03-06 16:46:25 +08:00
thinkinggis 5d9c009a7b fix(layer) active feature bug 2019-03-06 16:39:18 +08:00
thinkinggis 8371c19425 delete unuse util file 2019-03-06 14:11:33 +08:00
thinkinggis 50b29c339e feat(layer) add fitbounds 2019-03-05 21:06:12 +08:00
thinkinggis a4cb419821 merge heatmap 2019-03-01 15:03:47 +08:00
thinkinggis ac550ad684 fix package 2019-03-01 15:00:48 +08:00
thinkinggis df3757a022 rollup 2019-03-01 14:54:05 +08:00
thinkinggis be7a4208af fix layer zoom 2019-03-01 13:09:41 +08:00
thinkinggis 0cf1d01cfd remove track 2019-03-01 12:03:04 +08:00
thinkinggis 4483968e91 fix bug 2019-03-01 11:38:38 +08:00
thinkinggis 460f2d9645 Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
thinkinggis fd8670881a feat(l7) add roullup 2019-03-01 11:23:01 +08:00
mipha.ly 1d4e27d674 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
象数 2f3990212b Merge branch 'rollup' into 'master' 
fix(src): require 引入方式切换成import



See merge request !9
 2019-03-01 10:55:55 +08:00
thinkinggis 73a57e3f60 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 988afc18af fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
象数 807a8c69ff Merge branch 'grid-heatMap' into 'master' 
update three

升级threejs到101版本
测试框架可以运行

See merge request !7
 2019-03-01 10:23:39 +08:00
mipha.ly 507a3537f5 fix(heatmap): 解决颜色插值问题，优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly@alibaba-inc.com 109f3f12d0 feat(l7): feat heatmap layer 2019-02-27 17:16:16 +08:00
mipha.ly@alibaba-inc.com cc5b1ee83b resolve conflicts 2019-02-27 17:00:27 +08:00
thinkinggis 5362965dee update three 2019-02-27 16:44:33 +08:00
象数 46646d06de Merge branch 'grid-heatMap' into 'master' 
feat(hexagon): hexagon heatmap



See merge request !6
 2019-02-27 15:44:23 +08:00
thinkinggis 00d58a03c5 feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00
mipha.ly@alibaba-inc.com 6ed876befe feat heatmap layer 2019-02-27 14:50:10 +08:00
thinkinggis 374554037c fix(transform): stattistics 2019-02-26 19:32:09 +08:00
象数 e611930470 Merge branch 'grid-heatMap' into 'master' 
Grid heat map

增加mapbox
增加多边形热力图

See merge request !5
 2019-02-26 17:28:35 +08:00
thinkinggis 7eb94a1c3c fix(map): mapbox 2019-02-26 17:22:55 +08:00
thinkinggis 41a3687cfd fix(shader): confict 2019-02-26 16:58:56 +08:00
thinkinggis 5d2b6902f6 fix(pick): event 2019-02-26 16:40:15 +08:00
thinkinggis d54a7df8e1 merge 2019-02-26 16:30:59 +08:00