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

176 Commits

Author SHA1 Message Date
thinkinggis 6c0659b926 Merge branch 'master' into heatmap-fix 2019-03-25 21:03:26 +08:00
thinkinggis 5cfd50661c fix(text): layer 2019-03-25 21:02:56 +08:00
thinkinggis 276f9c7ec3 fix(package): update version 2019-03-25 20:40:57 +08:00
thinkinggis c4acf7e5e1 Merge branch 'composer' into 'master' 
fix(code): shaderpass



See merge request !21
 2019-03-25 20:23:24 +08:00
thinkinggis b8517610af fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis 2235e86a6b fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis f7cc3ecaa0 Merge branch 'composer' into 'master' 
Composer

热力图渲染方式 effectComposer方式渲染，性能提高

See merge request !20
 2019-03-25 20:13:20 +08:00
thinkinggis 21e0d1d056 fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 5438c7cd8d refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 0224267066 fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis 876206c3cd fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 6d0f00b1f7 Merge branch 'shaderPass' into 'master' 
add shaderPass & renderPass



See merge request !19
 2019-03-25 14:54:12 +08:00
mipha.ly 6f6c94a4db add shaderPass & renderPass 2019-03-25 14:45:42 +08:00
thinkinggis 6a40f55104 refactor(layer): text layer 2019-03-25 00:57:09 +08:00
thinkinggis b5119e659f reactor(layer): scaleContorller 2019-03-23 18:30:28 +08:00
thinkinggis 14fbc7d604 fix(layer) getlegendcfg 2019-03-22 17:09:20 +08:00
thinkinggis f6b25226cf Merge branch 'heatmap-fix' into 'master' 
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
 2019-03-22 16:18:57 +08:00
thinkinggis af831960a4 Merge branch 'heatmap-fix' into 'master' 
feat(layer): add lengendcdg method

高亮颜色不受全局透明度影响
增加获取图例配置项参数

See merge request !18
 2019-03-22 16:18:55 +08:00
thinkinggis 4fec5823e2 feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis b23a1ffb4c fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis 1f6d74aa2e Merge branch 'heatmap-fix' into 'master' 
fix(Amap): fix map

添加高德地图参数

See merge request !17
 2019-03-20 17:25:24 +08:00
thinkinggis 0734fba363 fix(Amap): fix map 2019-03-20 17:23:28 +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 daa942d92e fix(Amap): setstyle 2019-03-19 15:18:28 +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 c5bedcfac2 Merge branch 'heatmap-fix' into 'master' 
Heatmap fix



See merge request !15
 2019-03-18 11:59:11 +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 3c2906610a fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 7307904624 Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis 638154c4db fix(l7): update package 2019-03-16 20:49:30 +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 bef787d68c fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
thinkinggis fe78152d34 fix(util): geo convert 2019-03-14 15:58:54 +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 99931c431b fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis 92fd29d644 fix(layer): conflict 2019-03-14 15:14:34 +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 ca54d7ab2a fix(util): extent 2019-03-14 15:04:47 +08:00
mipha.ly c93a489d87 fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly 86a6d32783 fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
thinkinggis 66b3c8f038 Merge branch 'pick' into 'master' 
Pick

统一shader拾取方法


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

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

See merge request !10
 2019-03-06 16:46:25 +08:00
thinkinggis 51c35700a3 fix(layer) active feature bug 2019-03-06 16:39:18 +08:00
thinkinggis d943d54a41 delete unuse util file 2019-03-06 14:11:33 +08:00
thinkinggis 311b19785c feat(layer) add fitbounds 2019-03-05 21:06:12 +08:00
thinkinggis dd1ad9b3e2 merge heatmap 2019-03-01 15:03:47 +08:00