Commit Graph

234 Commits

Author SHA1 Message Date
thinkinggis 88c84ef772 refactor(linelayer): remove normal line 2019-04-02 11:47:38 +08:00
thinkinggis 580b4ef39d fix(package): update version 2019-04-02 10:26:54 +08:00
thinkinggis 48de69f7d9 feat(layer): add repaint method 2019-03-29 10:21:10 +08:00
thinkinggis 30b2fbe015 Merge branch 'heatmap-fix' into 'master'
Heatmap fix

render 根据地图变化在执行渲染
text 重构文本渲染方式

See merge request !22
2019-03-26 16:45:56 +08:00
thinkinggis 50089d2435 refactor(text):升级文本渲染方法 2019-03-26 16:42:30 +08:00
thinkinggis 6b2d9b76ca feat(scene): 按需进行渲染刷新 2019-03-26 14:54:17 +08:00
thinkinggis 582c4df952 Merge branch 'master' into heatmap-fix 2019-03-25 21:03:26 +08:00
thinkinggis f527be22cc fix(text): layer 2019-03-25 21:02:56 +08:00
thinkinggis 92cb458c98 fix(package): update version 2019-03-25 20:40:57 +08:00
thinkinggis 3aa4c14cfc Merge branch 'composer' into 'master'
fix(code): shaderpass



See merge request !21
2019-03-25 20:23:24 +08:00
thinkinggis d79d7a3df4 fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis 349e04a206 fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 81ac8874a7 Merge branch 'composer' into 'master'
Composer

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

See merge request !20
2019-03-25 20:13:20 +08:00
thinkinggis 9015a3f513 fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis 1374309d89 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 9d936e7a3c fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis b5583715e3 fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 0bea6a42e7 Merge branch 'shaderPass' into 'master'
add shaderPass & renderPass



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

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

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

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

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

添加高德地图参数

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



See merge request !15
2019-03-18 11:59:16 +08:00
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