npm - @wcardinal/wcardinal-ui - Versions diffs - 0.390.1 → 0.391.0 - Mend

@wcardinal/wcardinal-ui 0.390.1 → 0.391.0

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.

Files changed (32) hide show

package/dist/wcardinal-ui.cjs.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.390.1
+ Winter Cardinal UI v0.391.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
@@ -4831,7 +4831,7 @@ var EShapeBase = /** @class */ (function (_super) {
         //
     };
     EShapeBase.prototype.updateUploaded = function (recursively) {
-        if (this._lockUploaded.isLocked()) {
+        if (this._lockUploaded.isLocked(recursively)) {
             return;
         }
         var uploaded = this.uploaded;
@@ -11784,7 +11784,8 @@ var DBaseMeshGeometry = /** @class */ (function (_super) {
             sin: sin
         };
     };
-    DBaseMeshGeometry.N = 4;
+    /** Note that this must be an odd number. */
+    DBaseMeshGeometry.N = 5;
     return DBaseMeshGeometry;
 }(pixi_js.MeshGeometry));
@@ -11800,27 +11801,14 @@ var DBaseBackgroundMeshGeometry = /** @class */ (function (_super) {
     DBaseBackgroundMeshGeometry.prototype.fillVertices = function (vertices, uvs, iv, iuv, n, x, y, r, dr, table) {
         var cos = table.cos;
         var sin = table.sin;
-        var cos0 = cos[0];
-        var sin0 = sin[0];
-        var cos1 = cos[n - 1];
-        var sin1 = sin[n - 1];
+        var r1 = r + 0.25;
         for (var i = 0; i < n; ++i) {
             var c = cos[i];
             var s = sin[i];
-            var dro = dr;
-            var d0 = c * cos0 + s * sin0;
-            if (0.0001 < d0) {
-                dro = Math.min(dro, (1 / d0 - 1) * r);
-            }
-            var d1 = c * cos1 + s * sin1;
-            if (0.0001 < d1) {
-                dro = Math.min(dro, (1 / d1 - 1) * r);
-            }
-            var ro = r + dro;
             vertices[++iv] = x + c * r;
             vertices[++iv] = y + s * r;
-            vertices[++iv] = x + c * ro;
-            vertices[++iv] = y + s * ro;
+            vertices[++iv] = x + c * r1;
+            vertices[++iv] = y + s * r1;
             uvs[++iuv] = 0.5;
             uvs[++iuv] = 0.5;
             uvs[++iuv] = 0.5 * (1 + c);
@@ -12115,60 +12103,83 @@ var DBaseBorderMeshGeometry = /** @class */ (function (_super) {
         configurable: true
     });
     DBaseBorderMeshGeometry.prototype.fillVertices = function (vertices, uvs, iv, iuv, n, x, y, r, dr, borderWidth, table) {
-        var borderWidthHalf = 0.5 * borderWidth;
-        var r0 = r - borderWidthHalf;
-        var r2 = r + borderWidthHalf;
+        var hw = 0.5 * borderWidth;
+        var r1 = r - hw;
+        var r2 = r + hw;
+        var r0 = r1 - 0.25;
+        var r3 = r2 + 0.25;
         var cos = table.cos;
         var sin = table.sin;
-        var cos0 = cos[0];
-        var sin0 = sin[0];
-        var cos1 = cos[n - 1];
-        var sin1 = sin[n - 1];
-        var x1 = x + (cos0 + cos1) * r0;
-        var y1 = y + (sin0 + sin1) * r0;
-        for (var i = 0; i < n; ++i) {
-            var c = cos[i];
-            var s = sin[i];
-            var dr1 = dr;
-            var dr2 = dr;
-            var d0 = c * cos0 + s * sin0;
-            if (0.0001 < d0) {
-                var d0i = 1 / d0 - 1;
-                dr1 = Math.min(dr1, d0i * r0);
-                dr2 = Math.min(dr2, d0i * r2);
-            }
-            var d1 = c * cos1 + s * sin1;
-            if (0.0001 < d1) {
-                var d1i = 1 / d1 - 1;
-                dr1 = Math.min(dr1, d1i * r0);
-                dr2 = Math.min(dr2, d1i * r2);
-            }
-            var r1 = r0 + dr1;
-            var r3 = r2 + dr2;
-            if (0 < r0) {
+        if (r0 < 0) {
+            var m = n >> 1;
+            var c0 = cos[m];
+            var s0 = sin[m];
+            if (r1 < 0) {
+                for (var i = 0; i < n; ++i) {
+                    var c = cos[i];
+                    var s = sin[i];
+                    vertices[++iv] = x + c0 * r0;
+                    vertices[++iv] = y + s0 * r0;
+                    vertices[++iv] = x + c0 * r1;
+                    vertices[++iv] = y + s0 * r1;
+                    vertices[++iv] = x + c * r2;
+                    vertices[++iv] = y + s * r2;
+                    vertices[++iv] = x + c * r3;
+                    vertices[++iv] = y + s * r3;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
+                }
+            }
+            else {
+                for (var i = 0; i < n; ++i) {
+                    var c = cos[i];
+                    var s = sin[i];
+                    vertices[++iv] = x + c0 * r0;
+                    vertices[++iv] = y + s0 * r0;
+                    vertices[++iv] = x + c * r1;
+                    vertices[++iv] = y + s * r1;
+                    vertices[++iv] = x + c * r2;
+                    vertices[++iv] = y + s * r2;
+                    vertices[++iv] = x + c * r3;
+                    vertices[++iv] = y + s * r3;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
+                }
+            }
+        }
+        else {
+            for (var i = 0; i < n; ++i) {
+                var c = cos[i];
+                var s = sin[i];
                 vertices[++iv] = x + c * r0;
                 vertices[++iv] = y + s * r0;
                 vertices[++iv] = x + c * r1;
                 vertices[++iv] = y + s * r1;
+                vertices[++iv] = x + c * r2;
+                vertices[++iv] = y + s * r2;
+                vertices[++iv] = x + c * r3;
+                vertices[++iv] = y + s * r3;
+                uvs[++iuv] = 0.5 * (1 + c);
+                uvs[++iuv] = 0.5 * (1 + s);
+                uvs[++iuv] = 0.5;
+                uvs[++iuv] = 0.5;
+                uvs[++iuv] = 0.5;
+                uvs[++iuv] = 0.5;
+                uvs[++iuv] = 0.5 * (1 + c);
+                uvs[++iuv] = 0.5 * (1 + s);
             }
-            else {
-                vertices[++iv] = x1;
-                vertices[++iv] = y1;
-                vertices[++iv] = x1;
-                vertices[++iv] = y1;
-            }
-            vertices[++iv] = x + c * r2;
-            vertices[++iv] = y + s * r2;
-            vertices[++iv] = x + c * r3;
-            vertices[++iv] = y + s * r3;
-            uvs[++iuv] = 0.5 * (1 + c);
-            uvs[++iuv] = 0.5 * (1 + s);
-            uvs[++iuv] = 0.5;
-            uvs[++iuv] = 0.5;
-            uvs[++iuv] = 0.5;
-            uvs[++iuv] = 0.5;
-            uvs[++iuv] = 0.5 * (1 + c);
-            uvs[++iuv] = 0.5 * (1 + s);
         }
     };
     DBaseBorderMeshGeometry.prototype.fillIndices = function (indices, ia, ii, n, end, loop) {
@@ -20747,7 +20758,7 @@ var DynamicFontAtlasCharacterType = {
  * SPDX-License-Identifier: Apache-2.0
  */
 var VERTEX_SHADER$2 = "\nattribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\nvarying mediump vec2 vTextureCoord;\nvoid main(void) {\n\tgl_Position = vec4(aVertexPosition, 0.0, 1.0);\n\tvTextureCoord = aTextureCoord;\n}\n";
-var FRAGMENT_SHADER$2 = "\nprecision mediump float;\n\nvarying mediump vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec2 uSize;\n\nfloat calcDistance( float x, float y, float dx, float dy ) {\n\tfloat xd = x + dx;\n\tfloat yd = y + dy;\n\tfloat u = xd / uSize.x;\n\tfloat v = yd / uSize.y;\n\tfloat ul = (xd - 1.0) / uSize.x;\n\tfloat vt = (yd - 1.0) / uSize.y;\n\n\tfloat m = texture2D(uSampler, vec2(u , v )).a;\n\tfloat l = texture2D(uSampler, vec2(ul, v )).a;\n\tfloat t = texture2D(uSampler, vec2(u , vt)).a;\n\tfloat ddx = -(0.5 - m) / (l - m);\n\tfloat ddy = -(0.5 - m) / (t - m);\n\tbool bl = min(l,m) < 0.5 && 0.5 <= max(l,m);\n\tbool bt = min(t,m) < 0.5 && 0.5 <= max(t,m);\n\treturn (\n\t\tbl ?\n\t\t(bt ?\n\t\t\tlength(vec2(dx + ddx * 0.5, dy + ddy * 0.5)) :\n\t\t\tlength(vec2(dx + ddx, dy))\n\t\t) :\n\t\t(bt ?\n\t\t\tlength(vec2(dx, dy + ddy)) :\n\t\t\t100.0\n\t\t)\n\t);\n}\n\nfloat calcDistancesY( float x, float y, float dx ) {\n\tfloat d = 100.0;\n\tfor( float dy=-6.0; dy<6.5; dy++ ) {\n\t\td = min( d, calcDistance( x, y, dx, dy ) );\n\t}\n\treturn d;\n}\n\nfloat calcDistances( float x, float y ) {\n\tfloat d = 100.0;\n\tfor( float dx=-6.0; dx<6.5; dx++ ) {\n\t\td = min( d, calcDistancesY( x, y, dx ) );\n\t}\n\treturn d;\n}\n\nvoid main(void) {\n\tfloat t = texture2D(uSampler, vTextureCoord).a;\n\tfloat x = vTextureCoord.x * uSize.x;\n\tfloat y = vTextureCoord.y * uSize.y;\n\tfloat d = min( 6.0, calcDistances( x, y ) ) / 12.0;\n\td = clamp( mix( 0.5 - d, 0.5 + d, step( 0.5, t ) ), 0.0, 1.0 );\n\tgl_FragColor = vec4(1.0, 1.0, 1.0, d);\n}\n";
+var FRAGMENT_SHADER$2 = "\nprecision mediump float;\n\nvarying mediump vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec2 uSize;\n\nfloat norm(vec2 v) {\n\treturn dot(v, v);\n}\n\nfloat norm(vec2 p, vec2 dp) {\n\tvec2 xy = p + dp;\n\tvec2 uvi = vec2(1.0) / uSize;\n\tvec2 uv = xy * uvi;\n\tvec4 t0 = vec4(texture2D(uSampler, uv).a);\n\tvec4 t1 = vec4(\n\t\ttexture2D(uSampler, uv + vec2(-uvi.x, 0.0   )).a,\n\t\ttexture2D(uSampler, uv + vec2(0.0   , -uvi.y)).a,\n\t\ttexture2D(uSampler, uv + vec2(+uvi.x, 0.0   )).a,\n\t\ttexture2D(uSampler, uv + vec2(0.0   , +uvi.y)).a\n\t);\n\tvec4 t2 = vec4(0.5);\n\tvec4 t3 = min(t1,t0);\n\tvec4 t4 = max(t1,t0);\n\n\tvec4 w0 = (t2 - t0) / (t1 - t0);\n\tvec4 s0 = vec4(\n\t\tt3.x < 0.5 && 0.5 <= t4.x,\n\t\tt3.y < 0.5 && 0.5 <= t4.y,\n\t\tt3.z < 0.5 && 0.5 <= t4.z,\n\t\tt3.w < 0.5 && 0.5 <= t4.w\n\t);\n\tvec4 l0 = vec4(\n\t\tnorm(dp + vec2(-w0.x, 0.0  )),\n\t\tnorm(dp + vec2(0.0  , -w0.y)),\n\t\tnorm(dp + vec2(+w0.z, 0.0  )),\n\t\tnorm(dp + vec2(0.0  , +w0.w))\n\t);\n\tvec4 c0 = vec4(100.0);\n\tvec4 r0 = mix(c0, l0, s0);\n\n\tvec4 w1 = w0 * vec4(0.5);\n\tvec4 s1 = vec4(\n\t\t0.5 < s0.x && 0.5 < s0.y,\n\t\t0.5 < s0.y && 0.5 < s0.z,\n\t\t0.5 < s0.z && 0.5 < s0.w,\n\t\t0.5 < s0.w && 0.5 < s0.x\n\t);\n\tvec4 l1 = vec4(\n\t\tnorm(dp + vec2(-w1.x, -w1.y)),\n\t\tnorm(dp + vec2(+w1.z, -w1.y)),\n\t\tnorm(dp + vec2(+w1.z, +w1.w)),\n\t\tnorm(dp + vec2(-w1.x, +w1.w))\n\t);\n\tvec4 r1 = mix(c0, l1, s1);\n\tvec4 r2 = min(r0, r1);\n\tvec2 r3 = min(r2.xy, r2.zw);\n\treturn min(r3.x, r3.y);\n}\n\nfloat distY(vec2 p, float dx) {\n\treturn min(\n\t\tnorm(p, vec2(dx, 0.0)),\n\t\tmin(\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, -6.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, -5.0))\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, -4.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, -3.0))\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tnorm(p, vec2(dx, -2.0)),\n\t\t\t\t\tnorm(p, vec2(dx, -1.0))\n\t\t\t\t)\n\t\t\t),\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, +1.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, +2.0))\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, +3.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, +4.0))\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tnorm(p, vec2(dx, +5.0)),\n\t\t\t\t\tnorm(p, vec2(dx, +6.0))\n\t\t\t\t)\n\t\t\t)\n\t\t)\n\t);\n}\n\nfloat distX(vec2 p) {\n\treturn min(\n\t\tdistY(p, 0.0),\n\t\tmin(\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, -6.0),\n\t\t\t\t\t\tdistY(p, -5.0)\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, -4.0),\n\t\t\t\t\t\tdistY(p, -3.0)\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tdistY(p, -2.0),\n\t\t\t\t\tdistY(p, -1.0)\n\t\t\t\t)\n\t\t\t),\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, +1.0),\n\t\t\t\t\t\tdistY(p, +2.0)\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, +3.0),\n\t\t\t\t\t\tdistY(p, +4.0)\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tdistY(p, +5.0),\n\t\t\t\t\tdistY(p, +6.0)\n\t\t\t\t)\n\t\t\t)\n\t\t)\n\t);\n}\n\nfloat dist(vec2 p) {\n\treturn sqrt(distX(p));\n}\n\nvoid main(void) {\n\tfloat t = texture2D(uSampler, vTextureCoord).a;\n\tfloat d = min( 6.0, dist( vTextureCoord * uSize ) ) / 12.0;\n\td = clamp( mix( 0.5 - d, 0.5 + d, step( 0.5, t ) ), 0.0, 1.0 ) * 255.0;\n\tfloat r = floor(d);\n\td = (d - r) * 255.0;\n\tfloat g = floor(d);\n\tgl_FragColor = vec4(r * 0.00392156862745098, g * 0.00392156862745098, d - g, 1.0);\n}\n";
 var DynamicSDFFontGenerator = /** @class */ (function () {
     function DynamicSDFFontGenerator() {
         var _this = this;
@@ -21756,7 +21767,7 @@ var EShapeRendererIterator = /** @class */ (function () {
  * SPDX-License-Identifier: Apache-2.0
  */
 var VERTEX_SHADER$1 = "\nattribute vec2 aPosition;\nattribute vec3 aClipping;\nattribute vec2 aStep;\nattribute vec4 aAntialias;\nattribute vec4 aColorFill;\nattribute vec4 aColorStroke;\nattribute vec2 aUv;\n\nuniform mat3 projectionMatrix;\nuniform mat3 translationMatrix;\nuniform mediump float shapeScale;\nuniform mediump float pixelScale;\nuniform mediump float antialiasWeight;\n\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nvec2 toInverse( in vec2 v ) {\n\treturn vec2( -v.y, v.x );\n}\n\nvec2 toTransformedPosition( in vec2 v ) {\n\treturn (projectionMatrix * translationMatrix * vec3(v, 1.0)).xy;\n}\n\nvec4 toAntialias01( in vec4 antialias ) {\n\t// Taylor series of 1 / ( 1 - a ) = 1 + a + a^2 + ....\n\treturn 1.0 + min( vec4( 1.0 ), antialias * pixelScale );\n}\n\nvec4 toAntialias2( in vec4 antialias, in float strokeWidth ) {\n\tfloat x = min( 0.4, 0.4 / 12.0 * antialias.x * pixelScale * antialiasWeight );\n\tfloat w = clamp( strokeWidth / antialias.y, 0.0, 1.0 ) * 0.4;\n\tfloat p = w * antialias.z + antialias.w;\n\tfloat y = 0.5 - p;\n\tfloat z = 0.5 - p - w;\n\treturn vec4( y, z, y - max( 0.01, y - x ), z - max( 0.01, z - x ) );\n}\n\nvec2 toPosition3456( in float type, in vec2 p, in vec2 pprev, in vec2 pnext, in float strokeWidth, out float shift ) {\n\tvec2 d0 = p - pprev;\n\tvec2 d1 = pnext - p;\n\tfloat l0 = dot( d0, d0 );\n\tfloat l1 = dot( d1, d1 );\n\tvec2 nd0 = normalize( toInverse( d0 ) );\n\tvec2 nd1 = normalize( toInverse( d1 ) );\n\tvec2 nd2 = 0.00001 < l1 ? nd1 : vec2(0.0, 0.0);\n\tvec2 n0 = 0.00001 < l0 ? nd0 : nd2;\n\tvec2 n1 = 0.00001 < l1 ? nd1 : n0;\n\tvec2 n0i = toInverse( n0 );\n\tvec2 n1i = toInverse( n1 );\n\tfloat direction = sign( 4.5 - type );\n\n\t// Offset\n\tfloat cross = dot( n0i, n1 );\n\tfloat crossInverse = ( 0.00001 < abs( cross ) ? 1.0 / cross : 0.0 );\n\tfloat b = dot(n1 - n0, n0) * crossInverse;\n\tfloat offsetSize = direction * strokeWidth * 0.5;\n\tvec2 offset = n1 + n1i * b;\n\n\t// Miter\n\tvec2 pmiter = p + offsetSize * offset;\n\tfloat miterAngle0 = dot( n0i, pmiter - pprev );\n\tfloat miterAngle1 = dot( n1i, pmiter - pnext );\n\tfloat miterLength = dot( offset, offset );\n\tfloat miterSide = direction * cross;\n\n\t// Bevel\n\tvec2 n = ( type == 4.0 || type == 6.0 ? n1 : n0 );\n\tvec2 pbevel = p + offsetSize * n;\n\n\t//\n\tvec2 presult = (\n\t\t0.0 <= miterSide ?\n\t\t( miterAngle0 < 0.0 && 0.0 <= miterAngle1 ? pmiter : pbevel ) :\n\t\t( miterLength < 6.0 ? pmiter : pbevel )\n\t);\n\tvec2 ni = ( type == 4.0 || type == 6.0 ? n1i : n0i );\n\tshift = dot( ni, p - presult );\n\treturn toTransformedPosition( presult );\n}\n\nvec2 toStep3456( in float type ) {\n\treturn ( type < 4.5 ? vec2( 1.0, 0.0 ) : vec2( 0.0, 1.0 ) );\n}\n\nvec4 toAntialias3456( in float strokeWidth ) {\n\tfloat a = antialiasWeight / max( 0.0001, strokeWidth );\n\treturn toAntialias01( vec4( a, a, a, a ) );\n}\n\nfloat toDotAndDashScale( in float scale, in float strokeWidthScale ) {\n\treturn (\n\t\tscale == 4.0 || scale == 5.0 || scale == 6.0 || scale == 7.0 ?\n\t\tstrokeWidthScale : 1.0\n\t);\n}\n\nvec4 toColorStroke3456( in float shift, in float scale ) {\n\tfloat x = aColorFill.x + shift;\n\tfloat y = scale * aColorFill.y;\n\tfloat z = scale * aColorFill.z;\n\tfloat w = aColorFill.w;\n\treturn vec4( x, y, z, w );\n}\n\nfloat toStrokeWidthScale( in float scale ) {\n\treturn (\n\t\tscale == 3.0 || scale == 7.0 ?\n\t\tshapeScale : (\n\t\t\tscale == 1.0 || scale == 5.0 ?\n\t\t\tmin( 1.0, shapeScale ) : (\n\t\t\t\tscale == 2.0 || scale == 6.0 ?\n\t\t\t\tmax( 1.0, shapeScale ) : 1.0\n\t\t\t)\n\t\t)\n\t);\n}\n\nvec2 toStep01(in vec2 size, in vec2 weight, in vec2 strokeWidth) {\n\treturn weight / max(vec2(0.00001), vec2(1.0) - strokeWidth / size);\n}\n\nvec4 toAntialias01b(in vec2 size, in vec2 strokeWidth) {\n\treturn antialiasWeight / max(vec4(0.00001), vec4(size - strokeWidth, size));\n}\n\nvoid main(void) {\n\tvec2 p012 = toTransformedPosition( aPosition );\n\n\tfloat type = aClipping.z;\n\tfloat strokeWidthScale = toStrokeWidthScale( aStep.y );\n\tfloat strokeWidth = strokeWidthScale * aStep.x;\n\n\t// type === 0 or 1\n\tvec2 size01 = aAntialias.xy;\n\tvec2 weight01 = abs(aAntialias.zw - sign(aAntialias.zw));\n\tvec2 strokeWidth01 = step(vec2(0.0), aAntialias.zw) * strokeWidth;\n\tvec2 step01 = toStep01( size01, weight01, strokeWidth01 );\n\tvec4 a01 = toAntialias01( toAntialias01b( size01, strokeWidth01 ) );\n\n\t// type === 2\n\tvec4 a2 = toAntialias2( aAntialias, strokeWidth );\n\n\t// type === 3, 4, 5 or 6\n\tfloat shift3456 = 0.0;\n\tvec2 p3456 = toPosition3456( type, aPosition, aAntialias.xy, aAntialias.zw, strokeWidth, shift3456 );\n\tvec2 step3456 = toStep3456( type );\n\tvec4 a3456 = toAntialias3456( strokeWidth );\n\tvec4 colorStroke3456 = toColorStroke3456( shift3456, toDotAndDashScale( aStep.y, strokeWidthScale ) );\n\n\t//\n\tgl_Position = vec4( ( 2.5 < type ? p3456 : p012 ), 0.0, 1.0 );\n\tvAntialias = ( 1.5 < type ? ( 2.5 < type ? a3456 : a2 ) : a01 );\n\tvClipping = aClipping;\n\tvStep = ( 2.5 < type ? step3456 : step01 );\n\tvColorFill = ( 2.5 < type ? aColorStroke : aColorFill );\n\tvColorStroke = ( 2.5 < type ? colorStroke3456 : aColorStroke );\n\tvUv = aUv;\n}";
-var FRAGMENT_SHADER$1 = "\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float pixelScale;\n\nvoid main(void) {\n\tvec4 texture = texture2D(sampler, vUv);\n\tfloat type = vClipping.z;\n\tvec2 v0 = vStep;\n\tvec2 v1 = vClipping.xy;\n\tvec2 v2 = v0 * vAntialias.xy;\n\tvec2 v3 = v1 * vAntialias.zw;\n\tvec2 d01 = ( v0.x < v0.y ? vec2( v0.y, v2.y ) : vec2( v0.x, v2.x ) );\n\tvec2 d02 = ( v1.x < v1.y ? vec2( v1.y, v3.y ) : vec2( v1.x, v3.x ) );\n\tvec4 d0 = vec4( d01.x, d02.x, d01.y, d02.y );\n\tvec4 d1 = vec4( dot( v0, v0 ), dot( v1, v1 ), dot( v2, v2 ), dot( v3, v3 ) );\n\tvec4 d = ( type == 1.0 ? d1 : d0 );\n\tvec2 s = smoothstep( 1.0 - (d.zw - d.xy), vec2( 1.0 ), d.xy );\n\tvec4 color01 = texture * (vColorStroke * (s.x - s.y) + vColorFill * (1.0 - s.x));\n\n\tfloat l = vColorStroke.x;\n\tfloat lp0 = vColorStroke.y;\n\tfloat lp1 = vColorStroke.z;\n\tfloat lt = vColorStroke.w;\n\tfloat ld = 0.5 * pixelScale;\n\tfloat lm = mod( l, lp0 + lp1 );\n\tfloat ls0 = ( 0.0 < lp1 ? smoothstep( 0.0, ld, lm ) - smoothstep( lp0, lp0 + ld, lm ) : 1.0 );\n\tfloat ls1 = ( 0.0 <= lt ? smoothstep( 0.0, ld, l ) - smoothstep( lt - ld, lt, l ) : 1.0 );\n\tvec4 color3456 = color01 * ls0 * ls1;\n\n\tvec2 a0 = vAntialias.xy;\n\tvec2 a1 = vAntialias.zw;\n\tvec2 a2 = vec2( texture.a );\n\tvec2 a = smoothstep( a0 - a1, a0 + a1, a2 );\n\tvec4 color2 = a.x * vColorFill + ( a.y - a.x ) * vColorStroke;\n\tgl_FragColor = ( type == 2.0 ? color2 : (2.5 < type ? color3456 : color01) );\n}";
+var FRAGMENT_SHADER$1 = "\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float pixelScale;\n\nvec4 color1(float type, vec4 texture) {\n\tvec2 v0 = vStep;\n\tvec2 v1 = vClipping.xy;\n\tvec2 v2 = v0 * vAntialias.xy;\n\tvec2 v3 = v1 * vAntialias.zw;\n\tvec2 d01 = ( v0.x < v0.y ? vec2( v0.y, v2.y ) : vec2( v0.x, v2.x ) );\n\tvec2 d02 = ( v1.x < v1.y ? vec2( v1.y, v3.y ) : vec2( v1.x, v3.x ) );\n\tvec4 d0 = vec4( d01.x, d02.x, d01.y, d02.y );\n\tvec4 d1 = vec4( dot( v0, v0 ), dot( v1, v1 ), dot( v2, v2 ), dot( v3, v3 ) );\n\tvec4 d = (type == 1.0 ? d1 : d0);\n\tvec2 s = smoothstep( 1.0 - (d.zw - d.xy), vec2( 1.0 ), d.xy );\n\treturn texture * (vColorStroke * (s.x - s.y) + vColorFill * (1.0 - s.x));\n}\n\nvec4 color2(float type, vec4 texture) {\n\tvec2 a0 = vAntialias.xy;\n\tvec2 a1 = vAntialias.zw;\n\tvec2 a2 = vec2( (texture.b * 0.00392156862745098 + texture.g) * 0.00392156862745098 + texture.r );\n\tvec2 a = smoothstep( a0 - a1, a0 + a1, a2 );\n\treturn a.x * vColorFill + ( a.y - a.x ) * vColorStroke;\n}\n\nfloat color3456(float type, vec4 texture) {\n\tfloat l = vColorStroke.x;\n\tfloat lp0 = vColorStroke.y;\n\tfloat lp1 = vColorStroke.z;\n\tfloat lt = vColorStroke.w;\n\tfloat ld = 0.5 * pixelScale;\n\tfloat lm = mod( l, lp0 + lp1 );\n\tfloat ls0 = ( 0.0 < lp1 ? smoothstep( 0.0, ld, lm ) - smoothstep( lp0, lp0 + ld, lm ) : 1.0 );\n\tfloat ls1 = ( 0.0 <= lt ? smoothstep( 0.0, ld, l ) - smoothstep( lt - ld, lt, l ) : 1.0 );\n\treturn ls0 * ls1;\n}\n\nvoid main(void) {\n\tfloat type = vClipping.z;\n\tvec4 texture = texture2D(sampler, vUv);\n\tgl_FragColor = (type == 2.0 ?\n\t\tcolor2(type, texture) :\n\t\tcolor1(type, texture) * (2.5 < type ? color3456(type, texture) : 1.0)\n\t);\n}";
 var EShapeRenderer = /** @class */ (function (_super) {
     __extends(EShapeRenderer, _super);
     function EShapeRenderer(renderer) {
@@ -68674,9 +68685,11 @@ var UtilExtractor = /** @class */ (function () {
         var width = Math.floor(frame.width * resolution);
         var height = Math.floor(frame.height * resolution);
         var pixels = new Uint8Array(4 * width * height);
+        var oldRenderTexture = renderer.renderTexture.current;
         renderer.renderTexture.bind(renderTexture);
         var gl = renderer.gl;
         gl.readPixels(frame.x * resolution, frame.y * resolution, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
+        renderer.renderTexture.bind(oldRenderTexture);
         return {
             width: width,
             height: height,

package/dist/wcardinal-ui.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.390.1
+ Winter Cardinal UI v0.391.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
@@ -4828,7 +4828,7 @@
             //
         };
         EShapeBase.prototype.updateUploaded = function (recursively) {
-            if (this._lockUploaded.isLocked()) {
+            if (this._lockUploaded.isLocked(recursively)) {
                 return;
             }
             var uploaded = this.uploaded;
@@ -11781,7 +11781,8 @@
                 sin: sin
             };
         };
-        DBaseMeshGeometry.N = 4;
+        /** Note that this must be an odd number. */
+        DBaseMeshGeometry.N = 5;
         return DBaseMeshGeometry;
     }(pixi_js.MeshGeometry));
@@ -11797,27 +11798,14 @@
         DBaseBackgroundMeshGeometry.prototype.fillVertices = function (vertices, uvs, iv, iuv, n, x, y, r, dr, table) {
             var cos = table.cos;
             var sin = table.sin;
-            var cos0 = cos[0];
-            var sin0 = sin[0];
-            var cos1 = cos[n - 1];
-            var sin1 = sin[n - 1];
+            var r1 = r + 0.25;
             for (var i = 0; i < n; ++i) {
                 var c = cos[i];
                 var s = sin[i];
-                var dro = dr;
-                var d0 = c * cos0 + s * sin0;
-                if (0.0001 < d0) {
-                    dro = Math.min(dro, (1 / d0 - 1) * r);
-                }
-                var d1 = c * cos1 + s * sin1;
-                if (0.0001 < d1) {
-                    dro = Math.min(dro, (1 / d1 - 1) * r);
-                }
-                var ro = r + dro;
                 vertices[++iv] = x + c * r;
                 vertices[++iv] = y + s * r;
-                vertices[++iv] = x + c * ro;
-                vertices[++iv] = y + s * ro;
+                vertices[++iv] = x + c * r1;
+                vertices[++iv] = y + s * r1;
                 uvs[++iuv] = 0.5;
                 uvs[++iuv] = 0.5;
                 uvs[++iuv] = 0.5 * (1 + c);
@@ -12112,60 +12100,83 @@
             configurable: true
         });
         DBaseBorderMeshGeometry.prototype.fillVertices = function (vertices, uvs, iv, iuv, n, x, y, r, dr, borderWidth, table) {
-            var borderWidthHalf = 0.5 * borderWidth;
-            var r0 = r - borderWidthHalf;
-            var r2 = r + borderWidthHalf;
+            var hw = 0.5 * borderWidth;
+            var r1 = r - hw;
+            var r2 = r + hw;
+            var r0 = r1 - 0.25;
+            var r3 = r2 + 0.25;
             var cos = table.cos;
             var sin = table.sin;
-            var cos0 = cos[0];
-            var sin0 = sin[0];
-            var cos1 = cos[n - 1];
-            var sin1 = sin[n - 1];
-            var x1 = x + (cos0 + cos1) * r0;
-            var y1 = y + (sin0 + sin1) * r0;
-            for (var i = 0; i < n; ++i) {
-                var c = cos[i];
-                var s = sin[i];
-                var dr1 = dr;
-                var dr2 = dr;
-                var d0 = c * cos0 + s * sin0;
-                if (0.0001 < d0) {
-                    var d0i = 1 / d0 - 1;
-                    dr1 = Math.min(dr1, d0i * r0);
-                    dr2 = Math.min(dr2, d0i * r2);
-                }
-                var d1 = c * cos1 + s * sin1;
-                if (0.0001 < d1) {
-                    var d1i = 1 / d1 - 1;
-                    dr1 = Math.min(dr1, d1i * r0);
-                    dr2 = Math.min(dr2, d1i * r2);
-                }
-                var r1 = r0 + dr1;
-                var r3 = r2 + dr2;
-                if (0 < r0) {
+            if (r0 < 0) {
+                var m = n >> 1;
+                var c0 = cos[m];
+                var s0 = sin[m];
+                if (r1 < 0) {
+                    for (var i = 0; i < n; ++i) {
+                        var c = cos[i];
+                        var s = sin[i];
+                        vertices[++iv] = x + c0 * r0;
+                        vertices[++iv] = y + s0 * r0;
+                        vertices[++iv] = x + c0 * r1;
+                        vertices[++iv] = y + s0 * r1;
+                        vertices[++iv] = x + c * r2;
+                        vertices[++iv] = y + s * r2;
+                        vertices[++iv] = x + c * r3;
+                        vertices[++iv] = y + s * r3;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                    }
+                }
+                else {
+                    for (var i = 0; i < n; ++i) {
+                        var c = cos[i];
+                        var s = sin[i];
+                        vertices[++iv] = x + c0 * r0;
+                        vertices[++iv] = y + s0 * r0;
+                        vertices[++iv] = x + c * r1;
+                        vertices[++iv] = y + s * r1;
+                        vertices[++iv] = x + c * r2;
+                        vertices[++iv] = y + s * r2;
+                        vertices[++iv] = x + c * r3;
+                        vertices[++iv] = y + s * r3;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5;
+                        uvs[++iuv] = 0.5 * (1 + c);
+                        uvs[++iuv] = 0.5 * (1 + s);
+                    }
+                }
+            }
+            else {
+                for (var i = 0; i < n; ++i) {
+                    var c = cos[i];
+                    var s = sin[i];
                     vertices[++iv] = x + c * r0;
                     vertices[++iv] = y + s * r0;
                     vertices[++iv] = x + c * r1;
                     vertices[++iv] = y + s * r1;
+                    vertices[++iv] = x + c * r2;
+                    vertices[++iv] = y + s * r2;
+                    vertices[++iv] = x + c * r3;
+                    vertices[++iv] = y + s * r3;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5;
+                    uvs[++iuv] = 0.5 * (1 + c);
+                    uvs[++iuv] = 0.5 * (1 + s);
                 }
-                else {
-                    vertices[++iv] = x1;
-                    vertices[++iv] = y1;
-                    vertices[++iv] = x1;
-                    vertices[++iv] = y1;
-                }
-                vertices[++iv] = x + c * r2;
-                vertices[++iv] = y + s * r2;
-                vertices[++iv] = x + c * r3;
-                vertices[++iv] = y + s * r3;
-                uvs[++iuv] = 0.5 * (1 + c);
-                uvs[++iuv] = 0.5 * (1 + s);
-                uvs[++iuv] = 0.5;
-                uvs[++iuv] = 0.5;
-                uvs[++iuv] = 0.5;
-                uvs[++iuv] = 0.5;
-                uvs[++iuv] = 0.5 * (1 + c);
-                uvs[++iuv] = 0.5 * (1 + s);
             }
         };
         DBaseBorderMeshGeometry.prototype.fillIndices = function (indices, ia, ii, n, end, loop) {
@@ -20744,7 +20755,7 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var VERTEX_SHADER$2 = "\nattribute vec2 aVertexPosition;\nattribute vec2 aTextureCoord;\nvarying mediump vec2 vTextureCoord;\nvoid main(void) {\n\tgl_Position = vec4(aVertexPosition, 0.0, 1.0);\n\tvTextureCoord = aTextureCoord;\n}\n";
-    var FRAGMENT_SHADER$2 = "\nprecision mediump float;\n\nvarying mediump vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec2 uSize;\n\nfloat calcDistance( float x, float y, float dx, float dy ) {\n\tfloat xd = x + dx;\n\tfloat yd = y + dy;\n\tfloat u = xd / uSize.x;\n\tfloat v = yd / uSize.y;\n\tfloat ul = (xd - 1.0) / uSize.x;\n\tfloat vt = (yd - 1.0) / uSize.y;\n\n\tfloat m = texture2D(uSampler, vec2(u , v )).a;\n\tfloat l = texture2D(uSampler, vec2(ul, v )).a;\n\tfloat t = texture2D(uSampler, vec2(u , vt)).a;\n\tfloat ddx = -(0.5 - m) / (l - m);\n\tfloat ddy = -(0.5 - m) / (t - m);\n\tbool bl = min(l,m) < 0.5 && 0.5 <= max(l,m);\n\tbool bt = min(t,m) < 0.5 && 0.5 <= max(t,m);\n\treturn (\n\t\tbl ?\n\t\t(bt ?\n\t\t\tlength(vec2(dx + ddx * 0.5, dy + ddy * 0.5)) :\n\t\t\tlength(vec2(dx + ddx, dy))\n\t\t) :\n\t\t(bt ?\n\t\t\tlength(vec2(dx, dy + ddy)) :\n\t\t\t100.0\n\t\t)\n\t);\n}\n\nfloat calcDistancesY( float x, float y, float dx ) {\n\tfloat d = 100.0;\n\tfor( float dy=-6.0; dy<6.5; dy++ ) {\n\t\td = min( d, calcDistance( x, y, dx, dy ) );\n\t}\n\treturn d;\n}\n\nfloat calcDistances( float x, float y ) {\n\tfloat d = 100.0;\n\tfor( float dx=-6.0; dx<6.5; dx++ ) {\n\t\td = min( d, calcDistancesY( x, y, dx ) );\n\t}\n\treturn d;\n}\n\nvoid main(void) {\n\tfloat t = texture2D(uSampler, vTextureCoord).a;\n\tfloat x = vTextureCoord.x * uSize.x;\n\tfloat y = vTextureCoord.y * uSize.y;\n\tfloat d = min( 6.0, calcDistances( x, y ) ) / 12.0;\n\td = clamp( mix( 0.5 - d, 0.5 + d, step( 0.5, t ) ), 0.0, 1.0 );\n\tgl_FragColor = vec4(1.0, 1.0, 1.0, d);\n}\n";
+    var FRAGMENT_SHADER$2 = "\nprecision mediump float;\n\nvarying mediump vec2 vTextureCoord;\nuniform sampler2D uSampler;\nuniform vec2 uSize;\n\nfloat norm(vec2 v) {\n\treturn dot(v, v);\n}\n\nfloat norm(vec2 p, vec2 dp) {\n\tvec2 xy = p + dp;\n\tvec2 uvi = vec2(1.0) / uSize;\n\tvec2 uv = xy * uvi;\n\tvec4 t0 = vec4(texture2D(uSampler, uv).a);\n\tvec4 t1 = vec4(\n\t\ttexture2D(uSampler, uv + vec2(-uvi.x, 0.0   )).a,\n\t\ttexture2D(uSampler, uv + vec2(0.0   , -uvi.y)).a,\n\t\ttexture2D(uSampler, uv + vec2(+uvi.x, 0.0   )).a,\n\t\ttexture2D(uSampler, uv + vec2(0.0   , +uvi.y)).a\n\t);\n\tvec4 t2 = vec4(0.5);\n\tvec4 t3 = min(t1,t0);\n\tvec4 t4 = max(t1,t0);\n\n\tvec4 w0 = (t2 - t0) / (t1 - t0);\n\tvec4 s0 = vec4(\n\t\tt3.x < 0.5 && 0.5 <= t4.x,\n\t\tt3.y < 0.5 && 0.5 <= t4.y,\n\t\tt3.z < 0.5 && 0.5 <= t4.z,\n\t\tt3.w < 0.5 && 0.5 <= t4.w\n\t);\n\tvec4 l0 = vec4(\n\t\tnorm(dp + vec2(-w0.x, 0.0  )),\n\t\tnorm(dp + vec2(0.0  , -w0.y)),\n\t\tnorm(dp + vec2(+w0.z, 0.0  )),\n\t\tnorm(dp + vec2(0.0  , +w0.w))\n\t);\n\tvec4 c0 = vec4(100.0);\n\tvec4 r0 = mix(c0, l0, s0);\n\n\tvec4 w1 = w0 * vec4(0.5);\n\tvec4 s1 = vec4(\n\t\t0.5 < s0.x && 0.5 < s0.y,\n\t\t0.5 < s0.y && 0.5 < s0.z,\n\t\t0.5 < s0.z && 0.5 < s0.w,\n\t\t0.5 < s0.w && 0.5 < s0.x\n\t);\n\tvec4 l1 = vec4(\n\t\tnorm(dp + vec2(-w1.x, -w1.y)),\n\t\tnorm(dp + vec2(+w1.z, -w1.y)),\n\t\tnorm(dp + vec2(+w1.z, +w1.w)),\n\t\tnorm(dp + vec2(-w1.x, +w1.w))\n\t);\n\tvec4 r1 = mix(c0, l1, s1);\n\tvec4 r2 = min(r0, r1);\n\tvec2 r3 = min(r2.xy, r2.zw);\n\treturn min(r3.x, r3.y);\n}\n\nfloat distY(vec2 p, float dx) {\n\treturn min(\n\t\tnorm(p, vec2(dx, 0.0)),\n\t\tmin(\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, -6.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, -5.0))\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, -4.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, -3.0))\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tnorm(p, vec2(dx, -2.0)),\n\t\t\t\t\tnorm(p, vec2(dx, -1.0))\n\t\t\t\t)\n\t\t\t),\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, +1.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, +2.0))\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tnorm(p, vec2(dx, +3.0)),\n\t\t\t\t\t\tnorm(p, vec2(dx, +4.0))\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tnorm(p, vec2(dx, +5.0)),\n\t\t\t\t\tnorm(p, vec2(dx, +6.0))\n\t\t\t\t)\n\t\t\t)\n\t\t)\n\t);\n}\n\nfloat distX(vec2 p) {\n\treturn min(\n\t\tdistY(p, 0.0),\n\t\tmin(\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, -6.0),\n\t\t\t\t\t\tdistY(p, -5.0)\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, -4.0),\n\t\t\t\t\t\tdistY(p, -3.0)\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tdistY(p, -2.0),\n\t\t\t\t\tdistY(p, -1.0)\n\t\t\t\t)\n\t\t\t),\n\t\t\tmin(\n\t\t\t\tmin(\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, +1.0),\n\t\t\t\t\t\tdistY(p, +2.0)\n\t\t\t\t\t),\n\t\t\t\t\tmin(\n\t\t\t\t\t\tdistY(p, +3.0),\n\t\t\t\t\t\tdistY(p, +4.0)\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tmin(\n\t\t\t\t\tdistY(p, +5.0),\n\t\t\t\t\tdistY(p, +6.0)\n\t\t\t\t)\n\t\t\t)\n\t\t)\n\t);\n}\n\nfloat dist(vec2 p) {\n\treturn sqrt(distX(p));\n}\n\nvoid main(void) {\n\tfloat t = texture2D(uSampler, vTextureCoord).a;\n\tfloat d = min( 6.0, dist( vTextureCoord * uSize ) ) / 12.0;\n\td = clamp( mix( 0.5 - d, 0.5 + d, step( 0.5, t ) ), 0.0, 1.0 ) * 255.0;\n\tfloat r = floor(d);\n\td = (d - r) * 255.0;\n\tfloat g = floor(d);\n\tgl_FragColor = vec4(r * 0.00392156862745098, g * 0.00392156862745098, d - g, 1.0);\n}\n";
     var DynamicSDFFontGenerator = /** @class */ (function () {
         function DynamicSDFFontGenerator() {
             var _this = this;
@@ -21753,7 +21764,7 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var VERTEX_SHADER$1 = "\nattribute vec2 aPosition;\nattribute vec3 aClipping;\nattribute vec2 aStep;\nattribute vec4 aAntialias;\nattribute vec4 aColorFill;\nattribute vec4 aColorStroke;\nattribute vec2 aUv;\n\nuniform mat3 projectionMatrix;\nuniform mat3 translationMatrix;\nuniform mediump float shapeScale;\nuniform mediump float pixelScale;\nuniform mediump float antialiasWeight;\n\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nvec2 toInverse( in vec2 v ) {\n\treturn vec2( -v.y, v.x );\n}\n\nvec2 toTransformedPosition( in vec2 v ) {\n\treturn (projectionMatrix * translationMatrix * vec3(v, 1.0)).xy;\n}\n\nvec4 toAntialias01( in vec4 antialias ) {\n\t// Taylor series of 1 / ( 1 - a ) = 1 + a + a^2 + ....\n\treturn 1.0 + min( vec4( 1.0 ), antialias * pixelScale );\n}\n\nvec4 toAntialias2( in vec4 antialias, in float strokeWidth ) {\n\tfloat x = min( 0.4, 0.4 / 12.0 * antialias.x * pixelScale * antialiasWeight );\n\tfloat w = clamp( strokeWidth / antialias.y, 0.0, 1.0 ) * 0.4;\n\tfloat p = w * antialias.z + antialias.w;\n\tfloat y = 0.5 - p;\n\tfloat z = 0.5 - p - w;\n\treturn vec4( y, z, y - max( 0.01, y - x ), z - max( 0.01, z - x ) );\n}\n\nvec2 toPosition3456( in float type, in vec2 p, in vec2 pprev, in vec2 pnext, in float strokeWidth, out float shift ) {\n\tvec2 d0 = p - pprev;\n\tvec2 d1 = pnext - p;\n\tfloat l0 = dot( d0, d0 );\n\tfloat l1 = dot( d1, d1 );\n\tvec2 nd0 = normalize( toInverse( d0 ) );\n\tvec2 nd1 = normalize( toInverse( d1 ) );\n\tvec2 nd2 = 0.00001 < l1 ? nd1 : vec2(0.0, 0.0);\n\tvec2 n0 = 0.00001 < l0 ? nd0 : nd2;\n\tvec2 n1 = 0.00001 < l1 ? nd1 : n0;\n\tvec2 n0i = toInverse( n0 );\n\tvec2 n1i = toInverse( n1 );\n\tfloat direction = sign( 4.5 - type );\n\n\t// Offset\n\tfloat cross = dot( n0i, n1 );\n\tfloat crossInverse = ( 0.00001 < abs( cross ) ? 1.0 / cross : 0.0 );\n\tfloat b = dot(n1 - n0, n0) * crossInverse;\n\tfloat offsetSize = direction * strokeWidth * 0.5;\n\tvec2 offset = n1 + n1i * b;\n\n\t// Miter\n\tvec2 pmiter = p + offsetSize * offset;\n\tfloat miterAngle0 = dot( n0i, pmiter - pprev );\n\tfloat miterAngle1 = dot( n1i, pmiter - pnext );\n\tfloat miterLength = dot( offset, offset );\n\tfloat miterSide = direction * cross;\n\n\t// Bevel\n\tvec2 n = ( type == 4.0 || type == 6.0 ? n1 : n0 );\n\tvec2 pbevel = p + offsetSize * n;\n\n\t//\n\tvec2 presult = (\n\t\t0.0 <= miterSide ?\n\t\t( miterAngle0 < 0.0 && 0.0 <= miterAngle1 ? pmiter : pbevel ) :\n\t\t( miterLength < 6.0 ? pmiter : pbevel )\n\t);\n\tvec2 ni = ( type == 4.0 || type == 6.0 ? n1i : n0i );\n\tshift = dot( ni, p - presult );\n\treturn toTransformedPosition( presult );\n}\n\nvec2 toStep3456( in float type ) {\n\treturn ( type < 4.5 ? vec2( 1.0, 0.0 ) : vec2( 0.0, 1.0 ) );\n}\n\nvec4 toAntialias3456( in float strokeWidth ) {\n\tfloat a = antialiasWeight / max( 0.0001, strokeWidth );\n\treturn toAntialias01( vec4( a, a, a, a ) );\n}\n\nfloat toDotAndDashScale( in float scale, in float strokeWidthScale ) {\n\treturn (\n\t\tscale == 4.0 || scale == 5.0 || scale == 6.0 || scale == 7.0 ?\n\t\tstrokeWidthScale : 1.0\n\t);\n}\n\nvec4 toColorStroke3456( in float shift, in float scale ) {\n\tfloat x = aColorFill.x + shift;\n\tfloat y = scale * aColorFill.y;\n\tfloat z = scale * aColorFill.z;\n\tfloat w = aColorFill.w;\n\treturn vec4( x, y, z, w );\n}\n\nfloat toStrokeWidthScale( in float scale ) {\n\treturn (\n\t\tscale == 3.0 || scale == 7.0 ?\n\t\tshapeScale : (\n\t\t\tscale == 1.0 || scale == 5.0 ?\n\t\t\tmin( 1.0, shapeScale ) : (\n\t\t\t\tscale == 2.0 || scale == 6.0 ?\n\t\t\t\tmax( 1.0, shapeScale ) : 1.0\n\t\t\t)\n\t\t)\n\t);\n}\n\nvec2 toStep01(in vec2 size, in vec2 weight, in vec2 strokeWidth) {\n\treturn weight / max(vec2(0.00001), vec2(1.0) - strokeWidth / size);\n}\n\nvec4 toAntialias01b(in vec2 size, in vec2 strokeWidth) {\n\treturn antialiasWeight / max(vec4(0.00001), vec4(size - strokeWidth, size));\n}\n\nvoid main(void) {\n\tvec2 p012 = toTransformedPosition( aPosition );\n\n\tfloat type = aClipping.z;\n\tfloat strokeWidthScale = toStrokeWidthScale( aStep.y );\n\tfloat strokeWidth = strokeWidthScale * aStep.x;\n\n\t// type === 0 or 1\n\tvec2 size01 = aAntialias.xy;\n\tvec2 weight01 = abs(aAntialias.zw - sign(aAntialias.zw));\n\tvec2 strokeWidth01 = step(vec2(0.0), aAntialias.zw) * strokeWidth;\n\tvec2 step01 = toStep01( size01, weight01, strokeWidth01 );\n\tvec4 a01 = toAntialias01( toAntialias01b( size01, strokeWidth01 ) );\n\n\t// type === 2\n\tvec4 a2 = toAntialias2( aAntialias, strokeWidth );\n\n\t// type === 3, 4, 5 or 6\n\tfloat shift3456 = 0.0;\n\tvec2 p3456 = toPosition3456( type, aPosition, aAntialias.xy, aAntialias.zw, strokeWidth, shift3456 );\n\tvec2 step3456 = toStep3456( type );\n\tvec4 a3456 = toAntialias3456( strokeWidth );\n\tvec4 colorStroke3456 = toColorStroke3456( shift3456, toDotAndDashScale( aStep.y, strokeWidthScale ) );\n\n\t//\n\tgl_Position = vec4( ( 2.5 < type ? p3456 : p012 ), 0.0, 1.0 );\n\tvAntialias = ( 1.5 < type ? ( 2.5 < type ? a3456 : a2 ) : a01 );\n\tvClipping = aClipping;\n\tvStep = ( 2.5 < type ? step3456 : step01 );\n\tvColorFill = ( 2.5 < type ? aColorStroke : aColorFill );\n\tvColorStroke = ( 2.5 < type ? colorStroke3456 : aColorStroke );\n\tvUv = aUv;\n}";
-    var FRAGMENT_SHADER$1 = "\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float pixelScale;\n\nvoid main(void) {\n\tvec4 texture = texture2D(sampler, vUv);\n\tfloat type = vClipping.z;\n\tvec2 v0 = vStep;\n\tvec2 v1 = vClipping.xy;\n\tvec2 v2 = v0 * vAntialias.xy;\n\tvec2 v3 = v1 * vAntialias.zw;\n\tvec2 d01 = ( v0.x < v0.y ? vec2( v0.y, v2.y ) : vec2( v0.x, v2.x ) );\n\tvec2 d02 = ( v1.x < v1.y ? vec2( v1.y, v3.y ) : vec2( v1.x, v3.x ) );\n\tvec4 d0 = vec4( d01.x, d02.x, d01.y, d02.y );\n\tvec4 d1 = vec4( dot( v0, v0 ), dot( v1, v1 ), dot( v2, v2 ), dot( v3, v3 ) );\n\tvec4 d = ( type == 1.0 ? d1 : d0 );\n\tvec2 s = smoothstep( 1.0 - (d.zw - d.xy), vec2( 1.0 ), d.xy );\n\tvec4 color01 = texture * (vColorStroke * (s.x - s.y) + vColorFill * (1.0 - s.x));\n\n\tfloat l = vColorStroke.x;\n\tfloat lp0 = vColorStroke.y;\n\tfloat lp1 = vColorStroke.z;\n\tfloat lt = vColorStroke.w;\n\tfloat ld = 0.5 * pixelScale;\n\tfloat lm = mod( l, lp0 + lp1 );\n\tfloat ls0 = ( 0.0 < lp1 ? smoothstep( 0.0, ld, lm ) - smoothstep( lp0, lp0 + ld, lm ) : 1.0 );\n\tfloat ls1 = ( 0.0 <= lt ? smoothstep( 0.0, ld, l ) - smoothstep( lt - ld, lt, l ) : 1.0 );\n\tvec4 color3456 = color01 * ls0 * ls1;\n\n\tvec2 a0 = vAntialias.xy;\n\tvec2 a1 = vAntialias.zw;\n\tvec2 a2 = vec2( texture.a );\n\tvec2 a = smoothstep( a0 - a1, a0 + a1, a2 );\n\tvec4 color2 = a.x * vColorFill + ( a.y - a.x ) * vColorStroke;\n\tgl_FragColor = ( type == 2.0 ? color2 : (2.5 < type ? color3456 : color01) );\n}";
+    var FRAGMENT_SHADER$1 = "\nvarying mediump vec3 vClipping;\nvarying mediump vec2 vStep;\nvarying mediump vec4 vAntialias;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float pixelScale;\n\nvec4 color1(float type, vec4 texture) {\n\tvec2 v0 = vStep;\n\tvec2 v1 = vClipping.xy;\n\tvec2 v2 = v0 * vAntialias.xy;\n\tvec2 v3 = v1 * vAntialias.zw;\n\tvec2 d01 = ( v0.x < v0.y ? vec2( v0.y, v2.y ) : vec2( v0.x, v2.x ) );\n\tvec2 d02 = ( v1.x < v1.y ? vec2( v1.y, v3.y ) : vec2( v1.x, v3.x ) );\n\tvec4 d0 = vec4( d01.x, d02.x, d01.y, d02.y );\n\tvec4 d1 = vec4( dot( v0, v0 ), dot( v1, v1 ), dot( v2, v2 ), dot( v3, v3 ) );\n\tvec4 d = (type == 1.0 ? d1 : d0);\n\tvec2 s = smoothstep( 1.0 - (d.zw - d.xy), vec2( 1.0 ), d.xy );\n\treturn texture * (vColorStroke * (s.x - s.y) + vColorFill * (1.0 - s.x));\n}\n\nvec4 color2(float type, vec4 texture) {\n\tvec2 a0 = vAntialias.xy;\n\tvec2 a1 = vAntialias.zw;\n\tvec2 a2 = vec2( (texture.b * 0.00392156862745098 + texture.g) * 0.00392156862745098 + texture.r );\n\tvec2 a = smoothstep( a0 - a1, a0 + a1, a2 );\n\treturn a.x * vColorFill + ( a.y - a.x ) * vColorStroke;\n}\n\nfloat color3456(float type, vec4 texture) {\n\tfloat l = vColorStroke.x;\n\tfloat lp0 = vColorStroke.y;\n\tfloat lp1 = vColorStroke.z;\n\tfloat lt = vColorStroke.w;\n\tfloat ld = 0.5 * pixelScale;\n\tfloat lm = mod( l, lp0 + lp1 );\n\tfloat ls0 = ( 0.0 < lp1 ? smoothstep( 0.0, ld, lm ) - smoothstep( lp0, lp0 + ld, lm ) : 1.0 );\n\tfloat ls1 = ( 0.0 <= lt ? smoothstep( 0.0, ld, l ) - smoothstep( lt - ld, lt, l ) : 1.0 );\n\treturn ls0 * ls1;\n}\n\nvoid main(void) {\n\tfloat type = vClipping.z;\n\tvec4 texture = texture2D(sampler, vUv);\n\tgl_FragColor = (type == 2.0 ?\n\t\tcolor2(type, texture) :\n\t\tcolor1(type, texture) * (2.5 < type ? color3456(type, texture) : 1.0)\n\t);\n}";
     var EShapeRenderer = /** @class */ (function (_super) {
         __extends(EShapeRenderer, _super);
         function EShapeRenderer(renderer) {
@@ -47283,9 +47294,11 @@
             var width = Math.floor(frame.width * resolution);
             var height = Math.floor(frame.height * resolution);
             var pixels = new Uint8Array(4 * width * height);
+            var oldRenderTexture = renderer.renderTexture.current;
             renderer.renderTexture.bind(renderTexture);
             var gl = renderer.gl;
             gl.readPixels(frame.x * resolution, frame.y * resolution, width, height, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
+            renderer.renderTexture.bind(oldRenderTexture);
             return {
                 width: width,
                 height: height,