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

553 Commits

Author SHA1 Message Date
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 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 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 c8ac525c02 feat(layer): add lengendcdg method 2019-03-22 16:10:35 +08:00
thinkinggis 14ce71d7bb 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 4739377935 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 8b5387708b 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 64906f7e9d 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 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 6588614d7f fix(Amap): setstyle 2019-03-19 15:18:28 +08:00
thinkinggis 907ea56ece 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 668b3c0fd1 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 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