@antv/l7-layers
Advanced tools
Comparing version 2.0.35 to 2.0.36
@@ -22,3 +22,5 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck"; | ||
if (autoFit) { | ||
layer.fitBounds(); | ||
setTimeout(function () { | ||
layer.fitBounds(); | ||
}, 100); | ||
} | ||
@@ -25,0 +27,0 @@ }); |
@@ -9,3 +9,3 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck"; | ||
import { PointImageTriangulation } from '../../core/triangulation'; | ||
var pointImageFrag = "\nuniform sampler2D u_texture;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform vec2 u_textSize;\nuniform float u_stroke_width : 1;\nuniform vec4 u_stroke_color : [1, 1, 1, 1];\nuniform float u_stroke_opacity : 1;\nuniform float u_opacity : 1;\n\nvarying float v_size;\n#pragma include \"picking\"\nvoid main(){\nvec2 pos= v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;\nvec2 fragmentPosition = 2.0*gl_PointCoord - 1.0;\nfloat distance = length(fragmentPosition);\nfloat distanceSqrd = distance * distance;\nfloat radius = 1.;\nfloat r = 1.0 - smoothstep(radius-(radius*0.01),\n radius+(radius*0.01),\n distanceSqrd);\n vec4 textureColor=texture2D(u_texture,pos);\n if(v_color == vec4(0.)){\n gl_FragColor= vec4(textureColor.xyz, textureColor.w * r);\n }else {\n gl_FragColor= step(0.01, textureColor.x) * v_color;\n }\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; | ||
var pointImageFrag = "\nuniform sampler2D u_texture;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform vec2 u_textSize;\nuniform float u_stroke_width : 1;\nuniform vec4 u_stroke_color : [1, 1, 1, 1];\nuniform float u_stroke_opacity : 1;\nuniform float u_opacity : 1;\n\nvarying float v_size;\n#pragma include \"picking\"\nvoid main(){\nvec2 pos= v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;\nvec2 fragmentPosition = 2.0*gl_PointCoord - 1.0;\nfloat distance = length(fragmentPosition);\nfloat distanceSqrd = distance * distance;\nfloat radius = 1.;\nfloat r = 1.0 - smoothstep(radius-(radius*0.01),\n radius+(radius*0.01),\n distanceSqrd);\n vec4 textureColor=texture2D(u_texture,pos);\n if(v_color == vec4(0.)){\n gl_FragColor= vec4(textureColor.xyz, textureColor.w * r);\n }else {\n gl_FragColor= step(0.01, textureColor.z) * v_color;\n }\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; | ||
var pointImageVert = "precision highp float;\nattribute vec3 a_Position;\nattribute vec4 a_Color;\nattribute vec2 a_Uv;\nattribute float a_Size;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform mat4 u_ModelMatrix;\nuniform float u_stroke_width : 1;\nvarying float v_size;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n v_color = a_Color;\n v_uv = a_Uv;\n vec4 project_pos = project_position(vec4(a_Position, 1.0));\n v_size = a_Size;\n\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n\n setPickingColor(a_PickingColor);\n\n}\n"; | ||
@@ -12,0 +12,0 @@ |
@@ -33,3 +33,5 @@ "use strict"; | ||
if (autoFit) { | ||
layer.fitBounds(); | ||
setTimeout(function () { | ||
layer.fitBounds(); | ||
}, 100); | ||
} | ||
@@ -36,0 +38,0 @@ }); |
@@ -26,3 +26,3 @@ "use strict"; | ||
var pointImageFrag = "\nuniform sampler2D u_texture;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform vec2 u_textSize;\nuniform float u_stroke_width : 1;\nuniform vec4 u_stroke_color : [1, 1, 1, 1];\nuniform float u_stroke_opacity : 1;\nuniform float u_opacity : 1;\n\nvarying float v_size;\n#pragma include \"picking\"\nvoid main(){\nvec2 pos= v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;\nvec2 fragmentPosition = 2.0*gl_PointCoord - 1.0;\nfloat distance = length(fragmentPosition);\nfloat distanceSqrd = distance * distance;\nfloat radius = 1.;\nfloat r = 1.0 - smoothstep(radius-(radius*0.01),\n radius+(radius*0.01),\n distanceSqrd);\n vec4 textureColor=texture2D(u_texture,pos);\n if(v_color == vec4(0.)){\n gl_FragColor= vec4(textureColor.xyz, textureColor.w * r);\n }else {\n gl_FragColor= step(0.01, textureColor.x) * v_color;\n }\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; | ||
var pointImageFrag = "\nuniform sampler2D u_texture;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform vec2 u_textSize;\nuniform float u_stroke_width : 1;\nuniform vec4 u_stroke_color : [1, 1, 1, 1];\nuniform float u_stroke_opacity : 1;\nuniform float u_opacity : 1;\n\nvarying float v_size;\n#pragma include \"picking\"\nvoid main(){\nvec2 pos= v_uv / u_textSize + gl_PointCoord / u_textSize * 64.;\nvec2 fragmentPosition = 2.0*gl_PointCoord - 1.0;\nfloat distance = length(fragmentPosition);\nfloat distanceSqrd = distance * distance;\nfloat radius = 1.;\nfloat r = 1.0 - smoothstep(radius-(radius*0.01),\n radius+(radius*0.01),\n distanceSqrd);\n vec4 textureColor=texture2D(u_texture,pos);\n if(v_color == vec4(0.)){\n gl_FragColor= vec4(textureColor.xyz, textureColor.w * r);\n }else {\n gl_FragColor= step(0.01, textureColor.z) * v_color;\n }\n gl_FragColor = filterColor(gl_FragColor);\n}\n"; | ||
var pointImageVert = "precision highp float;\nattribute vec3 a_Position;\nattribute vec4 a_Color;\nattribute vec2 a_Uv;\nattribute float a_Size;\nvarying vec4 v_color;\nvarying vec2 v_uv;\nuniform mat4 u_ModelMatrix;\nuniform float u_stroke_width : 1;\nvarying float v_size;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n v_color = a_Color;\n v_uv = a_Uv;\n vec4 project_pos = project_position(vec4(a_Position, 1.0));\n v_size = a_Size;\n\n gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n\n setPickingColor(a_PickingColor);\n\n}\n"; | ||
@@ -29,0 +29,0 @@ |
{ | ||
"name": "@antv/l7-layers", | ||
"version": "2.0.35", | ||
"version": "2.0.36", | ||
"description": "L7's collection of built-in layers", | ||
@@ -26,5 +26,5 @@ "main": "lib/index.js", | ||
"@antv/async-hook": "^2.1.0", | ||
"@antv/l7-core": "^2.0.35", | ||
"@antv/l7-source": "^2.0.35", | ||
"@antv/l7-utils": "^2.0.35", | ||
"@antv/l7-core": "^2.0.36", | ||
"@antv/l7-source": "^2.0.36", | ||
"@antv/l7-utils": "^2.0.36", | ||
"@babel/runtime": "^7.7.7", | ||
@@ -53,3 +53,3 @@ "@mapbox/martini": "^0.1.0", | ||
}, | ||
"gitHead": "5ee889f42f362419afc3ba6bca84c69da6e10629", | ||
"gitHead": "0f4fafda7daab05e634580356908eca7eba585a7", | ||
"publishConfig": { | ||
@@ -56,0 +56,0 @@ "access": "public" |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
1464934
14597
Updated@antv/l7-core@^2.0.36
Updated@antv/l7-source@^2.0.36
Updated@antv/l7-utils@^2.0.36