npm - @wcardinal/wcardinal-ui - Versions diffs - 0.392.0 → 0.394.0 - Mend

@wcardinal/wcardinal-ui 0.392.0 → 0.394.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 (141) hide show

package/dist/wcardinal/ui/shape/variant/builder-line.js CHANGED Viewed

@@ -5,6 +5,7 @@
 import { __extends } from "tslib";
 import { EShapePointsStyle } from "../e-shape-points-style";
 import { buildLineClipping, buildLineIndex, buildLineUv, buildLineVertexStepAndColorFill, toLinePointCount, toLineVertexCount } from "./build-line";
+import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
 var BuilderLine = /** @class */ (function (_super) {
@@ -20,6 +21,7 @@ var BuilderLine = /** @class */ (function (_super) {
     BuilderLine.prototype.init = function (buffer) {
         buffer.updateIndices();
         buildLineIndex(buffer.indices, this.vertexOffset, this.indexOffset, this.indexCount);
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderLine.prototype.isCompatible = function (shape) {
         var vcount = toLineVertexCount(toLinePointCount(shape.points), true);
@@ -36,10 +38,12 @@ var BuilderLine = /** @class */ (function (_super) {
         if (points) {
             var formatted = points.formatted;
             var pointCount = formatted.length;
-            if (this.pointCount !== pointCount) {
+            var isNotInited = !(this.inited & BuilderFlag.CLIPPING);
+            if (isNotInited || this.pointCount !== pointCount) {
+                this.inited |= BuilderFlag.CLIPPING;
                 this.pointCount = pointCount;
-                // Invalidate the pointId to update the vertices
-                this.pointId = -1;
+                // Invalidate the vertex buffer
+                this.inited &= ~BuilderFlag.VERTEX;
                 buffer.updateClippings();
                 buildLineClipping(buffer.clippings, this.vertexOffset, this.vertexCount, pointCount);
             }
@@ -58,15 +62,17 @@ var BuilderLine = /** @class */ (function (_super) {
             var isStrokeWidthChanged = this.strokeWidth !== strokeWidth || this.strokeStyle !== strokeStyle;
             var transformLocalId = toTransformLocalId(shape);
             var isTransformChanged = this.transformLocalId !== transformLocalId;
-            if (isPointChanged || isTransformChanged || isStrokeWidthChanged) {
+            var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_COLOR_FILL);
+            if (isNotInited || isPointChanged || isTransformChanged || isStrokeWidthChanged) {
+                this.inited |= BuilderFlag.VERTEX_STEP_AND_COLOR_FILL;
                 this.pointId = pointId;
                 this.pointsClosed = pointsClosed;
                 this.strokeWidth = strokeWidth;
                 this.strokeStyle = strokeStyle;
                 this.transformLocalId = transformLocalId;
                 if (isPointChanged) {
-                    // Invalidate the texture transform ID to update the UVs
-                    this.textureTransformId = NaN;
+                    // Invalidate the UV buffer
+                    this.inited &= ~BuilderFlag.UV;
                 }
                 buffer.updateVertices();
                 buffer.updateSteps();
@@ -78,7 +84,11 @@ var BuilderLine = /** @class */ (function (_super) {
     BuilderLine.prototype.updateLineUv = function (buffer, shape) {
         var texture = toTexture(shape);
         var textureTransformId = toTextureTransformId(texture);
-        if (texture !== this.texture || textureTransformId !== this.textureTransformId) {
+        var isNotInited = !(this.inited & BuilderFlag.UV);
+        if (isNotInited ||
+            texture !== this.texture ||
+            textureTransformId !== this.textureTransformId) {
+            this.inited |= BuilderFlag.UV;
             this.texture = texture;
             this.textureTransformId = textureTransformId;
             buffer.updateUvs();

package/dist/wcardinal/ui/shape/variant/builder-line.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-line.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-line.ts"],"names":[],"mappings":"AAAA;;;GAGG;;~~AAIH~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EACN,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,+BAA+B,EAC/B,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE/F;IAAiC,+BAAW;IAM3C,qBACC,YAAoB,EACpB,WAAmB,EACnB,WAAmB,EACnB,UAAkB;QAJnB,YAMC,kBAAM,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,SAKzD;QAJA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;QAClB,KAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,KAAI,CAAC,YAAY,GAAG,KAAK,CAAC;QAC1B,KAAI,CAAC,MAAM,GAAG,CAAC,CAAC;;IACjB,CAAC;IAED,0BAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;~~IACtF~~,CAAC;IAED,kCAAY,GAAZ,UAAa,KAAa;QACzB,IAAM,MAAM,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC;QACvE,OAAO,MAAM,KAAK,IAAI,CAAC,WAAW,CAAC;IACpC,CAAC;IAED,4BAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvC,IAAI,CAAC,gCAAgC,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IAES,wCAAkB,GAA5B,UAA6B,~~MAAoB~~,EAAE,KAAa;~~QAC/D~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,EAAE;YACX,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YACnC,IAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC;YACpC,IAAI,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE;~~gBACnC~~,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAE7B~~,gDAAgD~~;~~gBAChD~~,IAAI,CAAC,~~OAAO~~,~~GAAG~~,CAAC,CAAC,CAAC;~~gBAElB~~,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzB,iBAAiB,CAChB,MAAM,CAAC,SAAS,EAChB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,EAChB,UAAU,CACV,CAAC;aACF;SACD;IACF,CAAC;IAES,sDAAgC,GAA1C,UAA2C,~~MAAoB~~,EAAE,KAAa;~~QAC7E~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,EAAE;YACX,IAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;YAC1B,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;YACnC,IAAM,YAAY,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACpE,IAAM,cAAc,GAAG,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,YAAY,KAAK,IAAI,CAAC,YAAY,CAAC;YAEtF,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;YAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;YACjC,IAAM,oBAAoB,GACzB,IAAI,CAAC,WAAW,KAAK,WAAW,IAAI,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;YAEtE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;YAEtE,IAAI,cAAc,IAAI,kBAAkB,IAAI,oBAAoB,EAAE;~~gBACjE~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;gBACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;gBAC/B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;gBAEzC,IAAI,cAAc,EAAE;oBACnB,~~wDAAwD~~;~~oBACxD~~,IAAI,CAAC,~~kBAAkB~~,~~GAAG~~,~~GAAG~~,CAAC;~~iBAC9B~~;gBAED,MAAM,CAAC,cAAc,EAAE,CAAC;gBACxB,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,MAAM,CAAC,gBAAgB,EAAE,CAAC;gBAC1B,IAAI,CAAC,MAAM,GAAG,+BAA+B,CAC5C,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,UAAU,EACjB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,YAAY,EACjB,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,QAAQ,EAClB,WAAW,EACX,WAAW,EACX,KAAK,CAAC,SAAS,CAAC,iBAAiB,CACjC,CAAC;aACF;SACD;IACF,CAAC;IAES,kCAAY,GAAtB,UAAuB,~~MAAoB~~,EAAE,KAAa;~~QACzD~~,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,OAAO,KAAK,IAAI,CAAC,OAAO,~~IAAI,~~kBAAkB,KAAK,IAAI,CAAC,kBAAkB,EAAE;~~YAC/E~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,MAAM,CAAC,SAAS,EAAE,CAAC;YACnB,WAAW,CACV,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,UAAU,EACjB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,WAAW,EAChB,YAAY,CAAC,OAAO,CAAC,EACrB,IAAI,CAAC,MAAM,CACX,CAAC;SACF;IACF,CAAC;IACF,kBAAC;AAAD,CAAC,~~AA9HD~~,CAAiC,WAAW,~~GA8H3C~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from \"../e-shape-buffer\";\nimport {~~ EShapePointsStyle } from \"../e-shape-points-style\";\nimport {\n\tbuildLineClipping,\n\tbuildLineIndex,\n\tbuildLineUv,\n\tbuildLineVertexStepAndColorFill,\n\ttoLinePointCount,\n\ttoLineVertexCount\n} from \"./build-line\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderLine extends BuilderBase {\n\tprotected pointCount: number;\n\tprotected pointId: number;\n\tprotected pointsClosed: boolean;\n\tprotected length: number;\n\n\tconstructor(\n\t\tvertexOffset: number,\n\t\tindexOffset: number,\n\t\tvertexCount: number,\n\t\tindexCount: number\n\t) {\n\t\tsuper(vertexOffset, indexOffset, vertexCount, indexCount);\n\t\tthis.pointId = -1;\n\t\tthis.pointCount = 0;\n\t\tthis.pointsClosed = false;\n\t\tthis.length = 1;\n\t}\n\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateIndices();\n\t\tbuildLineIndex(buffer.indices, this.vertexOffset, this.indexOffset, this.indexCount);\n\t}\n\n\tisCompatible(shape: EShape): boolean {\n\t\tconst vcount = toLineVertexCount(toLinePointCount(shape.points), true);\n\t\treturn vcount === this.vertexCount;\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateLineClipping(buffer, shape);\n\t\tthis.updateLineVertexStepAndColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t\tthis.updateLineUv(buffer, shape);\n\t}\n\n\tprotected updateLineClipping(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points) {\n\t\t\tconst formatted = points.formatted;\n\t\t\tconst pointCount = formatted.length;\n\t\t\tif (this.pointCount !== pointCount) {\n\t\t\t\tthis.pointCount = pointCount;\n\n\t\t\t\t// Invalidate the ~~pointId~~ ~~to update the vertices~~\n\t\t\t\tthis.~~pointId~~ = -1;\n\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildLineClipping(\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tthis.vertexOffset,\n\t\t\t\t\tthis.vertexCount,\n\t\t\t\t\tpointCount\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected updateLineVertexStepAndColorFill(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points) {\n\t\t\tconst pointId = points.id;\n\t\t\tconst formatted = points.formatted;\n\t\t\tconst pointsClosed = !!(formatted.style & EShapePointsStyle.CLOSED);\n\t\t\tconst isPointChanged = pointId !== this.pointId \|\| pointsClosed !== this.pointsClosed;\n\n\t\t\tconst stroke = shape.stroke;\n\t\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\t\tconst strokeStyle = stroke.style;\n\t\t\tconst isStrokeWidthChanged =\n\t\t\t\tthis.strokeWidth !== strokeWidth \|\| this.strokeStyle !== strokeStyle;\n\n\t\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\t\tif (isPointChanged \|\| isTransformChanged \|\| isStrokeWidthChanged) {\n\t\t\t\tthis.pointId = pointId;\n\t\t\t\tthis.pointsClosed = pointsClosed;\n\t\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\t\tthis.transformLocalId = transformLocalId;\n\n\t\t\t\tif (isPointChanged) {\n\t\t\t\t\t// Invalidate the ~~texture~~ ~~transform ID to update the UVs~~\n\t\t\t\t\tthis.~~textureTransformId~~ = ~~NaN~~;\n\t\t\t\t}\n\n\t\t\t\tbuffer.updateVertices();\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuffer.updateColorFills();\n\t\t\t\tthis.length = buildLineVertexStepAndColorFill(\n\t\t\t\t\tbuffer.vertices,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tbuffer.colorFills,\n\t\t\t\t\tthis.vertexOffset,\n\t\t\t\t\tthis.vertexCount,\n\t\t\t\t\tthis.pointCount,\n\t\t\t\t\tthis.pointsClosed,\n\t\t\t\t\tformatted.values,\n\t\t\t\t\tformatted.segments,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tshape.transform.internalTransform\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected updateLineUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tif (~~texture~~ !== this.texture \|\| ~~textureTransformId~~ !== this.textureTransformId) {\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\tbuffer.updateUvs();\n\t\t\tbuildLineUv(\n\t\t\t\tbuffer.uvs,\n\t\t\t\tbuffer.colorFills,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\tthis.vertexCount,\n\t\t\t\ttoTextureUvs(texture),\n\t\t\t\tthis.length\n\t\t\t);\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-line.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-line.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapePointsStyle } from \"../e-shape-points-style\";\nimport {\n\tbuildLineClipping,\n\tbuildLineIndex,\n\tbuildLineUv,\n\tbuildLineVertexStepAndColorFill,\n\ttoLinePointCount,\n\ttoLineVertexCount\n} from \"./build-line\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderLine extends BuilderBase {\n\tprotected pointCount: number;\n\tprotected pointId: number;\n\tprotected pointsClosed: boolean;\n\tprotected length: number;\n\n\tconstructor(\n\t\tvertexOffset: number,\n\t\tindexOffset: number,\n\t\tvertexCount: number,\n\t\tindexCount: number\n\t) {\n\t\tsuper(vertexOffset, indexOffset, vertexCount, indexCount);\n\t\tthis.pointId = -1;\n\t\tthis.pointCount = 0;\n\t\tthis.pointsClosed = false;\n\t\tthis.length = 1;\n\t}\n\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateIndices();\n\t\tbuildLineIndex(buffer.indices, this.vertexOffset, this.indexOffset, this.indexCount);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\tisCompatible(shape: EShape): boolean {\n\t\tconst vcount = toLineVertexCount(toLinePointCount(shape.points), true);\n\t\treturn vcount === this.vertexCount;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateLineClipping(buffer, shape);\n\t\tthis.updateLineVertexStepAndColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t\tthis.updateLineUv(buffer, shape);\n\t}\n\n\tprotected updateLineClipping(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points) {\n\t\t\tconst formatted = points.formatted;\n\t\t\tconst pointCount = formatted.length;\n\t\t\tconst isNotInited = !(this.inited & BuilderFlag.CLIPPING);\n\t\t\tif (isNotInited \|\| this.pointCount !== pointCount) {\n\t\t\t\tthis.inited \|= BuilderFlag.CLIPPING;\n\t\t\t\tthis.pointCount = pointCount;\n\n\t\t\t\t// Invalidate the vertex buffer\n\t\t\t\tthis.inited &= ~BuilderFlag.VERTEX;\n\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildLineClipping(\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tthis.vertexOffset,\n\t\t\t\t\tthis.vertexCount,\n\t\t\t\t\tpointCount\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected updateLineVertexStepAndColorFill(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points) {\n\t\t\tconst pointId = points.id;\n\t\t\tconst formatted = points.formatted;\n\t\t\tconst pointsClosed = !!(formatted.style & EShapePointsStyle.CLOSED);\n\t\t\tconst isPointChanged = pointId !== this.pointId \|\| pointsClosed !== this.pointsClosed;\n\n\t\t\tconst stroke = shape.stroke;\n\t\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\t\tconst strokeStyle = stroke.style;\n\t\t\tconst isStrokeWidthChanged =\n\t\t\t\tthis.strokeWidth !== strokeWidth \|\| this.strokeStyle !== strokeStyle;\n\n\t\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_COLOR_FILL);\n\n\t\t\tif (isNotInited \|\| isPointChanged \|\| isTransformChanged \|\| isStrokeWidthChanged) {\n\t\t\t\tthis.inited \|= BuilderFlag.VERTEX_STEP_AND_COLOR_FILL;\n\t\t\t\tthis.pointId = pointId;\n\t\t\t\tthis.pointsClosed = pointsClosed;\n\t\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\t\tthis.transformLocalId = transformLocalId;\n\n\t\t\t\tif (isPointChanged) {\n\t\t\t\t\t// Invalidate the UV buffer\n\t\t\t\t\tthis.inited &= ~BuilderFlag.UV;\n\t\t\t\t}\n\n\t\t\t\tbuffer.updateVertices();\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuffer.updateColorFills();\n\t\t\t\tthis.length = buildLineVertexStepAndColorFill(\n\t\t\t\t\tbuffer.vertices,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tbuffer.colorFills,\n\t\t\t\t\tthis.vertexOffset,\n\t\t\t\t\tthis.vertexCount,\n\t\t\t\t\tthis.pointCount,\n\t\t\t\t\tthis.pointsClosed,\n\t\t\t\t\tformatted.values,\n\t\t\t\t\tformatted.segments,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tshape.transform.internalTransform\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected updateLineUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isNotInited = !(this.inited & BuilderFlag.UV);\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\ttexture !== this.texture \|\|\n\t\t\ttextureTransformId !== this.textureTransformId\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.UV;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\tbuffer.updateUvs();\n\t\t\tbuildLineUv(\n\t\t\t\tbuffer.uvs,\n\t\t\t\tbuffer.colorFills,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\tthis.vertexCount,\n\t\t\t\ttoTextureUvs(texture),\n\t\t\t\tthis.length\n\t\t\t);\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-marker-base.js CHANGED Viewed

@@ -4,6 +4,7 @@
  */
 import { __extends } from "tslib";
 import { buildColor } from "./build-color";
+import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 var BuilderMarkerBase = /** @class */ (function (_super) {
     __extends(BuilderMarkerBase, _super);
@@ -24,7 +25,9 @@ var BuilderMarkerBase = /** @class */ (function (_super) {
         var isEnabled = shape.visible && fill.enable;
         var color = fill.color;
         var alpha = isEnabled ? fill.alpha : 0;
-        if (color !== this.colorFill || alpha !== this.alphaFill) {
+        var isNotInited = !(this.inited & BuilderFlag.COLOR_FILL);
+        if (isNotInited || color !== this.colorFill || alpha !== this.alphaFill) {
+            this.inited |= BuilderFlag.COLOR_FILL;
             this.colorFill = color;
             this.alphaFill = alpha;
             buffer.updateColorFills();

package/dist/wcardinal/ui/shape/variant/builder-marker-base.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-marker-base.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-base.ts"],"names":[],"mappings":"AAAA;;;GAGG;;~~AAMH~~,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;IAAgD,qCAAW;IAA3D;;~~IAyBA~~,CAAC;~~IAxBU~~,2CAAe,GAAzB,UAA0B,~~MAAoB~~,EAAE,KAAa;~~QAC5D~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC;QAC/C,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,EAAE;~~YACzD~~,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAE1B,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;SACjF;IACF,CAAC;IAGF,wBAAC;AAAD,CAAC,~~AAzBD~~,CAAgD,WAAW,~~GAyB1D~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer~~ } from \"../e-shape-~~buffer~~\";\nimport { ~~EShapePointsMarker~~ } from \"../e-shape-points-marker\";\nimport { ~~EShapePointsMarkerContainer~~ } from \"~~../e~~-~~shape-points-marker-container~~\";\nimport { ~~buildColor~~ } from \"./~~build-color~~\";\nimport { BuilderBase } from \"./builder-base\";\n\nexport abstract class BuilderMarkerBase extends BuilderBase {\n\tprotected updateColorFill(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst fill = marker.fill;\n\t\tconst isEnabled = shape.visible && fill.enable;\n\t\tconst color = fill.color;\n\t\tconst alpha = isEnabled ? fill.alpha : 0;\n\t\tif (color !== this.colorFill \|\| alpha !== this.alphaFill) {\n\t\t\tthis.colorFill = color;\n\t\t\tthis.alphaFill = alpha;\n\t\t\tbuffer.updateColorFills();\n\n\t\t\tbuildColor(color, alpha, this.vertexOffset, this.vertexCount, buffer.colorFills);\n\t\t}\n\t}\n\n\tprotected abstract toMarker(container: EShapePointsMarkerContainer): EShapePointsMarker;\n}\n"]}
1	+ {"version":3,"file":"builder-marker-base.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-base.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAKH,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;IAAgD,qCAAW;IAA3D;;IA2BA,CAAC;IA1BU,2CAAe,GAAzB,UAA0B,MAAqB,EAAE,KAAa;QAC7D,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,SAAS,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC;QAC/C,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,WAAW,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,SAAS,EAAE;YACxE,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,UAAU,CAAC;YACtC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAE1B,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;SACjF;IACF,CAAC;IAGF,wBAAC;AAAD,CAAC,AA3BD,CAAgD,WAAW,GA2B1D","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapePointsMarker } from \"../e-shape-points-marker\";\nimport { EShapePointsMarkerContainer } from \"../e-shape-points-marker-container\";\nimport { buildColor } from \"./build-color\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\n\nexport abstract class BuilderMarkerBase extends BuilderBase {\n\tprotected updateColorFill(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst fill = marker.fill;\n\t\tconst isEnabled = shape.visible && fill.enable;\n\t\tconst color = fill.color;\n\t\tconst alpha = isEnabled ? fill.alpha : 0;\n\t\tconst isNotInited = !(this.inited & BuilderFlag.COLOR_FILL);\n\t\tif (isNotInited \|\| color !== this.colorFill \|\| alpha !== this.alphaFill) {\n\t\t\tthis.inited \|= BuilderFlag.COLOR_FILL;\n\t\t\tthis.colorFill = color;\n\t\t\tthis.alphaFill = alpha;\n\t\t\tbuffer.updateColorFills();\n\n\t\t\tbuildColor(color, alpha, this.vertexOffset, this.vertexCount, buffer.colorFills);\n\t\t}\n\t}\n\n\tprotected abstract toMarker(container: EShapePointsMarkerContainer): EShapePointsMarker;\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-marker-circle.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { Matrix } from "pixi.js";
 import { buildCircleClipping, buildCircleIndex, buildCircleStep, buildCircleUv, buildCircleVertex, CIRCLE_INDEX_COUNT, CIRCLE_VERTEX_COUNT, CIRCLE_WORLD_SIZE } from "./build-circle";
 import { BuilderMarkerBase } from "./builder-marker-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
+import { BuilderFlag } from "./builder";
 var BuilderMarkerCircle = /** @class */ (function (_super) {
     __extends(BuilderMarkerCircle, _super);
     function BuilderMarkerCircle(vertexOffset, indexOffset) {
@@ -20,6 +21,7 @@ var BuilderMarkerCircle = /** @class */ (function (_super) {
         var vertexOffset = this.vertexOffset;
         buildCircleClipping(buffer.clippings, vertexOffset);
         buildCircleIndex(buffer.indices, vertexOffset, this.indexOffset);
+        this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
     };
     BuilderMarkerCircle.prototype.update = function (buffer, shape) {
         this.updateVertexAndStep(buffer, shape);
@@ -53,7 +55,13 @@ var BuilderMarkerCircle = /** @class */ (function (_super) {
             this.strokeStyle !== strokeStyle;
         var pointId = points.id;
         var isPointChanged = pointId !== this.pointId;
-        if (isSizeChanged || isTransformChanged || isStrokeChanged || isPointChanged) {
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_AND_STEP);
+        if (isNotInited ||
+            isSizeChanged ||
+            isTransformChanged ||
+            isStrokeChanged ||
+            isPointChanged) {
+            this.inited |= BuilderFlag.VERTEX_AND_STEP;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -73,7 +81,11 @@ var BuilderMarkerCircle = /** @class */ (function (_super) {
     BuilderMarkerCircle.prototype.updateUv = function (buffer, shape) {
         var texture = toTexture(shape);
         var textureTransformId = toTextureTransformId(texture);
-        if (texture !== this.texture || textureTransformId !== this.textureTransformId) {
+        var isNotInited = !(this.inited & BuilderFlag.UV);
+        if (isNotInited ||
+            texture !== this.texture ||
+            textureTransformId !== this.textureTransformId) {
+            this.inited |= BuilderFlag.UV;
             this.texture = texture;
             this.textureTransformId = textureTransformId;
             buffer.updateUvs();

package/dist/wcardinal/ui/shape/variant/builder-marker-circle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-marker-circle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-circle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;~~AAGjC~~,OAAO,EACN,mBAAmB,EACnB,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;~~AAE~~/F;IAAkD,uCAAiB;IAIlE,6BAAY,YAAoB,EAAE,WAAmB;QAArD,YACC,kBAAM,YAAY,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,CAAC,SAEzE;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAED,kCAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,IAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACvC,mBAAmB,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACpD,gBAAgB,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;~~IAClE~~,CAAC;IAED,oCAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IAES,iDAAmB,GAA7B,UAA8B,~~MAAoB~~,EAAE,KAAa;;~~QAChE~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QAEnE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAM,cAAc,GAAG,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;QAEhD,IAAI,aAAa,~~IAAI,~~kBAAkB,IAAI,~~eAAe~~,IAAI,~~cAAc~~,~~EAAE~~;~~YAC7E~~,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YAEvB,SAAS;YACT,IAAM,iBAAiB,GAAG,OAAC,mBAAmB,CAAC,IAAI,oCAAxB,mBAAmB,CAAC,IAAI,GAAK,IAAI,MAAM,EAAE,EAAC,CAAC;YACtE,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YACxF,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,iBAAiB,CAChB,MAAM,CAAC,QAAQ,EACf,IAAI,CAAC,YAAY,EACjB,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,iBAAiB,CACjB,CAAC;YACF,eAAe,CACd,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,SAAS,EAChB,IAAI,CAAC,YAAY,EACjB,WAAW,EACX,WAAW,EACX,iBAAiB,CACjB,CAAC;SACF;IACF,CAAC;IAES,sCAAQ,GAAlB,UAAmB,~~MAAoB~~,EAAE,KAAa;~~QACrD~~,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,OAAO,KAAK,IAAI,CAAC,OAAO,~~IAAI,~~kBAAkB,KAAK,IAAI,CAAC,kBAAkB,EAAE;~~YAC/E~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,MAAM,CAAC,SAAS,EAAE,CAAC;YACnB,IAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;YACzC,aAAa,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SACzD;IACF,CAAC;IACF,0BAAC;AAAD,CAAC,~~AAvGD~~,CAAkD,iBAAiB,~~GAuGlE~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from~~ \~~"../e-shape-buffer\";\nimport {\~~n\tbuildCircleClipping,\n\tbuildCircleIndex,\n\tbuildCircleStep,\n\tbuildCircleUv,\n\tbuildCircleVertex,\n\tCIRCLE_INDEX_COUNT,\n\tCIRCLE_VERTEX_COUNT,\n\tCIRCLE_WORLD_SIZE\n} from \"./build-circle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport abstract class BuilderMarkerCircle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateClippings();\n\t\tbuffer.updateIndices();\n\t\tconst vertexOffset = this.vertexOffset;\n\t\tbuildCircleClipping(buffer.clippings, vertexOffset);\n\t\tbuildCircleIndex(buffer.indices, vertexOffset, this.indexOffset);\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateVertexAndStep(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t\tthis.updateUv(buffer, shape);\n\t}\n\n\tprotected updateVertexAndStep(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\~~tif~~ (~~isSizeChanged~~ \|\| ~~isTransformChanged~~ \|\| ~~isStrokeChanged~~ \|\| ~~isPointChanged~~) {\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.pointId = pointId;\n\n\t\t\t// Buffer\n\t\t\tconst internalTransform = (BuilderMarkerCircle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuffer.updateSteps();\n\t\t\tbuildCircleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tCIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t\tbuildCircleStep(\n\t\t\t\tbuffer.steps,\n\t\t\t\tbuffer.clippings,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\tstrokeWidth,\n\t\t\t\tstrokeStyle,\n\t\t\t\tCIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t}\n\t}\n\n\tprotected updateUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tif (~~texture~~ !== this.texture \|\| ~~textureTransformId~~ !== this.textureTransformId) {\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\tbuffer.updateUvs();\n\t\t\tconst textureUvs = toTextureUvs(texture);\n\t\t\tbuildCircleUv(buffer.uvs, this.vertexOffset, textureUvs);\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-marker-circle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-circle.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport {\n\tbuildCircleClipping,\n\tbuildCircleIndex,\n\tbuildCircleStep,\n\tbuildCircleUv,\n\tbuildCircleVertex,\n\tCIRCLE_INDEX_COUNT,\n\tCIRCLE_VERTEX_COUNT,\n\tCIRCLE_WORLD_SIZE\n} from \"./build-circle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\n\nexport abstract class BuilderMarkerCircle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateClippings();\n\t\tbuffer.updateIndices();\n\t\tconst vertexOffset = this.vertexOffset;\n\t\tbuildCircleClipping(buffer.clippings, vertexOffset);\n\t\tbuildCircleIndex(buffer.indices, vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.CLIPPING_AND_INDEX;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateVertexAndStep(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t\tthis.updateUv(buffer, shape);\n\t}\n\n\tprotected updateVertexAndStep(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_AND_STEP);\n\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\tisSizeChanged \|\|\n\t\t\tisTransformChanged \|\|\n\t\t\tisStrokeChanged \|\|\n\t\t\tisPointChanged\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.VERTEX_AND_STEP;\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.pointId = pointId;\n\n\t\t\t// Buffer\n\t\t\tconst internalTransform = (BuilderMarkerCircle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuffer.updateSteps();\n\t\t\tbuildCircleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tCIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t\tbuildCircleStep(\n\t\t\t\tbuffer.steps,\n\t\t\t\tbuffer.clippings,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\tstrokeWidth,\n\t\t\t\tstrokeStyle,\n\t\t\t\tCIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t}\n\t}\n\n\tprotected updateUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isNotInited = !(this.inited & BuilderFlag.UV);\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\ttexture !== this.texture \|\|\n\t\t\ttextureTransformId !== this.textureTransformId\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.UV;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\tbuffer.updateUvs();\n\t\t\tconst textureUvs = toTextureUvs(texture);\n\t\t\tbuildCircleUv(buffer.uvs, this.vertexOffset, textureUvs);\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-marker-rectangle.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { Matrix } from "pixi.js";
 import { buildRectangleClipping, buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_INDEX_COUNT, RECTANGLE_VERTEX_COUNT, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
 import { BuilderMarkerBase } from "./builder-marker-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
+import { BuilderFlag } from "./builder";
 var BuilderMarkerRectangle = /** @class */ (function (_super) {
     __extends(BuilderMarkerRectangle, _super);
     function BuilderMarkerRectangle(vertexOffset, indexOffset) {
@@ -17,6 +18,7 @@ var BuilderMarkerRectangle = /** @class */ (function (_super) {
     BuilderMarkerRectangle.prototype.init = function (buffer) {
         buffer.updateIndices();
         buildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderMarkerRectangle.prototype.update = function (buffer, shape) {
         this.updateVertexClippingStepAndUv(buffer, shape);
@@ -55,7 +57,13 @@ var BuilderMarkerRectangle = /** @class */ (function (_super) {
         var isVertexChanged = isSizeChanged || isStrokeChanged;
         var pointId = points.id;
         var isPointChanged = pointId !== this.pointId;
-        if (isVertexChanged || isTransformChanged || isTextureChanged || isPointChanged) {
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        if (isNotInited ||
+            isVertexChanged ||
+            isTransformChanged ||
+            isTextureChanged ||
+            isPointChanged) {
+            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -72,17 +80,17 @@ var BuilderMarkerRectangle = /** @class */ (function (_super) {
             buffer.updateVertices();
             buildRectangleVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, RECTANGLE_WORLD_SIZE);
             // Steps
-            if (isVertexChanged || isTransformChanged) {
+            if (isNotInited || isVertexChanged || isTransformChanged) {
                 buffer.updateSteps();
                 buildRectangleStep(voffset, buffer.steps, strokeWidth, strokeSide, strokeStyle, RECTANGLE_WORLD_SIZE);
             }
             // Clippings
-            if (isVertexChanged) {
+            if (isNotInited || isVertexChanged) {
                 buffer.updateClippings();
                 buildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);
             }
             // UVs
-            if (isVertexChanged || isTextureChanged) {
+            if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
                 buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);
             }

package/dist/wcardinal/ui/shape/variant/builder-marker-rectangle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-marker-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-rectangle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;~~AAGjC~~,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;~~AAE~~/F;IAAqD,0CAAiB;IAIrE,gCAAY,YAAoB,EAAE,WAAmB;QAArD,YACC,kBAAM,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,SAE/E;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAED,qCAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;~~IAC1E~~,CAAC;IAED,uCAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAES,8DAA6B,GAAvC,UAAwC,~~MAAoB~~,EAAE,KAAa;;~~QAC1E~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QAEnE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,UAAU,KAAK,UAAU;YAC9B,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,gBAAgB,GACrB,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,CAAC;QAE5E,IAAM,eAAe,GAAG,aAAa,IAAI,eAAe,CAAC;QAEzD,IAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAM,cAAc,GAAG,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;QAEhD,IAAI,eAAe,~~IAAI,~~kBAAkB,IAAI,~~gBAAgB~~,IAAI,~~cAAc~~,~~EAAE~~;~~YAChF~~,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,WAAW;YACX,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YAClC,IAAM,iBAAiB,GAAG,OAAC,sBAAsB,CAAC,IAAI,oCAA3B,sBAAsB,CAAC,IAAI,GAAK,IAAI,MAAM,EAAE,EAAC,CAAC;YACzE,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YACxF,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,oBAAoB,CACnB,MAAM,CAAC,QAAQ,EACf,OAAO,EACP,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,oBAAoB,CACpB,CAAC;YAEF,QAAQ;YACR,IAAI,eAAe,IAAI,kBAAkB,EAAE;~~gBAC1C~~,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,kBAAkB,CACjB,OAAO,EACP,MAAM,CAAC,KAAK,EACZ,WAAW,EACX,UAAU,EACV,WAAW,EACX,oBAAoB,CACpB,CAAC;aACF;YAED,YAAY;YACZ,IAAI,eAAe,EAAE;~~gBACpB~~,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;aACxE;YAED,MAAM;YACN,IAAI,eAAe,IAAI,gBAAgB,EAAE;~~gBACxC~~,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,CAAC;aACnF;SACD;IACF,CAAC;IACF,6BAAC;AAAD,CAAC,~~AAlHD~~,CAAqD,iBAAiB,~~GAkHrE~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from~~ \~~"../e-shape-buffer\";\nimport {\~~n\tbuildRectangleClipping,\n\tbuildRectangleIndex,\n\tbuildRectangleStep,\n\tbuildRectangleUv,\n\tbuildRectangleVertex,\n\tRECTANGLE_INDEX_COUNT,\n\tRECTANGLE_VERTEX_COUNT,\n\tRECTANGLE_WORLD_SIZE\n} from \"./build-rectangle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport abstract class BuilderMarkerRectangle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\~~tif~~ (~~isVertexChanged~~ \|\| ~~isTransformChanged~~ \|\| ~~isTextureChanged~~ \|\| ~~isPointChanged~~) {\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tconst internalTransform = (BuilderMarkerRectangle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleStep(\n\t\t\t\t\tvoffset,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isVertexChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-marker-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-rectangle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC/F,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvD;IAAqD,0CAAiB;IAIrE,gCAAY,YAAoB,EAAE,WAAmB;QAArD,YACC,kBAAM,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,SAE/E;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAED,qCAAI,GAAJ,UAAK,MAAqB;QACzB,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACzE,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,KAAK,CAAC;IAClC,CAAC;IAED,uCAAM,GAAN,UAAO,MAAqB,EAAE,KAAa;QAC1C,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAES,8DAA6B,GAAvC,UAAwC,MAAqB,EAAE,KAAa;;QAC3E,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QAEnE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,UAAU,KAAK,UAAU;YAC9B,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,gBAAgB,GACrB,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,CAAC;QAE5E,IAAM,eAAe,GAAG,aAAa,IAAI,eAAe,CAAC;QAEzD,IAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAM,cAAc,GAAG,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;QAEhD,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,2BAA2B,CAAC,CAAC;QAE7E,IACC,WAAW;YACX,eAAe;YACf,kBAAkB;YAClB,gBAAgB;YAChB,cAAc,EACb;YACD,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,2BAA2B,CAAC;YACvD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,WAAW;YACX,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YAClC,IAAM,iBAAiB,GAAG,OAAC,sBAAsB,CAAC,IAAI,oCAA3B,sBAAsB,CAAC,IAAI,GAAK,IAAI,MAAM,EAAE,EAAC,CAAC;YACzE,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YACxF,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,oBAAoB,CACnB,MAAM,CAAC,QAAQ,EACf,OAAO,EACP,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,oBAAoB,CACpB,CAAC;YAEF,QAAQ;YACR,IAAI,WAAW,IAAI,eAAe,IAAI,kBAAkB,EAAE;gBACzD,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,kBAAkB,CACjB,OAAO,EACP,MAAM,CAAC,KAAK,EACZ,WAAW,EACX,UAAU,EACV,WAAW,EACX,oBAAoB,CACpB,CAAC;aACF;YAED,YAAY;YACZ,IAAI,WAAW,IAAI,eAAe,EAAE;gBACnC,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;aACxE;YAED,MAAM;YACN,IAAI,WAAW,IAAI,eAAe,IAAI,gBAAgB,EAAE;gBACvD,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,CAAC;aACnF;SACD;IACF,CAAC;IACF,6BAAC;AAAD,CAAC,AA5HD,CAAqD,iBAAiB,GA4HrE","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport {\n\tbuildRectangleClipping,\n\tbuildRectangleIndex,\n\tbuildRectangleStep,\n\tbuildRectangleUv,\n\tbuildRectangleVertex,\n\tRECTANGLE_INDEX_COUNT,\n\tRECTANGLE_VERTEX_COUNT,\n\tRECTANGLE_WORLD_SIZE\n} from \"./build-rectangle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\n\nexport abstract class BuilderMarkerRectangle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);\n\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\tisVertexChanged \|\|\n\t\t\tisTransformChanged \|\|\n\t\t\tisTextureChanged \|\|\n\t\t\tisPointChanged\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tconst internalTransform = (BuilderMarkerRectangle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleStep(\n\t\t\t\t\tvoffset,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isNotInited \|\| isVertexChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-marker-triangle.js CHANGED Viewed

@@ -7,6 +7,7 @@ import { Matrix } from "pixi.js";
 import { buildTriangleClipping, buildTriangleIndex, buildTriangleStep, buildTriangleUv, buildTriangleVertex, TRIANGLE_INDEX_COUNT, TRIANGLE_VERTEX_COUNT, TRIANGLE_WORLD_SIZE } from "./build-triangle";
 import { BuilderMarkerBase } from "./builder-marker-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
+import { BuilderFlag } from "./builder";
 var BuilderMarkerTriangle = /** @class */ (function (_super) {
     __extends(BuilderMarkerTriangle, _super);
     function BuilderMarkerTriangle(vertexOffset, indexOffset) {
@@ -19,6 +20,7 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
         buffer.updateIndices();
         buildTriangleClipping(buffer.clippings, this.vertexOffset);
         buildTriangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
+        this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
     };
     BuilderMarkerTriangle.prototype.update = function (buffer, shape) {
         this.updateVertexStepAndUv(buffer, shape);
@@ -55,7 +57,13 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
         var isVertexChanged = isSizeChanged || isStrokeChanged;
         var pointId = points.id;
         var isPointChanged = pointId !== this.pointId;
-        if (isVertexChanged || isTransformChanged || isTextureChanged || isPointChanged) {
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
+        if (isNotInited ||
+            isVertexChanged ||
+            isTransformChanged ||
+            isTextureChanged ||
+            isPointChanged) {
+            this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -70,11 +78,11 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
             internalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);
             buffer.updateVertices();
             buildTriangleVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, TRIANGLE_WORLD_SIZE);
-            if (isVertexChanged || isTransformChanged) {
+            if (isNotInited || isVertexChanged || isTransformChanged) {
                 buffer.updateSteps();
                 buildTriangleStep(buffer.steps, buffer.clippings, voffset, TRIANGLE_VERTEX_COUNT, strokeWidth, strokeStyle, TRIANGLE_WORLD_SIZE);
             }
-            if (isVertexChanged || isTextureChanged) {
+            if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
                 buildTriangleUv(buffer.uvs, toTextureUvs(texture), voffset, TRIANGLE_WORLD_SIZE);
             }

package/dist/wcardinal/ui/shape/variant/builder-marker-triangle.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-marker-triangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-triangle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;~~AAGjC~~,OAAO,EACN,qBAAqB,EACrB,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;~~AAE~~/F;IAAoD,yCAAiB;IAIpE,+BAAY,YAAoB,EAAE,WAAmB;QAArD,YACC,kBAAM,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,SAE7E;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAED,oCAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,eAAe,EAAE,CAAC;QACzB,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,qBAAqB,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3D,kBAAkB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;~~IACzE~~,CAAC;IAED,sCAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAES,qDAAqB,GAA/B,UAAgC,~~MAAoB~~,EAAE,KAAa;;~~QAClE~~,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAI,MAAM,IAAI,IAAI,EAAE;YACnB,OAAO;SACP;QACD,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;QACrC,IAAI,SAAS,IAAI,IAAI,EAAE;YACtB,OAAO;SACP;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACxC,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QAEnE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,gBAAgB,GACrB,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,CAAC;QAE5E,IAAM,eAAe,GAAG,aAAa,IAAI,eAAe,CAAC;QAEzD,IAAM,OAAO,GAAG,MAAM,CAAC,EAAE,CAAC;QAC1B,IAAM,cAAc,GAAG,OAAO,KAAK,IAAI,CAAC,OAAO,CAAC;QAEhD,~~IAAI~~,~~eAAe~~,IAAI,kBAAkB,~~IAAI~~,gBAAgB,IAAI,~~cAAc~~,~~EAAE~~;~~YAChF~~,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YAEvB,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YAClC,IAAM,iBAAiB,GAAG,OAAC,qBAAqB,CAAC,IAAI,oCAA1B,qBAAqB,CAAC,IAAI,GAAK,IAAI,MAAM,EAAE,EAAC,CAAC;YACxE,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YACxF,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,mBAAmB,CAClB,MAAM,CAAC,QAAQ,EACf,OAAO,EACP,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,iBAAiB,EACjB,mBAAmB,CACnB,CAAC;YAEF,IAAI,eAAe,IAAI,kBAAkB,EAAE;~~gBAC1C~~,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,iBAAiB,CAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,SAAS,EAChB,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,WAAW,EACX,mBAAmB,CACnB,CAAC;aACF;YAED,IAAI,eAAe,IAAI,gBAAgB,EAAE;~~gBACxC~~,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,eAAe,CAAC,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC;aACjF;SACD;IACF,CAAC;IACF,4BAAC;AAAD,CAAC,~~AA1GD~~,CAAoD,iBAAiB,~~GA0GpE~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from~~ \~~"../e-shape-buffer\";\nimport {\~~n\tbuildTriangleClipping,\n\tbuildTriangleIndex,\n\tbuildTriangleStep,\n\tbuildTriangleUv,\n\tbuildTriangleVertex,\n\tTRIANGLE_INDEX_COUNT,\n\tTRIANGLE_VERTEX_COUNT,\n\tTRIANGLE_WORLD_SIZE\n} from \"./build-triangle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport abstract class BuilderMarkerTriangle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateClippings();\n\t\tbuffer.updateIndices();\n\t\tbuildTriangleClipping(buffer.clippings, this.vertexOffset);\n\t\tbuildTriangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexStepAndUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\~~tif~~ (~~isVertexChanged~~ \|\| ~~isTransformChanged~~ \|\| ~~isTextureChanged~~ \|\| ~~isPointChanged~~) {\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\t\t\tthis.pointId = pointId;\n\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tconst internalTransform = (BuilderMarkerTriangle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildTriangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tTRIANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\tif (isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildTriangleStep(\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tTRIANGLE_VERTEX_COUNT,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tTRIANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tif (isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildTriangleUv(buffer.uvs, toTextureUvs(texture), voffset, TRIANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-marker-triangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-marker-triangle.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { Matrix } from \"pixi.js\";\nimport { EShape } from \"../e-shape\";\nimport {\n\tbuildTriangleClipping,\n\tbuildTriangleIndex,\n\tbuildTriangleStep,\n\tbuildTriangleUv,\n\tbuildTriangleVertex,\n\tTRIANGLE_INDEX_COUNT,\n\tTRIANGLE_VERTEX_COUNT,\n\tTRIANGLE_WORLD_SIZE\n} from \"./build-triangle\";\nimport { BuilderMarkerBase } from \"./builder-marker-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\n\nexport abstract class BuilderMarkerTriangle extends BuilderMarkerBase {\n\tprotected static WORK?: Matrix;\n\tprotected pointId: number;\n\n\tconstructor(vertexOffset: number, indexOffset: number) {\n\t\tsuper(vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateClippings();\n\t\tbuffer.updateIndices();\n\t\tbuildTriangleClipping(buffer.clippings, this.vertexOffset);\n\t\tbuildTriangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.CLIPPING_AND_INDEX;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexStepAndUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst points = shape.points;\n\t\tif (points == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst container = points.getMarker();\n\t\tif (container == null) {\n\t\t\treturn;\n\t\t}\n\t\tconst marker = this.toMarker(container);\n\t\tconst size = marker.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst pointId = points.id;\n\t\tconst isPointChanged = pointId !== this.pointId;\n\n\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);\n\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\tisVertexChanged \|\|\n\t\t\tisTransformChanged \|\|\n\t\t\tisTextureChanged \|\|\n\t\t\tisPointChanged\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.VERTEX_STEP_AND_UV;\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\t\t\tthis.pointId = pointId;\n\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tconst internalTransform = (BuilderMarkerTriangle.WORK ??= new Matrix());\n\t\t\tinternalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildTriangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tinternalTransform,\n\t\t\t\tTRIANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildTriangleStep(\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tTRIANGLE_VERTEX_COUNT,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tTRIANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildTriangleUv(buffer.uvs, toTextureUvs(texture), voffset, TRIANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-rectangle-pivoted.js CHANGED Viewed

@@ -4,6 +4,7 @@
  */
 import { __extends } from "tslib";
 import { buildRectangleClipping, buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
+import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
 var BuilderRectanglePivoted = /** @class */ (function (_super) {
@@ -14,6 +15,7 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
     BuilderRectanglePivoted.prototype.init = function (buffer) {
         buffer.updateIndices();
         buildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderRectanglePivoted.prototype.update = function (buffer, shape) {
         this.updateVertexClippingStepAndUv(buffer, shape);
@@ -40,7 +42,9 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
         var textureTransformId = toTextureTransformId(texture);
         var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
         var isVertexChanged = isSizeChanged || isStrokeChanged;
-        if (isVertexChanged || isTransformChanged || isTextureChanged) {
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        if (isNotInited || isVertexChanged || isTransformChanged || isTextureChanged) {
+            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -55,17 +59,17 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
             buffer.updateVertices();
             buildRectangleVertex(buffer.vertices, voffset, 0.5 * sizeX, 0.5 * sizeY, sizeX, sizeY, strokeAlign, strokeWidth, shape.transform.internalTransform, RECTANGLE_WORLD_SIZE);
             // Steps
-            if (isVertexChanged || isTransformChanged) {
+            if (isNotInited || isVertexChanged || isTransformChanged) {
                 buffer.updateSteps();
                 buildRectangleStep(voffset, buffer.steps, strokeWidth, strokeSide, strokeStyle, RECTANGLE_WORLD_SIZE);
             }
             // Clippings
-            if (isVertexChanged) {
+            if (isNotInited || isVertexChanged) {
                 buffer.updateClippings();
                 buildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);
             }
             // UVs
-            if (isVertexChanged || isTextureChanged) {
+            if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
                 buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);
             }

package/dist/wcardinal/ui/shape/variant/builder-rectangle-pivoted.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-rectangle-pivoted.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle-pivoted.ts"],"names":[],"mappings":"AAAA;;;GAGG;;~~AAIH~~,OAAO,EACN,sBAAsB,EACtB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE/F;IAA6C,2CAAW;IAAxD;;~~IA4FA~~,CAAC;~~IA3FA~~,sCAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;~~IAC1E~~,CAAC;IAED,wCAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAES,+DAA6B,GAAvC,UAAwC,~~MAAoB~~,EAAE,KAAa;~~QAC1E~~,IAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,aAAa,GAAG,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;QAEnE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,UAAU,KAAK,UAAU;YAC9B,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,gBAAgB,GACrB,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,CAAC;QAE5E,IAAM,eAAe,GAAG,aAAa,IAAI,eAAe,CAAC;QAEzD,IAAI,eAAe,IAAI,kBAAkB,IAAI,gBAAgB,EAAE;~~YAC9D~~,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,WAAW;YACX,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YAClC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,oBAAoB,CACnB,MAAM,CAAC,QAAQ,EACf,OAAO,EACP,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,KAAK,CAAC,SAAS,CAAC,iBAAiB,EACjC,oBAAoB,CACpB,CAAC;YAEF,QAAQ;YACR,IAAI,eAAe,IAAI,kBAAkB,EAAE;~~gBAC1C~~,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,kBAAkB,CACjB,OAAO,EACP,MAAM,CAAC,KAAK,EACZ,WAAW,EACX,UAAU,EACV,WAAW,EACX,oBAAoB,CACpB,CAAC;aACF;YAED,YAAY;YACZ,IAAI,eAAe,EAAE;~~gBACpB~~,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;aACxE;YAED,MAAM;YACN,IAAI,eAAe,IAAI,gBAAgB,EAAE;~~gBACxC~~,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,gBAAgB,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,EAAE,oBAAoB,CAAC,CAAC;aACnF;SACD;IACF,CAAC;IACF,8BAAC;AAAD,CAAC,~~AA5FD~~,CAA6C,WAAW,~~GA4FvD~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from~~ \~~"../e-shape-buffer\";\nimport {\~~n\tbuildRectangleClipping,\n\tbuildRectangleIndex,\n\tbuildRectangleStep,\n\tbuildRectangleUv,\n\tbuildRectangleVertex,\n\tRECTANGLE_WORLD_SIZE\n} from \"./build-rectangle\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderRectanglePivoted extends BuilderBase {\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst size = shape.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tif (isVertexChanged \|\| isTransformChanged \|\| isTextureChanged) {\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0.5 sizeX,\n\t\t\t\t0.5 * sizeY,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tshape.transform.internalTransform,\n\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleStep(\n\t\t\t\t\tvoffset,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isVertexChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-rectangle-pivoted.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle-pivoted.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { EShape } from \"../e-shape\";\nimport {\n\tbuildRectangleClipping,\n\tbuildRectangleIndex,\n\tbuildRectangleStep,\n\tbuildRectangleUv,\n\tbuildRectangleVertex,\n\tRECTANGLE_WORLD_SIZE\n} from \"./build-rectangle\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderRectanglePivoted extends BuilderBase {\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst size = shape.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst isSizeChanged = sizeX !== this.sizeX \|\| sizeY !== this.sizeY;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);\n\n\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged \|\| isTextureChanged) {\n\t\t\tthis.inited \|= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0.5 sizeX,\n\t\t\t\t0.5 * sizeY,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tshape.transform.internalTransform,\n\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleStep(\n\t\t\t\t\tvoffset,\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tRECTANGLE_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isNotInited \|\| isVertexChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

package/dist/wcardinal/ui/shape/variant/builder-rectangle-rounded.js CHANGED Viewed

@@ -4,19 +4,21 @@
  */
 import { __extends } from "tslib";
 import { buildRectangleRoundedClipping, buildRectangleRoundedIndex, buildRectangleRoundedStep, buildRectangleRoundedUv, buildRectangleRoundedVertex, RECTANGLE_ROUNDED_WORLD_SIZE } from "./build-rectangle-rounded";
+import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
 var BuilderRectangleRounded = /** @class */ (function (_super) {
     __extends(BuilderRectangleRounded, _super);
     function BuilderRectangleRounded(vertexOffset, indexOffset, vertexCount, indexCount) {
         var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount) || this;
-        _this.radius = NaN;
-        _this.corner = NaN;
+        _this.radius = 0;
+        _this.corner = 0;
         return _this;
     }
     BuilderRectangleRounded.prototype.init = function (buffer) {
         buffer.updateIndices();
         buildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderRectangleRounded.prototype.update = function (buffer, shape) {
         this.updateVertexClippingStepAndUv(buffer, shape);
@@ -46,7 +48,13 @@ var BuilderRectangleRounded = /** @class */ (function (_super) {
         var textureTransformId = toTextureTransformId(texture);
         var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
         var isVertexChanged = isSizeChanged || isStrokeChanged;
-        if (isVertexChanged || isTransformChanged || isCornerChanged || isTextureChanged) {
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        if (isNotInited ||
+            isVertexChanged ||
+            isTransformChanged ||
+            isCornerChanged ||
+            isTextureChanged) {
+            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.radius = radius;
@@ -63,17 +71,17 @@ var BuilderRectangleRounded = /** @class */ (function (_super) {
             buffer.updateVertices();
             buildRectangleRoundedVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, radius, shape.transform.internalTransform, RECTANGLE_ROUNDED_WORLD_SIZE);
             // Steps
-            if (isVertexChanged || isCornerChanged || isTransformChanged) {
+            if (isNotInited || isVertexChanged || isCornerChanged || isTransformChanged) {
                 buffer.updateSteps();
                 buildRectangleRoundedStep(buffer.steps, voffset, strokeWidth, strokeSide, strokeStyle, corner, RECTANGLE_ROUNDED_WORLD_SIZE);
             }
             // Clippings
-            if (isVertexChanged || isCornerChanged) {
+            if (isNotInited || isVertexChanged || isCornerChanged) {
                 buffer.updateClippings();
                 buildRectangleRoundedClipping(buffer.clippings, voffset, corner, RECTANGLE_ROUNDED_WORLD_SIZE);
             }
             // UVs
-            if (isVertexChanged || isTextureChanged) {
+            if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
                 buildRectangleRoundedUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_ROUNDED_WORLD_SIZE);
             }

package/dist/wcardinal/ui/shape/variant/builder-rectangle-rounded.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-rectangle-rounded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle-rounded.ts"],"names":[],"mappings":"AAAA;;;GAGG;;~~AAKH~~,OAAO,EACN,6BAA6B,EAC7B,0BAA0B,EAC1B,yBAAyB,EACzB,uBAAuB,EACvB,2BAA2B,EAC3B,4BAA4B,EAC5B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE/F;IAA6C,2CAAW;IAIvD,iCACC,YAAoB,EACpB,WAAmB,EACnB,WAAmB,EACnB,UAAkB;QAJnB,YAMC,kBAAM,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,SAGzD;QAFA,KAAI,CAAC,MAAM,GAAG,~~GAAG~~,CAAC;~~QAClB~~,KAAI,CAAC,MAAM,GAAG,~~GAAG~~,CAAC;;~~IACnB~~,CAAC;IAED,sCAAI,GAAJ,UAAK,~~MAAoB~~;~~QACxB~~,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,0BAA0B,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;~~IACjF~~,CAAC;IAED,wCAAM,GAAN,UAAO,~~MAAoB~~,EAAE,KAAa;~~QACzC~~,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACvC,CAAC;IAES,+DAA6B,GAAvC,UAAwC,~~MAAoB~~,EAAE,KAAa;~~QAC1E~~,IAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QACxB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC;QACrB,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,aAAa,GAClB,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC;QAExE,IAAM,gBAAgB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAM,kBAAkB,GAAG,IAAI,CAAC,gBAAgB,KAAK,gBAAgB,CAAC;QAEtE,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,IAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/B,IAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC;QACjC,IAAM,eAAe,GACpB,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,WAAW,KAAK,WAAW;YAChC,IAAI,CAAC,UAAU,KAAK,UAAU;YAC9B,IAAI,CAAC,WAAW,KAAK,WAAW,CAAC;QAElC,IAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC5B,IAAM,eAAe,GAAG,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC;QAE/C,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,gBAAgB,GACrB,OAAO,KAAK,IAAI,CAAC,OAAO,IAAI,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,CAAC;QAE5E,IAAM,eAAe,GAAG,aAAa,IAAI,eAAe,CAAC;QAEzD,IAAI,eAAe,~~IAAI,~~kBAAkB,IAAI,~~eAAe~~,IAAI,~~gBAAgB~~,~~EAAE~~;~~YACjF~~,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;YACzC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;YAE7C,WAAW;YACX,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;YAClC,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,2BAA2B,CAC1B,MAAM,CAAC,QAAQ,EACf,OAAO,EACP,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,MAAM,EACN,KAAK,CAAC,SAAS,CAAC,iBAAiB,EACjC,4BAA4B,CAC5B,CAAC;YAEF,QAAQ;YACR,IAAI,eAAe,IAAI,eAAe,IAAI,kBAAkB,EAAE;~~gBAC7D~~,MAAM,CAAC,WAAW,EAAE,CAAC;gBACrB,yBAAyB,CACxB,MAAM,CAAC,KAAK,EACZ,OAAO,EACP,WAAW,EACX,UAAU,EACV,WAAW,EACX,MAAM,EACN,4BAA4B,CAC5B,CAAC;aACF;YAED,YAAY;YACZ,IAAI,eAAe,IAAI,eAAe,EAAE;~~gBACvC~~,MAAM,CAAC,eAAe,EAAE,CAAC;gBACzB,6BAA6B,CAC5B,MAAM,CAAC,SAAS,EAChB,OAAO,EACP,MAAM,EACN,4BAA4B,CAC5B,CAAC;aACF;YAED,MAAM;YACN,IAAI,eAAe,IAAI,gBAAgB,EAAE;~~gBACxC~~,MAAM,CAAC,SAAS,EAAE,CAAC;gBACnB,uBAAuB,CACtB,MAAM,CAAC,GAAG,EACV,OAAO,EACP,YAAY,CAAC,OAAO,CAAC,EACrB,4BAA4B,CAC5B,CAAC;aACF;SACD;IACF,CAAC;IACF,8BAAC;AAAD,CAAC,~~AA7HD~~,CAA6C,WAAW,~~GA6HvD~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { ~~EShapeBuffer } from \"../e-shape-buffer\";\nimport {~~ EShapeCorner } from \"../e-shape-corner\";\nimport {\n\tbuildRectangleRoundedClipping,\n\tbuildRectangleRoundedIndex,\n\tbuildRectangleRoundedStep,\n\tbuildRectangleRoundedUv,\n\tbuildRectangleRoundedVertex,\n\tRECTANGLE_ROUNDED_WORLD_SIZE\n} from \"./build-rectangle-rounded\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderRectangleRounded extends BuilderBase {\n\tprotected radius: number;\n\tprotected corner: EShapeCorner;\n\n\tconstructor(\n\t\tvertexOffset: number,\n\t\tindexOffset: number,\n\t\tvertexCount: number,\n\t\tindexCount: number\n\t) {\n\t\tsuper(vertexOffset, indexOffset, vertexCount, indexCount);\n\t\tthis.radius = ~~NaN~~;\n\t\tthis.corner = ~~NaN~~;\n\t}\n\n\tinit(buffer: ~~EShapeBuffer~~): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t}\n\n\tupdate(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: ~~EShapeBuffer~~, shape: EShape): void {\n\t\tconst size = shape.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst radius = shape.radius;\n\t\tconst isSizeChanged =\n\t\t\tsizeX !== this.sizeX \|\| sizeY !== this.sizeY \|\| radius !== this.radius;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst corner = shape.corner;\n\t\tconst isCornerChanged = corner !== this.corner;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\~~tif~~ (~~isVertexChanged~~ \|\| ~~isTransformChanged~~ \|\| ~~isCornerChanged~~ \|\| ~~isTextureChanged~~) {\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.radius = radius;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.corner = corner;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleRoundedVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tradius,\n\t\t\t\tshape.transform.internalTransform,\n\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isVertexChanged \|\| isCornerChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleRoundedStep(\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tcorner,\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isVertexChanged \|\| isCornerChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleRoundedClipping(\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tcorner,\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleRoundedUv(\n\t\t\t\t\tbuffer.uvs,\n\t\t\t\t\tvoffset,\n\t\t\t\t\ttoTextureUvs(texture),\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-rectangle-rounded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle-rounded.ts"],"names":[],"mappings":"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","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeCorner } from \"../e-shape-corner\";\nimport {\n\tbuildRectangleRoundedClipping,\n\tbuildRectangleRoundedIndex,\n\tbuildRectangleRoundedStep,\n\tbuildRectangleRoundedUv,\n\tbuildRectangleRoundedVertex,\n\tRECTANGLE_ROUNDED_WORLD_SIZE\n} from \"./build-rectangle-rounded\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderRectangleRounded extends BuilderBase {\n\tprotected radius: number;\n\tprotected corner: EShapeCorner;\n\n\tconstructor(\n\t\tvertexOffset: number,\n\t\tindexOffset: number,\n\t\tvertexCount: number,\n\t\tindexCount: number\n\t) {\n\t\tsuper(vertexOffset, indexOffset, vertexCount, indexCount);\n\t\tthis.radius = 0;\n\t\tthis.corner = 0;\n\t}\n\n\tinit(buffer: BuilderBuffer): void {\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\tupdate(buffer: BuilderBuffer, shape: EShape): void {\n\t\tthis.updateVertexClippingStepAndUv(buffer, shape);\n\t\tthis.updateColorFill(buffer, shape);\n\t\tthis.updateColorStroke(buffer, shape);\n\t}\n\n\tprotected updateVertexClippingStepAndUv(buffer: BuilderBuffer, shape: EShape): void {\n\t\tconst size = shape.size;\n\t\tconst sizeX = size.x;\n\t\tconst sizeY = size.y;\n\t\tconst radius = shape.radius;\n\t\tconst isSizeChanged =\n\t\t\tsizeX !== this.sizeX \|\| sizeY !== this.sizeY \|\| radius !== this.radius;\n\n\t\tconst transformLocalId = toTransformLocalId(shape);\n\t\tconst isTransformChanged = this.transformLocalId !== transformLocalId;\n\n\t\tconst stroke = shape.stroke;\n\t\tconst strokeAlign = stroke.align;\n\t\tconst strokeWidth = stroke.enable ? stroke.width : 0;\n\t\tconst strokeSide = stroke.side;\n\t\tconst strokeStyle = stroke.style;\n\t\tconst isStrokeChanged =\n\t\t\tthis.strokeAlign !== strokeAlign \|\|\n\t\t\tthis.strokeWidth !== strokeWidth \|\|\n\t\t\tthis.strokeSide !== strokeSide \|\|\n\t\t\tthis.strokeStyle !== strokeStyle;\n\n\t\tconst corner = shape.corner;\n\t\tconst isCornerChanged = corner !== this.corner;\n\n\t\tconst texture = toTexture(shape);\n\t\tconst textureTransformId = toTextureTransformId(texture);\n\t\tconst isTextureChanged =\n\t\t\ttexture !== this.texture \|\| textureTransformId !== this.textureTransformId;\n\n\t\tconst isVertexChanged = isSizeChanged \|\| isStrokeChanged;\n\n\t\tconst isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);\n\n\t\tif (\n\t\t\tisNotInited \|\|\n\t\t\tisVertexChanged \|\|\n\t\t\tisTransformChanged \|\|\n\t\t\tisCornerChanged \|\|\n\t\t\tisTextureChanged\n\t\t) {\n\t\t\tthis.inited \|= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;\n\t\t\tthis.sizeX = sizeX;\n\t\t\tthis.sizeY = sizeY;\n\t\t\tthis.radius = radius;\n\t\t\tthis.transformLocalId = transformLocalId;\n\t\t\tthis.strokeAlign = strokeAlign;\n\t\t\tthis.strokeWidth = strokeWidth;\n\t\t\tthis.strokeSide = strokeSide;\n\t\t\tthis.strokeStyle = strokeStyle;\n\t\t\tthis.corner = corner;\n\t\t\tthis.texture = texture;\n\t\t\tthis.textureTransformId = textureTransformId;\n\n\t\t\t// Vertices\n\t\t\tconst voffset = this.vertexOffset;\n\t\t\tbuffer.updateVertices();\n\t\t\tbuildRectangleRoundedVertex(\n\t\t\t\tbuffer.vertices,\n\t\t\t\tvoffset,\n\t\t\t\t0,\n\t\t\t\t0,\n\t\t\t\tsizeX,\n\t\t\t\tsizeY,\n\t\t\t\tstrokeAlign,\n\t\t\t\tstrokeWidth,\n\t\t\t\tradius,\n\t\t\t\tshape.transform.internalTransform,\n\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t);\n\n\t\t\t// Steps\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isCornerChanged \|\| isTransformChanged) {\n\t\t\t\tbuffer.updateSteps();\n\t\t\t\tbuildRectangleRoundedStep(\n\t\t\t\t\tbuffer.steps,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tstrokeWidth,\n\t\t\t\t\tstrokeSide,\n\t\t\t\t\tstrokeStyle,\n\t\t\t\t\tcorner,\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// Clippings\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isCornerChanged) {\n\t\t\t\tbuffer.updateClippings();\n\t\t\t\tbuildRectangleRoundedClipping(\n\t\t\t\t\tbuffer.clippings,\n\t\t\t\t\tvoffset,\n\t\t\t\t\tcorner,\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\n\t\t\t// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleRoundedUv(\n\t\t\t\t\tbuffer.uvs,\n\t\t\t\t\tvoffset,\n\t\t\t\t\ttoTextureUvs(texture),\n\t\t\t\t\tRECTANGLE_ROUNDED_WORLD_SIZE\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\t}\n}\n"]}