Commit Graph

769 Commits

Author SHA1 Message Date
象数 2acc28211d Merge branch 'rollup' into 'master'
fix(src): require 引入方式切换成import



See merge request !9
2019-03-01 10:55:55 +08:00
thinkinggis 73a57e3f60 merge master 2019-03-01 10:51:52 +08:00
thinkinggis a5db5e5e07 merge master 2019-03-01 10:51:52 +08:00
thinkinggis 988afc18af 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
象数 807a8c69ff 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 507a3537f5 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 109f3f12d0 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 cc5b1ee83b 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 5362965dee update three 2019-02-27 16:44:33 +08:00
thinkinggis da24002fa5 update three 2019-02-27 16:44:33 +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
象数 ff2a31b7aa Merge branch 'grid-heatMap' into 'master'
feat(hexagon): hexagon heatmap



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

增加mapbox
增加多边形热力图

See merge request !5
2019-02-26 17:28:35 +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 7eb94a1c3c fix(map): mapbox 2019-02-26 17:22:55 +08:00
thinkinggis 8d07facc7f fix(map): mapbox 2019-02-26 17:22:55 +08:00
thinkinggis 41a3687cfd fix(shader): confict 2019-02-26 16:58:56 +08:00
thinkinggis 0ddaeb9e0d fix(shader): confict 2019-02-26 16:58:56 +08:00
thinkinggis 5d2b6902f6 fix(pick): event 2019-02-26 16:40:15 +08:00
thinkinggis 952e03aeb1 fix(pick): event 2019-02-26 16:40:15 +08:00
thinkinggis d54a7df8e1 merge 2019-02-26 16:30:59 +08:00
thinkinggis bff21a2718 merge 2019-02-26 16:30:59 +08:00
thinkinggis 3ab8aac11a feat(source): hexagon 2019-02-26 16:06:43 +08:00
thinkinggis 7d73d7f348 feat(source): hexagon 2019-02-26 16:06:43 +08:00
象数 5b262bba42 Merge branch 'dev-shadermodule' into 'master'
为 shader 增加模块化功能

为 shader 增加简单的模块化功能

详细使用方式:
https://yuque.antfin-inc.com/antv/l7/ui9wii

L7 内置模块的注册在 `src/geom/shader/index.js` 中进行。目前只注册了 common(定义一些常量)、point、polygon 三个模块。因此也只有 polygonMaterial 会使用模块生成的 shader 代码,目前没有任何影响。

See merge request !4
2019-02-26 16:05:37 +08:00
象数 6ba0818531 Merge branch 'dev-shadermodule' into 'master'
为 shader 增加模块化功能

为 shader 增加简单的模块化功能

详细使用方式:
https://yuque.antfin-inc.com/antv/l7/ui9wii

L7 内置模块的注册在 `src/geom/shader/index.js` 中进行。目前只注册了 common(定义一些常量)、point、polygon 三个模块。因此也只有 polygonMaterial 会使用模块生成的 shader 代码,目前没有任何影响。

See merge request !4
2019-02-26 16:05:37 +08:00
xiaoiver 8a454561ad feat(l7): add shader module 2019-02-26 15:09:49 +08:00
yuqi.pyq a6d4774804 feat(l7): add shader module 2019-02-26 15:09:49 +08:00
thinkinggis 9af7f61305 refactor(source): source 2019-02-25 23:56:37 +08:00
thinkinggis 37fb76ca9d refactor(source): source 2019-02-25 23:56:37 +08:00
thinkinggis 712e983b3e refactor(core): layer register 2019-02-22 12:03:01 +08:00
thinkinggis d36cece869 refactor(core): layer register 2019-02-22 12:03:01 +08:00
thinkinggis 92c900e8ee add mapbox demo 2019-02-19 13:58:48 +08:00
thinkinggis 59f29a92d5 add mapbox demo 2019-02-19 13:58:48 +08:00
thinkinggis 3496c03233 mapbox 2019-02-19 11:08:38 +08:00
thinkinggis 8963c7edfa mapbox 2019-02-19 11:08:38 +08:00
thinkinggis abe1258adf add setCenter 2019-02-18 20:26:52 +08:00
thinkinggis 94368efb20 add setCenter 2019-02-18 20:26:52 +08:00
thinkinggis f2d9214e07 fix(mapbox): scale 2019-02-15 11:35:04 +08:00