npm - @wcardinal/wcardinal-ui - Versions diffs - 0.408.0 → 0.409.0 - Mend

@wcardinal/wcardinal-ui 0.408.0 → 0.409.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 (149) hide show

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;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,MAAqB,EAAE,YAAoB,EAAE,WAAmB;QAA5E,YACC,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,SAEvF;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAEQ,qCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;IAEQ,uCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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,~~AA9HD~~,CAAqD,iBAAiB,~~GA8HrE~~","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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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"]}
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,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,MAAqB,EAAE,YAAoB,EAAE,WAAmB;QAA5E,YACC,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC,SAEvF;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAEQ,qCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;IAEQ,uCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IAES,sDAAqB,GAA/B,UAAgC,MAAqB,EAAE,KAAa;;QACnE,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,kBAAkB,CAAC,CAAC;QAEpE,IACC,WAAW;YACX,eAAe;YACf,kBAAkB;YAClB,gBAAgB;YAChB,cAAc,EACb;YACD,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,kBAAkB,CAAC;YAC9C,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,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,CAAC,CAAC;aAC7D;SACD;IACF,CAAC;IACF,6BAAC;AAAD,CAAC,AAvHD,CAAqD,iBAAiB,GAuHrE","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\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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColor(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 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_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.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// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture));\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

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

@@ -4,7 +4,7 @@
  */
 import { __extends } from "tslib";
 import { Matrix } from "pixi.js";
-import { buildTriangleClipping, buildTriangleIndex, buildTriangleStep, buildTriangleUv, buildTriangleVertex, TRIANGLE_INDEX_COUNT, TRIANGLE_VERTEX_COUNT, TRIANGLE_WORLD_SIZE } from "./build-triangle";
+import { 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";
@@ -17,17 +17,14 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
     }
     BuilderMarkerTriangle.prototype.init = function () {
         var buffer = this.buffer;
-        buffer.updateClippings();
         buffer.updateIndices();
-        buildTriangleClipping(buffer.clippings, this.vertexOffset);
         buildTriangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
-        this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderMarkerTriangle.prototype.update = function (shape) {
         var buffer = this.buffer;
         this.updateVertexStepAndUv(buffer, shape);
-        this.updateColorFill(buffer, shape);
-        this.updateColorStroke(buffer, shape);
+        this.updateColor(buffer, shape);
     };
     BuilderMarkerTriangle.prototype.updateVertexStepAndUv = function (buffer, shape) {
         var _a;
@@ -82,7 +79,7 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
             buildTriangleVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, TRIANGLE_WORLD_SIZE);
             if (isNotInited || isVertexChanged || isTransformChanged) {
                 buffer.updateSteps();
-                buildTriangleStep(buffer.steps, buffer.clippings, voffset, TRIANGLE_VERTEX_COUNT, strokeWidth, strokeStyle, TRIANGLE_WORLD_SIZE);
+                buildTriangleStep(buffer.steps, voffset, strokeWidth, strokeStyle, TRIANGLE_WORLD_SIZE);
             }
             if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();

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;AAEjC,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;AAC/F,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AAEvD;IAAoD,yCAAiB;IAIpE,+BAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;QAA5E,YACC,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,oBAAoB,CAAC,SAErF;QADA,KAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;;IACnB,CAAC;IAEQ,oCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;QACxE,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,~~kBAAkB~~,CAAC;~~IAC/C~~,CAAC;IAEQ,sCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;~~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~~MAAM,CAAC,SAAS,EAChB,~~OAAO,EACP,~~qBAAqB,EACrB,~~WAAW,EACX,WAAW,EACX,mBAAmB,CACnB,CAAC;aACF;YAED,IAAI,WAAW,IAAI,eAAe,IAAI,gBAAgB,EAAE;gBACvD,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,~~AAtHD~~,CAAoD,iBAAiB,~~GAsHpE~~","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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\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\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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"]}
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\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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT);\n\t\tthis.pointId = -1;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildTriangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColor(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\tvoffset,\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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
-import { buildRectangleClipping, buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_INDEX_COUNT, RECTANGLE_VERTEX_COUNT, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
+import { buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_INDEX_COUNT, RECTANGLE_VERTEX_COUNT, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
 import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
@@ -20,11 +20,10 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
     };
     BuilderRectanglePivoted.prototype.update = function (shape) {
         var buffer = this.buffer;
-        this.updateVertexClippingStepAndUv(buffer, shape);
-        this.updateColorFill(buffer, shape);
-        this.updateColorStroke(buffer, shape);
+        this.updateVertexStepAndUv(buffer, shape);
+        this.updateColor(buffer, shape);
     };
-    BuilderRectanglePivoted.prototype.updateVertexClippingStepAndUv = function (buffer, shape) {
+    BuilderRectanglePivoted.prototype.updateVertexStepAndUv = function (buffer, shape) {
         var size = shape.size;
         var sizeX = size.x;
         var sizeY = size.y;
@@ -44,9 +43,9 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
         var textureTransformId = toTextureTransformId(texture);
         var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
         var isVertexChanged = isSizeChanged || isStrokeChanged;
-        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
         if (isNotInited || isVertexChanged || isTransformChanged || isTextureChanged) {
-            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
+            this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -65,15 +64,10 @@ var BuilderRectanglePivoted = /** @class */ (function (_super) {
                 buffer.updateSteps();
                 buildRectangleStep(voffset, buffer.steps, strokeWidth, strokeSide, strokeStyle, RECTANGLE_WORLD_SIZE);
             }
-            // Clippings
-            if (isNotInited || isVertexChanged) {
-                buffer.updateClippings();
-                buildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);
-            }
             // UVs
             if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
-                buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);
+                buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture));
             }
         }
     };

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;;AAGH,OAAO,EACN,~~sBAAsB,EACtB,~~mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,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;IACvD,iCAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;eAC3E,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC;IACxF,CAAC;IAEQ,sCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;IAEQ,wCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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~~,MAAqB,EAAE,KAAa;~~QAC3E~~,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,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,~~2BAA2B~~,CAAC,CAAC;~~QAE7E~~,IAAI,WAAW,IAAI,eAAe,IAAI,kBAAkB,IAAI,gBAAgB,EAAE;YAC7E,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,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,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,8BAAC;AAAD,CAAC,~~AAtGD~~,CAA6C,WAAW,~~GAsGvD~~","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_INDEX_COUNT,\n\tRECTANGLE_VERTEX_COUNT,\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\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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"]}
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;;AAGH,OAAO,EACN,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,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;IACvD,iCAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;eAC3E,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC;IACxF,CAAC;IAEQ,sCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;IAEQ,wCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACjC,CAAC;IAES,uDAAqB,GAA/B,UAAgC,MAAqB,EAAE,KAAa;QACnE,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,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,kBAAkB,CAAC,CAAC;QAEpE,IAAI,WAAW,IAAI,eAAe,IAAI,kBAAkB,IAAI,gBAAgB,EAAE;YAC7E,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,kBAAkB,CAAC;YAC9C,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,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,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,CAAC,CAAC;aAC7D;SACD;IACF,CAAC;IACF,8BAAC;AAAD,CAAC,AA/FD,CAA6C,WAAW,GA+FvD","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n /\n\nimport { EShape } from \"../e-shape\";\nimport {\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 { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderRectanglePivoted extends BuilderBase {\n\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColor(buffer, shape);\n\t}\n\n\tprotected updateVertexStepAndUv(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_STEP_AND_UV);\n\n\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged \|\| isTextureChanged) {\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.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// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture));\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
-import { buildRectangleRoundedClipping, buildRectangleRoundedIndex, buildRectangleRoundedStep, buildRectangleRoundedUv, buildRectangleRoundedVertex, RECTANGLE_ROUNDED_INDEX_COUNT, RECTANGLE_ROUNDED_VERTEX_COUNT, RECTANGLE_ROUNDED_WORLD_SIZE } from "./build-rectangle-rounded";
+import { buildRectangleRoundedIndex, buildRectangleRoundedStep, buildRectangleRoundedUv, buildRectangleRoundedVertex, RECTANGLE_ROUNDED_INDEX_COUNT, RECTANGLE_ROUNDED_VERTEX_COUNT, RECTANGLE_ROUNDED_WORLD_SIZE } from "./build-rectangle-rounded";
 import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
@@ -23,11 +23,10 @@ var BuilderRectangleRounded = /** @class */ (function (_super) {
     };
     BuilderRectangleRounded.prototype.update = function (shape) {
         var buffer = this.buffer;
-        this.updateVertexClippingStepAndUv(buffer, shape);
-        this.updateColorFill(buffer, shape);
-        this.updateColorStroke(buffer, shape);
+        this.updateVertexStepAndUv(buffer, shape);
+        this.updateColor(buffer, shape);
     };
-    BuilderRectangleRounded.prototype.updateVertexClippingStepAndUv = function (buffer, shape) {
+    BuilderRectangleRounded.prototype.updateVertexStepAndUv = function (buffer, shape) {
         var size = shape.size;
         var sizeX = size.x;
         var sizeY = size.y;
@@ -50,13 +49,13 @@ var BuilderRectangleRounded = /** @class */ (function (_super) {
         var textureTransformId = toTextureTransformId(texture);
         var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
         var isVertexChanged = isSizeChanged || isStrokeChanged;
-        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
         if (isNotInited ||
             isVertexChanged ||
             isTransformChanged ||
             isCornerChanged ||
             isTextureChanged) {
-            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
+            this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.radius = radius;
@@ -77,11 +76,6 @@ var BuilderRectangleRounded = /** @class */ (function (_super) {
                 buffer.updateSteps();
                 buildRectangleRoundedStep(buffer.steps, voffset, strokeWidth, strokeSide, strokeStyle, corner, RECTANGLE_ROUNDED_WORLD_SIZE);
             }
-            // Clippings
-            if (isNotInited || isVertexChanged || isCornerChanged) {
-                buffer.updateClippings();
-                buildRectangleRoundedClipping(buffer.clippings, voffset, corner, RECTANGLE_ROUNDED_WORLD_SIZE);
-            }
             // UVs
             if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();

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;;AAIH,OAAO,EACN,~~6BAA6B,EAC7B,~~0BAA0B,EAC1B,yBAAyB,EACzB,uBAAuB,EACvB,2BAA2B,EAC3B,6BAA6B,EAC7B,8BAA8B,EAC9B,4BAA4B,EAC5B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,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,iCAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;QAA5E,YACC,kBACC,MAAM,EACN,YAAY,EACZ,WAAW,EACX,8BAA8B,EAC9B,6BAA6B,CAC7B,SAGD;QAFA,KAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QAChB,KAAI,CAAC,MAAM,GAAG,CAAC,CAAC;;IACjB,CAAC;IAEQ,sCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,aAAa,EAAE,CAAC;QACvB,0BAA0B,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,KAAK,CAAC;IAClC,CAAC;IAEQ,wCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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~~,MAAqB,EAAE,KAAa;~~QAC3E~~,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,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,~~2BAA2B~~,CAAC,CAAC;~~QAE7E~~,IACC,WAAW;YACX,eAAe;YACf,kBAAkB;YAClB,eAAe;YACf,gBAAgB,EACf;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,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,WAAW,IAAI,eAAe,IAAI,eAAe,IAAI,kBAAkB,EAAE;gBAC5E,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,WAAW,IAAI,eAAe,IAAI,eAAe,EAAE;gBACtD,~~MAAM~~,CAAC,eAAe,EAAE,CAAC~~;~~gBACzB,6BAA6B,CAC5B,MAAM,CAAC,SAAS,EAChB,OAAO,EACP,MAAM,EACN,4BAA4B,CAC5B,CAAC;aACF;YAED,MAAM;~~YACN,IAAI,WAAW,IAAI,eAAe,IAAI,gBAAgB,EAAE;gBACvD,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,~~AA1ID~~,CAA6C,WAAW,~~GA0IvD~~","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_INDEX_COUNT,\n\tRECTANGLE_ROUNDED_VERTEX_COUNT,\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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(\n\t\t\tbuffer,\n\t\t\tvertexOffset,\n\t\t\tindexOffset,\n\t\t\tRECTANGLE_ROUNDED_VERTEX_COUNT,\n\t\t\tRECTANGLE_ROUNDED_INDEX_COUNT\n\t\t);\n\t\tthis.radius = 0;\n\t\tthis.corner = 0;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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"]}
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\tbuildRectangleRoundedIndex,\n\tbuildRectangleRoundedStep,\n\tbuildRectangleRoundedUv,\n\tbuildRectangleRoundedVertex,\n\tRECTANGLE_ROUNDED_INDEX_COUNT,\n\tRECTANGLE_ROUNDED_VERTEX_COUNT,\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(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(\n\t\t\tbuffer,\n\t\t\tvertexOffset,\n\t\t\tindexOffset,\n\t\t\tRECTANGLE_ROUNDED_VERTEX_COUNT,\n\t\t\tRECTANGLE_ROUNDED_INDEX_COUNT\n\t\t);\n\t\tthis.radius = 0;\n\t\tthis.corner = 0;\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColor(buffer, shape);\n\t}\n\n\tprotected updateVertexStepAndUv(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_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_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// 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"]}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
-import { buildRectangleClipping, buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_INDEX_COUNT, RECTANGLE_VERTEX_COUNT, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
+import { buildRectangleIndex, buildRectangleStep, buildRectangleUv, buildRectangleVertex, RECTANGLE_INDEX_COUNT, RECTANGLE_VERTEX_COUNT, RECTANGLE_WORLD_SIZE } from "./build-rectangle";
 import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
@@ -20,11 +20,10 @@ var BuilderRectangle = /** @class */ (function (_super) {
     };
     BuilderRectangle.prototype.update = function (shape) {
         var buffer = this.buffer;
-        this.updateVertexClippingStepAndUv(buffer, shape);
-        this.updateColorFill(buffer, shape);
-        this.updateColorStroke(buffer, shape);
+        this.updateVertexStepAndUv(buffer, shape);
+        this.updateColor(buffer, shape);
     };
-    BuilderRectangle.prototype.updateVertexClippingStepAndUv = function (buffer, shape) {
+    BuilderRectangle.prototype.updateVertexStepAndUv = function (buffer, shape) {
         var size = shape.size;
         var sizeX = size.x;
         var sizeY = size.y;
@@ -44,9 +43,9 @@ var BuilderRectangle = /** @class */ (function (_super) {
         var textureTransformId = toTextureTransformId(texture);
         var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
         var isVertexChanged = isSizeChanged || isStrokeChanged;
-        var isNotInited = !(this.inited & BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV);
+        var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
         if (isNotInited || isVertexChanged || isTransformChanged || isTextureChanged) {
-            this.inited |= BuilderFlag.VERTEX_CLIPPING_STEP_AND_UV;
+            this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
             this.sizeX = sizeX;
             this.sizeY = sizeY;
             this.transformLocalId = transformLocalId;
@@ -65,15 +64,10 @@ var BuilderRectangle = /** @class */ (function (_super) {
                 buffer.updateSteps();
                 buildRectangleStep(voffset, buffer.steps, strokeWidth, strokeSide, strokeStyle, RECTANGLE_WORLD_SIZE);
             }
-            // Clippings
-            if (isNotInited || isVertexChanged) {
-                buffer.updateClippings();
-                buildRectangleClipping(buffer.clippings, voffset, RECTANGLE_WORLD_SIZE);
-            }
             // UVs
             if (isNotInited || isVertexChanged || isTextureChanged) {
                 buffer.updateUvs();
-                buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture), RECTANGLE_WORLD_SIZE);
+                buildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture));
             }
         }
     };

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

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EACN,~~sBAAsB,EACtB,~~mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,sBAAsB,EACtB,oBAAoB,EACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE/F;IAAsC,oCAAW;IAChD,0BAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;eAC3E,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,sBAAsB,EAAE,qBAAqB,CAAC;IACxF,CAAC;IAEQ,+BAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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;IAEQ,iCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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,~~wDAA6B~~,~~GAAvC~~,~~UAAwC~~,MAAqB,EAAE,KAAa;~~QAC3E~~,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,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,~~2BAA2B~~,CAAC,CAAC;~~QAE7E~~,IAAI,WAAW,IAAI,eAAe,IAAI,kBAAkB,IAAI,gBAAgB,EAAE;YAC7E,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,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,KAAK,CAAC,SAAS,CAAC,iBAAiB,EACjC,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,uBAAC;AAAD,CAAC,~~AAtGD~~,CAAsC,WAAW,~~GAsGhD~~","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_INDEX_COUNT,\n\tRECTANGLE_VERTEX_COUNT,\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 BuilderRectangle extends BuilderBase {\n\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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,\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\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"]}
1	+ {"version":3,"file":"builder-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-rectangle.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\tbuildRectangleIndex,\n\tbuildRectangleStep,\n\tbuildRectangleUv,\n\tbuildRectangleVertex,\n\tRECTANGLE_INDEX_COUNT,\n\tRECTANGLE_VERTEX_COUNT,\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 BuilderRectangle extends BuilderBase {\n\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tbuildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexStepAndUv(buffer, shape);\n\t\tthis.updateColor(buffer, shape);\n\t}\n\n\tprotected updateVertexStepAndUv(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_STEP_AND_UV);\n\n\t\tif (isNotInited \|\| isVertexChanged \|\| isTransformChanged \|\| isTextureChanged) {\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.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,\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\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// UVs\n\t\t\tif (isNotInited \|\| isVertexChanged \|\| isTextureChanged) {\n\t\t\t\tbuffer.updateUvs();\n\t\t\t\tbuildRectangleUv(buffer.uvs, voffset, toTextureUvs(texture));\n\t\t\t}\n\t\t}\n\t}\n}\n"]}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { __extends } from "tslib";
-import { buildSemicircleClipping, buildSemicircleIndex, buildSemicircleStep, buildSemicircleUv, buildSemicircleVertex, SEMICIRCLE_INDEX_COUNT, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_WORLD_SIZE } from "./build-semicircle";
+import { buildSemicircleIndex, buildSemicircleStep, buildSemicircleUv, buildSemicircleVertex, SEMICIRCLE_INDEX_COUNT, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_WORLD_SIZE } from "./build-semicircle";
 import { BuilderFlag } from "./builder";
 import { BuilderBase } from "./builder-base";
 import { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
@@ -14,18 +14,15 @@ var BuilderSemicircle = /** @class */ (function (_super) {
     }
     BuilderSemicircle.prototype.init = function () {
         var buffer = this.buffer;
-        buffer.updateClippings();
         buffer.updateIndices();
         var voffset = this.vertexOffset;
-        buildSemicircleClipping(buffer.clippings, voffset);
         buildSemicircleIndex(buffer.indices, voffset, this.indexOffset);
-        this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
+        this.inited |= BuilderFlag.INDEX;
     };
     BuilderSemicircle.prototype.update = function (shape) {
         var buffer = this.buffer;
         this.updateVertexAndStep(buffer, shape);
-        this.updateColorFill(buffer, shape);
-        this.updateColorStroke(buffer, shape);
+        this.updateColor(buffer, shape);
         this.updateUv(buffer, shape);
     };
     BuilderSemicircle.prototype.updateVertexAndStep = function (buffer, shape) {
@@ -55,7 +52,7 @@ var BuilderSemicircle = /** @class */ (function (_super) {
             buffer.updateVertices();
             buffer.updateSteps();
             buildSemicircleVertex(buffer.vertices, this.vertexOffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, shape.transform.internalTransform, SEMICIRCLE_WORLD_SIZE);
-            buildSemicircleStep(buffer.steps, buffer.clippings, this.vertexOffset, strokeWidth, strokeStyle, SEMICIRCLE_WORLD_SIZE);
+            buildSemicircleStep(buffer.steps, this.vertexOffset, strokeWidth, strokeStyle, SEMICIRCLE_WORLD_SIZE);
         }
     };
     BuilderSemicircle.prototype.updateUv = function (buffer, shape) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"builder-semicircle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-semicircle.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAGH,OAAO,EACN,~~uBAAuB,EACvB,~~oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAiB,WAAW,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE/F;IAAuC,qCAAW;IACjD,2BAAY,MAAqB,EAAE,YAAoB,EAAE,WAAmB;eAC3E,kBAAM,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,uBAAuB,EAAE,sBAAsB,CAAC;IAC1F,CAAC;IAEQ,gCAAI,GAAb;QACC,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,CAAC,~~eAAe,EAAE,CAAC;QACzB,MAAM,CAAC,~~aAAa,EAAE,CAAC;QACvB,IAAM,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC;QAClC,~~uBAAuB,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACnD,~~oBAAoB,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,~~kBAAkB~~,CAAC;~~IAC/C~~,CAAC;IAEQ,kCAAM,GAAf,UAAgB,KAAa;QAC5B,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,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,+CAAmB,GAA7B,UAA8B,MAAqB,EAAE,KAAa;QACjE,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,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,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;QAEjE,IAAI,WAAW,IAAI,aAAa,IAAI,kBAAkB,IAAI,eAAe,EAAE;YAC1E,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,eAAe,CAAC;YAC3C,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;YAE/B,SAAS;YACT,MAAM,CAAC,cAAc,EAAE,CAAC;YACxB,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,qBAAqB,CACpB,MAAM,CAAC,QAAQ,EACf,IAAI,CAAC,YAAY,EACjB,CAAC,EACD,CAAC,EACD,KAAK,EACL,KAAK,EACL,WAAW,EACX,WAAW,EACX,KAAK,CAAC,SAAS,CAAC,iBAAiB,EACjC,qBAAqB,CACrB,CAAC;YACF,mBAAmB,CAClB,MAAM,CAAC,KAAK,EACZ,~~MAAM,CAAC,SAAS,EAChB,~~IAAI,CAAC,YAAY,EACjB,WAAW,EACX,WAAW,EACX,qBAAqB,CACrB,CAAC;SACF;IACF,CAAC;IAES,oCAAQ,GAAlB,UAAmB,MAAqB,EAAE,KAAa;QACtD,IAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QACjC,IAAM,kBAAkB,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACzD,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;QACpD,IACC,WAAW;YACX,OAAO,KAAK,IAAI,CAAC,OAAO;YACxB,kBAAkB,KAAK,IAAI,CAAC,kBAAkB,EAC7C;YACD,IAAI,CAAC,MAAM,IAAI,WAAW,CAAC,EAAE,CAAC;YAC9B,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,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SAC7D;IACF,CAAC;IACF,wBAAC;AAAD,CAAC,~~AAhGD~~,CAAuC,WAAW,~~GAgGjD~~","sourcesContent":["/\n Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport {\n\~~tbuildSemicircleClipping,\n\~~tbuildSemicircleIndex,\n\tbuildSemicircleStep,\n\tbuildSemicircleUv,\n\tbuildSemicircleVertex,\n\tSEMICIRCLE_INDEX_COUNT,\n\tSEMICIRCLE_VERTEX_COUNT,\n\tSEMICIRCLE_WORLD_SIZE\n} from \"./build-semicircle\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderSemicircle extends BuilderBase {\n\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.~~updateClippings();\n\t\tbuffer.~~updateIndices();\n\t\tconst voffset = this.vertexOffset;\n\t\~~tbuildSemicircleClipping(buffer.clippings, voffset);\n\t\~~tbuildSemicircleIndex(buffer.indices, voffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.~~CLIPPING_AND_INDEX~~;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\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 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 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 isNotInited = !(this.inited & BuilderFlag.VERTEX_AND_STEP);\n\n\t\tif (isNotInited \|\| isSizeChanged \|\| isTransformChanged \|\| isStrokeChanged) {\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\n\t\t\t// Buffer\n\t\t\tbuffer.updateVertices();\n\t\t\tbuffer.updateSteps();\n\t\t\tbuildSemicircleVertex(\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\tshape.transform.internalTransform,\n\t\t\t\tSEMICIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t\tbuildSemicircleStep(\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\tSEMICIRCLE_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\tbuildSemicircleUv(buffer.uvs, this.vertexOffset, textureUvs);\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"builder-semicircle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/builder-semicircle.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\tbuildSemicircleIndex,\n\tbuildSemicircleStep,\n\tbuildSemicircleUv,\n\tbuildSemicircleVertex,\n\tSEMICIRCLE_INDEX_COUNT,\n\tSEMICIRCLE_VERTEX_COUNT,\n\tSEMICIRCLE_WORLD_SIZE\n} from \"./build-semicircle\";\nimport { BuilderBuffer, BuilderFlag } from \"./builder\";\nimport { BuilderBase } from \"./builder-base\";\nimport { toTexture, toTextureTransformId, toTextureUvs, toTransformLocalId } from \"./builders\";\n\nexport class BuilderSemicircle extends BuilderBase {\n\tconstructor(buffer: BuilderBuffer, vertexOffset: number, indexOffset: number) {\n\t\tsuper(buffer, vertexOffset, indexOffset, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_INDEX_COUNT);\n\t}\n\n\toverride init(): void {\n\t\tconst buffer = this.buffer;\n\t\tbuffer.updateIndices();\n\t\tconst voffset = this.vertexOffset;\n\t\tbuildSemicircleIndex(buffer.indices, voffset, this.indexOffset);\n\t\tthis.inited \|= BuilderFlag.INDEX;\n\t}\n\n\toverride update(shape: EShape): void {\n\t\tconst buffer = this.buffer;\n\t\tthis.updateVertexAndStep(buffer, shape);\n\t\tthis.updateColor(buffer, shape);\n\t\tthis.updateUv(buffer, shape);\n\t}\n\n\tprotected updateVertexAndStep(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 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 isNotInited = !(this.inited & BuilderFlag.VERTEX_AND_STEP);\n\n\t\tif (isNotInited \|\| isSizeChanged \|\| isTransformChanged \|\| isStrokeChanged) {\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\n\t\t\t// Buffer\n\t\t\tbuffer.updateVertices();\n\t\t\tbuffer.updateSteps();\n\t\t\tbuildSemicircleVertex(\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\tshape.transform.internalTransform,\n\t\t\t\tSEMICIRCLE_WORLD_SIZE\n\t\t\t);\n\t\t\tbuildSemicircleStep(\n\t\t\t\tbuffer.steps,\n\t\t\t\tthis.vertexOffset,\n\t\t\t\tstrokeWidth,\n\t\t\t\tstrokeStyle,\n\t\t\t\tSEMICIRCLE_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\tbuildSemicircleUv(buffer.uvs, this.vertexOffset, textureUvs);\n\t\t}\n\t}\n}\n"]}

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

@@ -4,7 +4,7 @@
  */
 import { Texture } from "pixi.js";
 import { buildColor } from "./build-color";
-import { buildTextClipping, buildTextIndex, buildTextStep, buildTextVertex, TEXT_FMIN, TEXT_INDEX_COUNT_SHIFT, TEXT_VERTEX_COUNT_SHIFT, toTextBufferCount } from "./build-text";
+import { buildTextIndex, buildTextStep, buildTextVertex, TEXT_FMIN, TEXT_INDEX_COUNT_SHIFT, TEXT_VERTEX_COUNT_SHIFT, toTextBufferCount } from "./build-text";
 import { BuilderFlag } from "./builder";
 import { toTextureTransformId, toTextureUvs, toTransformLocalId } from "./builders";
 var BuilderText = /** @class */ (function () {
@@ -47,16 +47,13 @@ var BuilderText = /** @class */ (function () {
     BuilderText.prototype.init = function () {
         var vcount = this.vertexCount;
         if (0 < vcount) {
-            // Clippings
+            // Indices
             var buffer = this.buffer;
             var voffset = this.vertexOffset;
-            buffer.updateClippings();
-            buildTextClipping(buffer.clippings, voffset, vcount);
-            // Indices
             buffer.updateIndices();
             buildTextIndex(buffer.indices, voffset, this.indexOffset, this.indexCount);
         }
-        this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
+        this.inited |= BuilderFlag.INDEX;
         return this;
     };
     BuilderText.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
@@ -96,8 +93,7 @@ var BuilderText = /** @class */ (function () {
             if (textAtlas != null) {
                 var buffer = this.buffer;
                 this.updateVertex(buffer, shape, textAtlas);
-                this.updateColorFill(buffer, shape);
-                this.updateColorStroke(buffer, shape);
+                this.updateColor(buffer, shape);
                 this.updateStep(buffer, shape);
             }
         }
@@ -191,31 +187,26 @@ var BuilderText = /** @class */ (function () {
             buildTextVertex(buffer.vertices, buffer.uvs, this.vertexOffset, this.vertexCount, 0, 0, shapeSize.x, shapeSize.y, textAtlas, textSize, textValue, textStyle, textAlignHorizontal, textAlignVertical, textOffsetHorizontal, textOffsetVertical, textSpacingHorizontal, textSpacingVertical, textDirection, textPaddingHorizontal, textPaddingVertical, textClipping, textFitting, textWorld, toTextureUvs(textTexture), shape.transform.internalTransform);
         }
     };
-    BuilderText.prototype.updateColorFill = function (buffer, shape) {
+    BuilderText.prototype.updateColor = function (buffer, shape) {
         var text = shape.text;
         var color = text.color;
         var alpha = shape.visible && text.enable ? text.alpha : 0;
-        var isNotInited = !(this.inited & BuilderFlag.COLOR_FILL);
-        if (isNotInited || color !== this.color || alpha !== this.alpha) {
-            this.inited |= BuilderFlag.COLOR_FILL;
+        var outline = text.outline;
+        var outlineColor = outline.color;
+        var outlineAlpha = shape.visible && text.enable ? outline.alpha : 0;
+        var isNotInited = !(this.inited & BuilderFlag.COLOR);
+        if (isNotInited ||
+            color !== this.color ||
+            alpha !== this.alpha ||
+            color !== this.outlineColor ||
+            alpha !== this.outlineAlpha) {
+            this.inited |= BuilderFlag.COLOR;
             this.color = color;
             this.alpha = alpha;
-            buffer.updateColorFills();
-            buildColor(color, alpha, this.vertexOffset, this.vertexCount, buffer.colorFills);
-        }
-    };
-    BuilderText.prototype.updateColorStroke = function (buffer, shape) {
-        var text = shape.text;
-        var outline = text.outline;
-        var color = outline.color;
-        var alpha = shape.visible && text.enable ? outline.alpha : 0;
-        var isNotInited = !(this.inited & BuilderFlag.COLOR_STROKE);
-        if (isNotInited || color !== this.outlineColor || alpha !== this.outlineAlpha) {
-            this.inited |= BuilderFlag.COLOR_STROKE;
-            this.outlineColor = color;
-            this.outlineAlpha = alpha;
-            buffer.updateColorStrokes();
-            buildColor(color, alpha, this.vertexOffset, this.vertexCount, buffer.colorStrokes);
+            this.outlineColor = outlineColor;
+            this.outlineAlpha = outlineAlpha;
+            buffer.updateColors();
+            buildColor(color, alpha, outlineColor, outlineAlpha, this.vertexOffset, this.vertexCount, buffer.colors);
         }
     };
     BuilderText.prototype.updateStep = function (buffer, shape) {