Commit Graph

686 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 f243c7ed67 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 d5f767d270 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 5e2ebd3dad 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 252bf11f7a 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 f669629769 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
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 a2e00e382b fix(renderTarget): 修复了threeJS更新版本后引发的renderPass渲染问题 2019-03-16 20:03:26 +08:00
mipha.ly 81e0f15873 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 113aae900b 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 e9cb6a8eb5 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 bcc7388df2 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 7667cdd670 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 0ed237e831 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
thinkinggis 0ee3ce958d 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 7d7cbda53c 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
mipha.ly b0df153670 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 ae0d5cf9cc 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 25661c4505 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 eda3042b3f 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 a1c534da69 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 49232797bc 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 d5eeed93b1 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 0de7df5d7c 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 b846c601dd 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 aecd41703d 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 5913a3f5e4 merge heatmap 2019-03-01 15:03:47 +08:00