Commit Graph

4923 Commits

Author SHA1 Message Date
thinkinggis 460f2d9645 Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
thinkinggis bbe059e885 Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
thinkinggis 8c0096910a Merge branch 'master' into feat-heatmap 2019-03-01 11:23:50 +08:00
thinkinggis a8326dcc0e feat(l7) add roullup 2019-03-01 11:23:01 +08:00
thinkinggis fd8670881a feat(l7) add roullup 2019-03-01 11:23:01 +08:00
thinkinggis 528d62d329 feat(l7) add roullup 2019-03-01 11:23:01 +08:00
thinkinggis 0dd44ebccf feat(l7) add roullup 2019-03-01 11:23:01 +08:00
mipha.ly 664bdb08bb 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
mipha.ly 1d4e27d674 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
mipha.ly f02165b85e 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
mipha.ly 06f6303f7e 移除three不必要的模块basic material 2019-03-01 11:15:33 +08:00
象数 8b1a15851c Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +08:00
象数 2f3990212b Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +08:00
象数 92f266f7ed Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +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 ea4d2bb447 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 73a57e3f60 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 52dfa89ceb merge master 2019-03-01 10:51:52 +08:00
thinkinggis a5db5e5e07 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 28bb7776db fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
thinkinggis 988afc18af fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
thinkinggis b140934f3e fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
thinkinggis f652dcae7a fix(src): require 引入方式切换成import 2019-03-01 10:43:36 +08:00
象数 6a1a36fcad Merge branch 'grid-heatMap' into 'master'
update three

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

See merge request !7
2019-03-01 10:23:39 +08:00
象数 807a8c69ff Merge branch 'grid-heatMap' into 'master'
update three

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

See merge request !7
2019-03-01 10:23:39 +08:00
象数 58814ce856 Merge branch 'grid-heatMap' into 'master'
update three

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

See merge request !7
2019-03-01 10:23:39 +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 d6829f30b9 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly 507a3537f5 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly 2aa2c61d14 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly 45db805a68 fix(heatmap): 解决颜色插值问题,优化渲染性能 2019-02-28 11:55:04 +08:00
mipha.ly@alibaba-inc.com 852c21b312 feat(l7): feat heatmap layer 2019-02-27 17:16:16 +08:00
mipha.ly@alibaba-inc.com 109f3f12d0 feat(l7): feat heatmap layer 2019-02-27 17:16:16 +08:00
mipha.ly@alibaba-inc.com ad8a5a3c5e feat(l7): feat heatmap layer 2019-02-27 17:16:16 +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 e5e4688d0d resolve conflicts 2019-02-27 17:00:27 +08:00
mipha.ly@alibaba-inc.com cc5b1ee83b resolve conflicts 2019-02-27 17:00:27 +08:00
mipha.ly@alibaba-inc.com e0addf89b6 resolve conflicts 2019-02-27 17:00:27 +08:00
mipha.ly@alibaba-inc.com 59342df852 resolve conflicts 2019-02-27 17:00:27 +08:00
thinkinggis a5193075be update three 2019-02-27 16:44:33 +08:00
thinkinggis 5362965dee update three 2019-02-27 16:44:33 +08:00
thinkinggis e29cacc1fd update three 2019-02-27 16:44:33 +08:00
thinkinggis da24002fa5 update three 2019-02-27 16:44:33 +08:00
象数 d58364d6d3 Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



See merge request !6
2019-02-27 15:44:23 +08:00
象数 46646d06de Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



See merge request !6
2019-02-27 15:44:23 +08:00
象数 d42d04caf3 Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



See merge request !6
2019-02-27 15:44:23 +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 46edff6626 feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00
thinkinggis 00d58a03c5 feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00
thinkinggis d14c53042f feat(hexagon): hexagon heatmap 2019-02-27 15:33:38 +08:00