Commit Graph

135 Commits

Author SHA1 Message Date
thinkinggis 4b0da460d4 Merge branch 'feat-layer-repaint' into 'master'
Feat layer repaint

增加图层更新机制

See merge request !24
2019-04-10 16:22:38 +08:00
thinkinggis 14b261c2bc fix(gloal): snap 2019-04-09 21:46:10 +08:00
thinkinggis a290efb787 feat(interaction): add hash 2019-04-04 10:07:49 +08:00
thinkinggis 181d7bc42f feat(layer): add tile 2019-04-02 11:59:43 +08:00
thinkinggis ee284d81cc refactor(linelayer): remove normal line 2019-04-02 11:47:38 +08:00
thinkinggis 3d2bde558e feat(layer): add repaint method 2019-03-29 10:21:10 +08:00
thinkinggis f7fb51360d Merge branch 'heatmap-fix' into 'master'
Heatmap fix

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

See merge request !22
2019-03-26 16:45:56 +08:00
thinkinggis 33e0e56ef4 refactor(text):升级文本渲染方法 2019-03-26 16:42:30 +08:00
thinkinggis 691f2237d0 feat(scene): 按需进行渲染刷新 2019-03-26 14:54:17 +08:00
thinkinggis 8158a1d7e1 Merge branch 'master' into heatmap-fix 2019-03-25 21:03:26 +08:00
thinkinggis 725c0cf232 fix(text): layer 2019-03-25 21:02:56 +08:00
thinkinggis 335021de1b fix(package): update version 2019-03-25 20:40:57 +08:00
thinkinggis 4b560b9c13 Merge branch 'composer' into 'master'
fix(code): shaderpass



See merge request !21
2019-03-25 20:23:24 +08:00
thinkinggis cd652880bf fix(core): file name 2019-03-25 20:22:22 +08:00
thinkinggis 65df7ce180 fix(code): shaderpass 2019-03-25 20:18:35 +08:00
thinkinggis 46eb7fd88e Merge branch 'composer' into 'master'
Composer

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

See merge request !20
2019-03-25 20:13:20 +08:00
thinkinggis 115d4e9e2a fix(src): merge master 2019-03-25 20:10:49 +08:00
thinkinggis d08c47b3d9 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 07672fe219 fix(core): shaderpass 2019-03-25 15:50:31 +08:00
thinkinggis 1ca12ff2f9 fix(core): delete composer.js 2019-03-25 15:09:12 +08:00
thinkinggis 1bdb04fa3f Merge branch 'shaderPass' into 'master'
add shaderPass & renderPass



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

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

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

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

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

添加高德地图参数

See merge request !17
2019-03-20 17:25:24 +08:00
thinkinggis 64906f7e9d fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis 8683cd65e4 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 907ea56ece fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis 668b3c0fd1 Merge branch 'heatmap-fix' into 'master'
Heatmap fix



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



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



See merge request !15
2019-03-18 11:59:09 +08:00
thinkinggis 5e2ebd3dad fix(heatmap): performance 2019-03-18 11:57:28 +08:00
thinkinggis 252bf11f7a Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta 2019-03-16 20:49:53 +08:00
thinkinggis f669629769 fix(l7): update package 2019-03-16 20:49:30 +08:00
thinkinggis dfa808404b 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 81e0f15873 fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
thinkinggis 113aae900b fix(util): geo convert 2019-03-14 15:58:54 +08:00
thinkinggis e9cb6a8eb5 Merge branch 'pick' into 'master'
fix(util): extent

修复extent计算问题

See merge request !13
2019-03-14 15:16:35 +08:00
thinkinggis bcc7388df2 fix(layer): conflict 2019-03-14 15:16:05 +08:00
thinkinggis 7667cdd670 fix(layer): conflict 2019-03-14 15:14:34 +08:00
thinkinggis 0ed237e831 Merge branch 'fix-heatmap' into 'master'
fix(heat-map): 修复bbox计算逻辑



See merge request !12
2019-03-14 15:07:45 +08:00
thinkinggis 0ee3ce958d fix(util): extent 2019-03-14 15:04:47 +08:00
mipha.ly 7d7cbda53c fix(heat-map): 修复bbox计算逻辑 2019-03-14 15:00:07 +08:00
mipha.ly b0df153670 fix(heat-map): 渲染逻辑 & bbox 2019-03-14 14:35:59 +08:00
thinkinggis ae0d5cf9cc Merge branch 'pick' into 'master'
Pick

统一shader拾取方法


See merge request !11
2019-03-13 11:57:21 +08:00