@antv/l7-layers 2.17.11 → 2.17.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/es/line/models/flow.js
CHANGED
|
@@ -15,7 +15,7 @@ import { FlowLineFillTriangulation } from "../../core/triangulation";
|
|
|
15
15
|
/* babel-plugin-inline-import '../shaders/flow/flow_line_frag.glsl' */
|
|
16
16
|
var flow_line_frag = "#extension GL_OES_standard_derivatives : enable\n\nvarying vec4 v_color;\n\n\n// line texture\n\n#pragma include \"picking\"\n\nvoid main() {\ngl_FragColor = v_color;\ngl_FragColor = filterColor(gl_FragColor);\n}\n"; // linear simple line shader
|
|
17
17
|
/* babel-plugin-inline-import '../shaders/flow/flow_line_vert.glsl' */
|
|
18
|
-
var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\n\nvoid main() {\n\n//
|
|
18
|
+
var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\n\nvoid main() {\n\n// \u900F\u660E\u5EA6\u8BA1\u7B97\n vec2 source = a_Instance.rg; // \u8D77\u59CB\u70B9\n vec2 target = a_Instance.ba; // \u7EC8\u70B9\n vec2 flowlineDir = normalize(target - source);\n vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);\n\n\n vec2 position = mix(source, target, a_Position.x);\n \n float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1))); // \n vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);\n vec2 limitedOffsetDistances = clamp( \n offsetDistances,\n project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)\n );\n\n\n float startOffsetCommon = project_pixel(offsets[0]);\n float endOffsetCommon = project_pixel(offsets[1]);\n float endpointOffset = mix(\n clamp(startOffsetCommon, 0.0, lengthCommon*.2),\n -clamp(endOffsetCommon, 0.0, lengthCommon*.2),\n a_Position.x\n );\n\n vec2 normalsCommon = u_stroke_width * project_pixel(a_Normal.xy);\n\n float gapCommon = project_pixel(u_gap_width);\n vec3 offsetCommon = vec3(\n flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -\n perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),\n 0.0\n );\n\n\n vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));\n\n vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);\n v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);\n\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n gl_Position = u_Mvp * vec4(project_pos.xy + offsetCommon.xy, 0., 1.0);\n } else {\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offsetCommon.xy, 0., 1.0));\n }\n\n\n\n setPickingColor(a_PickingColor);\n}\n";
|
|
19
19
|
var FlowLineModel = /*#__PURE__*/function (_BaseModel) {
|
|
20
20
|
_inherits(FlowLineModel, _BaseModel);
|
|
21
21
|
var _super = _createSuper(FlowLineModel);
|
|
@@ -17,20 +17,6 @@ uniform float u_stroke_opacity: 1.0;
|
|
|
17
17
|
|
|
18
18
|
void main() {
|
|
19
19
|
|
|
20
|
-
// #ifdef USE_ATTRIBUTE_OPACITY
|
|
21
|
-
// float opacity = a_Opacity;
|
|
22
|
-
// #else
|
|
23
|
-
// float opacity = u_opacity;
|
|
24
|
-
// #endif
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
// #ifdef USE_ATTRIBUTE_OFFSETS
|
|
28
|
-
// vec2 offsets = a_Offsets;
|
|
29
|
-
// #else
|
|
30
|
-
// vec2 offsets = u_offsets;
|
|
31
|
-
// #endif
|
|
32
|
-
|
|
33
|
-
// float opacity = u_opacity;
|
|
34
20
|
// 透明度计算
|
|
35
21
|
vec2 source = a_Instance.rg; // 起始点
|
|
36
22
|
vec2 target = a_Instance.ba; // 终点
|
|
@@ -39,14 +25,15 @@ void main() {
|
|
|
39
25
|
|
|
40
26
|
|
|
41
27
|
vec2 position = mix(source, target, a_Position.x);
|
|
42
|
-
|
|
43
|
-
float lengthCommon = length(target - source);
|
|
28
|
+
|
|
29
|
+
float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1))); //
|
|
44
30
|
vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);
|
|
45
31
|
vec2 limitedOffsetDistances = clamp(
|
|
46
32
|
offsetDistances,
|
|
47
|
-
|
|
33
|
+
project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)
|
|
48
34
|
);
|
|
49
35
|
|
|
36
|
+
|
|
50
37
|
float startOffsetCommon = project_pixel(offsets[0]);
|
|
51
38
|
float endOffsetCommon = project_pixel(offsets[1]);
|
|
52
39
|
float endpointOffset = mix(
|
package/lib/line/models/flow.js
CHANGED
|
@@ -22,7 +22,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
|
|
|
22
22
|
/* babel-plugin-inline-import '../shaders/flow/flow_line_frag.glsl' */
|
|
23
23
|
var flow_line_frag = "#extension GL_OES_standard_derivatives : enable\n\nvarying vec4 v_color;\n\n\n// line texture\n\n#pragma include \"picking\"\n\nvoid main() {\ngl_FragColor = v_color;\ngl_FragColor = filterColor(gl_FragColor);\n}\n"; // linear simple line shader
|
|
24
24
|
/* babel-plugin-inline-import '../shaders/flow/flow_line_vert.glsl' */
|
|
25
|
-
var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\n\nvoid main() {\n\n//
|
|
25
|
+
var flow_line_vert = "attribute vec4 a_Color;\nattribute vec2 a_Size;\nattribute vec4 a_Instance;\nattribute vec3 a_Normal;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvarying vec4 v_color;\nuniform float u_gap_width: 1.0;\nuniform float u_stroke_width: 1.0;\nuniform float u_stroke_opacity: 1.0;\n\n\nvoid main() {\n\n// \u900F\u660E\u5EA6\u8BA1\u7B97\n vec2 source = a_Instance.rg; // \u8D77\u59CB\u70B9\n vec2 target = a_Instance.ba; // \u7EC8\u70B9\n vec2 flowlineDir = normalize(target - source);\n vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);\n\n\n vec2 position = mix(source, target, a_Position.x);\n \n float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1))); // \n vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);\n vec2 limitedOffsetDistances = clamp( \n offsetDistances,\n project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)\n );\n\n\n float startOffsetCommon = project_pixel(offsets[0]);\n float endOffsetCommon = project_pixel(offsets[1]);\n float endpointOffset = mix(\n clamp(startOffsetCommon, 0.0, lengthCommon*.2),\n -clamp(endOffsetCommon, 0.0, lengthCommon*.2),\n a_Position.x\n );\n\n vec2 normalsCommon = u_stroke_width * project_pixel(a_Normal.xy);\n\n float gapCommon = project_pixel(u_gap_width);\n vec3 offsetCommon = vec3(\n flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -\n perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),\n 0.0\n );\n\n\n vec4 project_pos = project_position(vec4(position.xy, 0, 1.0));\n\n vec4 fillColor = vec4(a_Color.rgb, a_Color.a * opacity);\n v_color = mix(fillColor, vec4(u_stroke.xyz, u_stroke.w * fillColor.w * u_stroke_opacity), a_Normal.z);\n\n\n if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n gl_Position = u_Mvp * vec4(project_pos.xy + offsetCommon.xy, 0., 1.0);\n } else {\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offsetCommon.xy, 0., 1.0));\n }\n\n\n\n setPickingColor(a_PickingColor);\n}\n";
|
|
26
26
|
var FlowLineModel = /*#__PURE__*/function (_BaseModel) {
|
|
27
27
|
(0, _inherits2.default)(FlowLineModel, _BaseModel);
|
|
28
28
|
var _super = _createSuper(FlowLineModel);
|
|
@@ -17,20 +17,6 @@ uniform float u_stroke_opacity: 1.0;
|
|
|
17
17
|
|
|
18
18
|
void main() {
|
|
19
19
|
|
|
20
|
-
// #ifdef USE_ATTRIBUTE_OPACITY
|
|
21
|
-
// float opacity = a_Opacity;
|
|
22
|
-
// #else
|
|
23
|
-
// float opacity = u_opacity;
|
|
24
|
-
// #endif
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
// #ifdef USE_ATTRIBUTE_OFFSETS
|
|
28
|
-
// vec2 offsets = a_Offsets;
|
|
29
|
-
// #else
|
|
30
|
-
// vec2 offsets = u_offsets;
|
|
31
|
-
// #endif
|
|
32
|
-
|
|
33
|
-
// float opacity = u_opacity;
|
|
34
20
|
// 透明度计算
|
|
35
21
|
vec2 source = a_Instance.rg; // 起始点
|
|
36
22
|
vec2 target = a_Instance.ba; // 终点
|
|
@@ -39,14 +25,15 @@ void main() {
|
|
|
39
25
|
|
|
40
26
|
|
|
41
27
|
vec2 position = mix(source, target, a_Position.x);
|
|
42
|
-
|
|
43
|
-
float lengthCommon = length(target - source);
|
|
28
|
+
|
|
29
|
+
float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1))); //
|
|
44
30
|
vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);
|
|
45
31
|
vec2 limitedOffsetDistances = clamp(
|
|
46
32
|
offsetDistances,
|
|
47
|
-
|
|
33
|
+
project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)
|
|
48
34
|
);
|
|
49
35
|
|
|
36
|
+
|
|
50
37
|
float startOffsetCommon = project_pixel(offsets[0]);
|
|
51
38
|
float endOffsetCommon = project_pixel(offsets[1]);
|
|
52
39
|
float endpointOffset = mix(
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antv/l7-layers",
|
|
3
|
-
"version": "2.17.
|
|
3
|
+
"version": "2.17.12",
|
|
4
4
|
"description": "L7's collection of built-in layers",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
"license": "ISC",
|
|
28
28
|
"dependencies": {
|
|
29
29
|
"@antv/async-hook": "^2.2.9",
|
|
30
|
-
"@antv/l7-core": "2.17.
|
|
31
|
-
"@antv/l7-maps": "2.17.
|
|
32
|
-
"@antv/l7-source": "2.17.
|
|
33
|
-
"@antv/l7-utils": "2.17.
|
|
30
|
+
"@antv/l7-core": "2.17.12",
|
|
31
|
+
"@antv/l7-maps": "2.17.12",
|
|
32
|
+
"@antv/l7-source": "2.17.12",
|
|
33
|
+
"@antv/l7-utils": "2.17.12",
|
|
34
34
|
"@babel/runtime": "^7.7.7",
|
|
35
35
|
"@mapbox/martini": "^0.2.0",
|
|
36
36
|
"@turf/clone": "^6.5.0",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"reflect-metadata": "^0.1.13"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@antv/l7-test-utils": "2.17.
|
|
56
|
+
"@antv/l7-test-utils": "2.17.12",
|
|
57
57
|
"@types/d3-array": "^2.0.0",
|
|
58
58
|
"@types/d3-color": "^1.2.2",
|
|
59
59
|
"@types/d3-interpolate": "1.1.6",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"@types/gl-matrix": "^2.4.5",
|
|
63
63
|
"@types/lodash": "^4.14.138"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "e1d345d25c580a3a44b79a112654d12953293fe6",
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
}
|