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

1192 Commits

Author SHA1 Message Date
thinkinggis 7e8b8b379c Merge branch 'heatmap-fix' into 'master' 
fix(Amap): setstyle

update set map style

See merge request !16
 2019-03-19 15:26:24 +08:00
thinkinggis 58aa492a1a Merge branch 'heatmap-fix' into 'master' 
fix(Amap): setstyle

update set map style

See merge request !16
 2019-03-19 15:26:24 +08:00
thinkinggis 25acf0d897 fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis daa942d92e fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis ee06edd89c Merge branch 'heatmap-fix' into 'master' 
Heatmap fix



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



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



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



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



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



See merge request !15
 2019-03-18 11:59:09 +08:00
thinkinggis bdbcd8fecd fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 3c2906610a fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 4277e8db09 Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis 7307904624 Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis 3cf8e41305 fix(l7): update package 2019-03-16 20:49:30 +08:00
thinkinggis 638154c4db fix(l7): update package 2019-03-16 20:49:30 +08:00
thinkinggis 4c2804bfb3 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
thinkinggis f398d70080 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 9b72cdc527 fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
mipha.ly bef787d68c fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
thinkinggis 5bff968ab1 fix(util): geo convert 2019-03-14 15:58:54 +08:00
thinkinggis fe78152d34 fix(util): geo convert 2019-03-14 15:58:54 +08:00
thinkinggis 3e34b8d214 Merge branch 'pick' into 'master' 
fix(util): extent

修复extent计算问题

See merge request !13
 2019-03-14 15:16:35 +08:00
thinkinggis 400e433852 Merge branch 'pick' into 'master' 
fix(util): extent

修复extent计算问题

See merge request !13
 2019-03-14 15:16:35 +08:00
thinkinggis eca60bb4f4 fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis 99931c431b fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis f8737ba6d1 fix(layer): conflict 2019-03-14 15:14:34 +08:00
thinkinggis 92fd29d644 fix(layer): conflict 2019-03-14 15:14:34 +08:00
thinkinggis f180bba13a Merge branch 'fix-heatmap' into 'master' 
fix(heat-map): 修复bbox计算逻辑



See merge request !12
 2019-03-14 15:07:45 +08:00
thinkinggis ab3ee09fd3 Merge branch 'fix-heatmap' into 'master' 
fix(heat-map): 修复bbox计算逻辑



See merge request !12
 2019-03-14 15:07:45 +08:00
thinkinggis be13993b60 fix(util): extent 2019-03-14 15:04:47 +08:00
thinkinggis ca54d7ab2a fix(util): extent 2019-03-14 15:04:47 +08:00
mipha.ly 8d5388a2b4 fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly c93a489d87 fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly ea0e544ff9 fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
mipha.ly 86a6d32783 fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
thinkinggis f0a864d847 Merge branch 'pick' into 'master' 
Pick

统一shader拾取方法


See merge request !11
 2019-03-13 11:57:21 +08:00
thinkinggis 66b3c8f038 Merge branch 'pick' into 'master' 
Pick

统一shader拾取方法


See merge request !11
 2019-03-13 11:57:21 +08:00
thinkinggis 234ef1b52f update version 2019-03-13 10:30:17 +08:00
thinkinggis 70215725f5 update version 2019-03-13 10:30:17 +08:00
thinkinggis 2ded43c877 feat(package): update version 2019-03-13 10:26:14 +08:00
thinkinggis 0c571e5aac feat(package): update version 2019-03-13 10:26:14 +08:00
thinkinggis e4415b51df feat(pick): update pick method 2019-03-12 15:58:44 +08:00
thinkinggis 05b70383bf feat(pick): update pick method 2019-03-12 15:58:44 +08:00
thinkinggis d1f827db69 fix pick 2019-03-07 16:06:52 +08:00
thinkinggis 4c4158f3e8 fix pick 2019-03-07 16:06:52 +08:00
thinkinggis 93e8895e29 Merge branch 'pick' into 'master' 
Pick

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

See merge request !10
 2019-03-06 16:46:25 +08:00
thinkinggis 8436799063 Merge branch 'pick' into 'master' 
Pick

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

See merge request !10
 2019-03-06 16:46:25 +08:00
thinkinggis 530425bdec fix(layer) active feature bug 2019-03-06 16:39:18 +08:00
thinkinggis 51c35700a3 fix(layer) active feature bug 2019-03-06 16:39:18 +08:00