Commit Graph

103 Commits

Author SHA1 Message Date
thinkinggis d08c47b3d9 refactor(heatmap): composer heatmap 2019-03-25 19:59:59 +08:00
thinkinggis 4739377935 fix(source) 2019-03-22 10:42:54 +08:00
thinkinggis 64906f7e9d fix(Amap): fix map 2019-03-20 17:23:28 +08:00
thinkinggis 907ea56ece fix(Amap): setstyle 2019-03-19 15:18:28 +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
thinkinggis 25661c4505 update version 2019-03-13 10:30:17 +08:00
thinkinggis eda3042b3f feat(package): update version 2019-03-13 10:26:14 +08:00
thinkinggis a1c534da69 feat(pick): update pick method 2019-03-12 15:58:44 +08:00
thinkinggis 49232797bc fix pick 2019-03-07 16:06:52 +08:00
thinkinggis d5eeed93b1 Merge branch 'pick' into 'master'
Pick

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

See merge request !10
2019-03-06 16:46:25 +08:00
thinkinggis 0de7df5d7c fix(layer) active feature bug 2019-03-06 16:39:18 +08:00
thinkinggis b846c601dd delete unuse util file 2019-03-06 14:11:33 +08:00
thinkinggis aecd41703d feat(layer) add fitbounds 2019-03-05 21:06:12 +08:00
thinkinggis 5913a3f5e4 merge heatmap 2019-03-01 15:03:47 +08:00
thinkinggis c2bba65c84 fix package 2019-03-01 15:00:48 +08:00
thinkinggis 16b5fd3a11 fix layer zoom 2019-03-01 13:09:41 +08:00
thinkinggis 6b7b821422 remove track 2019-03-01 12:03:04 +08:00
thinkinggis 918570d2f5 fix bug 2019-03-01 11:38:38 +08:00
thinkinggis 8c0096910a Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
mipha.ly 06f6303f7e 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
象数 2acc28211d Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +08:00
thinkinggis a5db5e5e07 merge master 2019-03-01 10:51:52 +08:00
thinkinggis f652dcae7a fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
象数 f71a1225a2 Merge branch 'grid-heatMap' into 'master'
update three

升级threejs到101版本
测试框架可以运行

See merge request !7
2019-03-01 10:23:39 +08:00
mipha.ly 45db805a68 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly@alibaba-inc.com eec6a121ac feat(l7): feat heatmap layer 2019-02-27 17:16:16 +08:00
mipha.ly@alibaba-inc.com 59342df852 resolve conflicts 2019-02-27 17:00:27 +08:00
thinkinggis da24002fa5 update three 2019-02-27 16:44:33 +08:00
象数 ff2a31b7aa Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



See merge request !6
2019-02-27 15:44:23 +08:00
thinkinggis f6847e15d6 feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00
mipha.ly@alibaba-inc.com bccb0b3291 feat heatmap layer 2019-02-27 14:50:10 +08:00
thinkinggis 49d8f603cd fix(transform): stattistics 2019-02-26 19:32:09 +08:00
象数 bd1200813a Merge branch 'grid-heatMap' into 'master'
Grid heat map

增加mapbox
增加多边形热力图

See merge request !5
2019-02-26 17:28:35 +08:00
thinkinggis 8d07facc7f fix(map): mapbox 2019-02-26 17:22:55 +08:00
thinkinggis 0ddaeb9e0d fix(shader): confict 2019-02-26 16:58:56 +08:00
thinkinggis 952e03aeb1 fix(pick): event 2019-02-26 16:40:15 +08:00
thinkinggis bff21a2718 merge 2019-02-26 16:30:59 +08:00