@wcardinal/wcardinal-ui 0.404.0 → 0.405.0

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.404.0
+ Winter Cardinal UI v0.405.0
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -68,7 +68,6 @@
      */
     var EShapeUploadedImpl = /** @class */ (function () {
         function EShapeUploadedImpl(buffer, vertexOffset, indexOffset, vertexCount, indexCount, builders) {
-            this.buffer = buffer;
             this._builders = builders;
             this._vertexOffset = vertexOffset;
             this._indexOffset = indexOffset;
@@ -77,20 +76,38 @@
         }
         EShapeUploadedImpl.prototype.init = function (shape) {
             shape.uploaded = this;
-            var buffer = this.buffer;
             var builders = this._builders;
             for (var i = 0, imax = builders.length; i < imax; ++i) {
-                builders[i].init(buffer);
+                builders[i].init();
             }
             this.update(shape);
             return this;
         };
+        EShapeUploadedImpl.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            var builders = this._builders;
+            var voffset = vertexOffset;
+            var ioffset = indexOffset;
+            for (var i = 0, imax = builders.length; i < imax; ++i) {
+                var builder = builders[i];
+                if (!builder.reinit(buffer, shape, voffset, ioffset)) {
+                    return false;
+                }
+                var vertexCount = builder.vertexCount;
+                var indexCount = builder.indexCount;
+                voffset += vertexCount;
+                ioffset += indexCount;
+            }
+            this._vertexCount = voffset - vertexOffset;
+            this._indexCount = ioffset - indexOffset;
+            this.update(shape);
+            return true;
+        };
         EShapeUploadedImpl.prototype.update = function (shape) {
-            var buffer = this.buffer;
             var builders = this._builders;
             for (var i = 0, imax = builders.length; i < imax; ++i) {
-                builders[i].update(buffer, shape);
+                builders[i].update(shape);
             }
+            return this;
         };
         EShapeUploadedImpl.prototype.isCompatible = function (shape) {
             var builders = this._builders;
@@ -101,9 +118,6 @@
             }
             return true;
         };
-        EShapeUploadedImpl.prototype.getBuffer = function () {
-            return this.buffer;
-        };
         EShapeUploadedImpl.prototype.getVertexOffset = function () {
             return this._vertexOffset;
         };
@@ -486,7 +500,7 @@
     var TEXT_FMIN = 0.00001;
     var TEXT_WORK_POINT = new pixi_js.Point();
     var toTextBufferCount = function (shape) {
-        var l = shape.text.value.length;
+        var l = shape.text.plength;
         return ((l >> 3) + (0 < (l & 0x7) ? 1 : 0)) << 3;
     };
     var buildTextClipping = function (clippings, voffset, vcount) {
@@ -1483,7 +1497,8 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var BuilderBase = /** @class */ (function () {
-        function BuilderBase(vertexOffset, indexOffset, vertexCount, indexCount) {
+        function BuilderBase(buffer, vertexOffset, indexOffset, vertexCount, indexCount) {
+            this.buffer = buffer;
             this.vertexOffset = vertexOffset;
             this.indexOffset = indexOffset;
             this.vertexCount = vertexCount;
@@ -1503,6 +1518,26 @@
             this.texture = null;
             this.textureTransformId = -1;
         }
+        BuilderBase.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            if (this.buffer !== buffer ||
+                this.vertexOffset !== vertexOffset ||
+                this.indexOffset !== indexOffset) {
+                if (buffer.check(vertexOffset, indexOffset, this.vertexCount, this.indexCount)) {
+                    this.inited = BuilderFlag.NONE;
+                    this.buffer = buffer;
+                    this.vertexOffset = vertexOffset;
+                    this.indexOffset = indexOffset;
+                    this.init();
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        };
         BuilderBase.prototype.isCompatible = function (shape) {
             return true;
         };
@@ -2105,6 +2140,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EShapeBarPoints.prototype, "plength", {
+            get: function () {
+                return 2;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(EShapeBarPoints.prototype, "id", {
             get: function () {
                 this.update();
@@ -7778,6 +7820,7 @@
             this._parent = parent;
             this._enable = true;
             this._value = value;
+            this._plength = this._length = value.length;
             this._color = color;
             this._alpha = alpha;
             this._family = family;
@@ -7813,39 +7856,60 @@
             set: function (value) {
                 if (this._value !== value) {
                     this._value = value;
-                    // Compatibility check
-                    var parent_1 = this._parent;
-                    var uploaded = parent_1.uploaded;
-                    if (uploaded == null || !uploaded.isCompatible(parent_1)) {
-                        this.atlas = undefined;
-                        parent_1.toDirty();
-                        return;
+                    var length_1 = value.length;
+                    this._length = length_1;
+                    if (this._plength < length_1) {
+                        this._plength = length_1;
                     }
-                    // Character code check
-                    var atlas = this.atlas;
-                    var characters = atlas && atlas.characters;
-                    if (characters != null) {
-                        for (var i = 0, imax = value.length; i < imax; ++i) {
-                            var char = value[i];
-                            if (!(char in characters)) {
-                                this.atlas = undefined;
-                                parent_1.toDirty();
-                                return;
-                            }
-                        }
+                    if (this.isCompatible(value)) {
+                        this._parent.updateUploaded();
                     }
                     else {
                         this.atlas = undefined;
-                        parent_1.toDirty();
-                        return;
+                        this._parent.toDirty();
                     }
-                    // Update uploaded
-                    parent_1.updateUploaded();
                 }
             },
             enumerable: false,
             configurable: true
         });
+        EShapeTextImpl.prototype.isCompatible = function (value) {
+            // Compatibility check
+            var parent = this._parent;
+            var uploaded = parent.uploaded;
+            if (uploaded == null || !uploaded.isCompatible(parent)) {
+                return false;
+            }
+            // Character code check
+            var atlas = this.atlas;
+            var characters = atlas && atlas.characters;
+            if (characters != null) {
+                for (var i = 0, imax = value.length; i < imax; ++i) {
+                    var char = value[i];
+                    if (!(char in characters)) {
+                        return false;
+                    }
+                }
+            }
+            else {
+                return false;
+            }
+            return true;
+        };
+        Object.defineProperty(EShapeTextImpl.prototype, "length", {
+            get: function () {
+                return this._length;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(EShapeTextImpl.prototype, "plength", {
+            get: function () {
+                return this._plength;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(EShapeTextImpl.prototype, "family", {
             get: function () {
                 return this._family;
@@ -7979,7 +8043,18 @@
             var isChangedUploaded = false;
             if (value != null && this._value !== value) {
                 this._value = value;
-                isChangedDirty = true;
+                var length_2 = value.length;
+                this._length = length_2;
+                if (this._plength < length_2) {
+                    this._plength = length_2;
+                }
+                if (this.isCompatible(value)) {
+                    isChangedUploaded = true;
+                }
+                else {
+                    this.atlas = undefined;
+                    isChangedDirty = true;
+                }
             }
             if (color != null && this._color !== color) {
                 this._color = color;
@@ -8517,22 +8592,24 @@
      */
     var BuilderBar = /** @class */ (function (_super) {
         __extends(BuilderBar, _super);
-        function BuilderBar(vertexOffset, indexOffset) {
-            var _this = _super.call(this, vertexOffset, indexOffset, BAR_VERTEX_COUNT, BAR_INDEX_COUNT) || this;
+        function BuilderBar(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, BAR_VERTEX_COUNT, BAR_INDEX_COUNT) || this;
             _this.pointsId = -1;
             _this.pointsStyle = EShapePointsStyle.NONE;
             return _this;
         }
-        BuilderBar.prototype.init = function (buffer) {
+        BuilderBar.prototype.init = function () {
             var voffset = this.vertexOffset;
             var ioffset = this.indexOffset;
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             buildBarClipping(buffer.clippings, voffset);
             buildBarIndex(buffer.indices, voffset, ioffset);
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderBar.prototype.update = function (buffer, shape) {
+        BuilderBar.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexStepAndColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
             this.updateUv(buffer, shape);
@@ -8602,7 +8679,8 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var BuilderText = /** @class */ (function () {
-        function BuilderText(vertexOffset, indexOffset, vertexCount, indexCount) {
+        function BuilderText(buffer, vertexOffset, indexOffset, vertexCount, indexCount) {
+            this.buffer = buffer;
             this.vertexOffset = vertexOffset;
             this.indexOffset = indexOffset;
             this.vertexCount = vertexCount;
@@ -8637,10 +8715,11 @@
             this.clipping = false;
             this.fitting = false;
         }
-        BuilderText.prototype.init = function (buffer) {
+        BuilderText.prototype.init = function () {
             var vcount = this.vertexCount;
             if (0 < vcount) {
                 // Clippings
+                var buffer = this.buffer;
                 var voffset = this.vertexOffset;
                 buffer.updateClippings();
                 buildTextClipping(buffer.clippings, voffset, vcount);
@@ -8649,21 +8728,51 @@
                 buildTextIndex(buffer.indices, voffset, this.indexOffset, this.indexCount);
             }
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
+            return this;
+        };
+        BuilderText.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            var tcount = toTextBufferCount(shape);
+            var vertexCount = tcount << TEXT_VERTEX_COUNT_SHIFT;
+            var indexCount = tcount << TEXT_INDEX_COUNT_SHIFT;
+            if (this.buffer !== buffer ||
+                this.vertexOffset !== vertexOffset ||
+                this.indexOffset !== indexOffset ||
+                this.vertexCount !== vertexCount ||
+                this.indexCount !== indexCount) {
+                if (buffer.check(vertexOffset, indexOffset, vertexCount, indexCount)) {
+                    this.inited = BuilderFlag.NONE;
+                    this.buffer = buffer;
+                    this.vertexOffset = vertexOffset;
+                    this.indexOffset = indexOffset;
+                    this.vertexCount = vertexCount;
+                    this.indexCount = indexCount;
+                    this.init();
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
         };
         BuilderText.prototype.isCompatible = function (shape) {
             return toTextBufferCount(shape) << TEXT_VERTEX_COUNT_SHIFT === this.vertexCount;
         };
-        BuilderText.prototype.update = function (buffer, shape) {
+        BuilderText.prototype.update = function (shape) {
             var vcount = this.vertexCount;
             if (0 < vcount) {
                 var textAtlas = shape.text.atlas;
                 if (textAtlas != null) {
+                    var buffer = this.buffer;
                     this.updateVertex(buffer, shape, textAtlas);
                     this.updateColorFill(buffer, shape);
                     this.updateColorStroke(buffer, shape);
                     this.updateStep(buffer, shape);
                 }
             }
+            return this;
         };
         BuilderText.prototype.updateVertex = function (buffer, shape, textAtlas) {
             var size = shape.size;
@@ -8832,8 +8941,8 @@
         var icount = BAR_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderBar(voffset, ioffset),
-                new BuilderText(voffset + BAR_VERTEX_COUNT, ioffset + BAR_INDEX_COUNT, tvcount, ticount)
+                new BuilderBar(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + BAR_VERTEX_COUNT, ioffset + BAR_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -19750,6 +19859,8 @@
             this._valuesBaseLength = 0;
             this._values = [];
             this._segments = [];
+            this._length = 0;
+            this._plength = 0;
             var parentSize = parent.size;
             var parentSizeX = parentSize.x;
             var parentSizeY = parentSize.y;
@@ -19761,7 +19872,14 @@
         }
         Object.defineProperty(EShapeLinePoints.prototype, "length", {
             get: function () {
-                return this._values.length >> 1;
+                return this._length;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(EShapeLinePoints.prototype, "plength", {
+            get: function () {
+                return this._plength;
             },
             enumerable: false,
             configurable: true
@@ -19818,7 +19936,6 @@
             if (this._formatter || this._style & EShapePointsStyle.FORMATTER_MASK) {
                 var uploaded = parent.uploaded;
                 if (uploaded && !uploaded.isCompatible(parent)) {
-                    parent.uploaded = undefined;
                     parent.toDirty();
                 }
             }
@@ -19922,6 +20039,7 @@
                         if (result == null) {
                             result = {
                                 length: 0,
+                                plength: 0,
                                 values: [],
                                 segments: [],
                                 boundary: [0, 0, 0, 0],
@@ -19932,6 +20050,9 @@
                         var segments = this._segments;
                         var length_1 = values.length >> 1;
                         formatter(length_1, values, segments, style, result);
+                        if (result.plength < result.length) {
+                            result.plength = result.length;
+                        }
                         toPointsBoundary(result.values, result.boundary);
                     }
                     else {
@@ -20021,6 +20142,11 @@
                         }
                     }
                 }
+                var newLength = newValuesLength >> 1;
+                this._length = newLength;
+                if (this._plength < newLength) {
+                    this._plength = newLength;
+                }
             }
             // Segments
             if (newSegments != null) {
@@ -20086,7 +20212,6 @@
                         parent_1.updateUploaded();
                     }
                     else {
-                        parent_1.uploaded = undefined;
                         parent_1.toDirty();
                     }
                 }
@@ -21768,12 +21893,6 @@
                 }
             }
         };
-        EShapeBuffer.prototype.isCompatible = function (shape, uploaded, vindex, iindex) {
-            return (uploaded.getBuffer() === this &&
-                uploaded.getVertexOffset() === vindex &&
-                uploaded.getIndexOffset() === iindex &&
-                uploaded.isCompatible(shape));
-        };
         EShapeBuffer.prototype.update = function (iterator, antialiasWeight, noMoreThanOne) {
             var builder = this._builder;
             builder.begin();
@@ -21782,28 +21901,18 @@
             var shape = iterator.get();
             for (; shape != null; shape = iterator.next()) {
                 var uploaded = shape.uploaded;
-                if (uploaded == null || !this.isCompatible(shape, uploaded, vindex, iindex)) {
-                    break;
-                }
-                uploaded.update(shape);
-                uploaded.buildUnit(builder);
-                vindex += uploaded.getVertexCount();
-                iindex += uploaded.getIndexCount();
-                if (noMoreThanOne) {
-                    iterator.next();
-                    builder.end();
-                    this._vertexCount = vindex;
-                    this._indexCount = iindex;
-                    return 0 < builder.units.length;
-                }
-            }
-            for (; shape != null; shape = iterator.next()) {
-                var creater = EShapeUploadeds[shape.type] || EShapeUploadeds[EShapeType.GROUP];
-                if (creater == null) {
-                    break;
-                }
-                var uploaded = creater(this, shape, vindex, iindex, antialiasWeight);
                 if (uploaded == null) {
+                    var creator = EShapeUploadeds[shape.type] || EShapeUploadeds[EShapeType.GROUP];
+                    if (creator == null) {
+                        break;
+                    }
+                    var newUploaded = creator(this, shape, vindex, iindex, antialiasWeight);
+                    if (newUploaded == null) {
+                        break;
+                    }
+                    uploaded = newUploaded;
+                }
+                else if (!uploaded.reinit(this, shape, vindex, iindex)) {
                     break;
                 }
                 uploaded.buildUnit(builder);
@@ -36234,18 +36343,20 @@
      */
     var BuilderRectangleRounded = /** @class */ (function (_super) {
         __extends(BuilderRectangleRounded, _super);
-        function BuilderRectangleRounded(vertexOffset, indexOffset, vertexCount, indexCount) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount) || this;
+        function BuilderRectangleRounded(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, RECTANGLE_ROUNDED_VERTEX_COUNT, RECTANGLE_ROUNDED_INDEX_COUNT) || this;
             _this.radius = 0;
             _this.corner = 0;
             return _this;
         }
-        BuilderRectangleRounded.prototype.init = function (buffer) {
+        BuilderRectangleRounded.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildRectangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderRectangleRounded.prototype.update = function (buffer, shape) {
+        BuilderRectangleRounded.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexClippingStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -36327,8 +36438,8 @@
         var icount = RECTANGLE_ROUNDED_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderRectangleRounded(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset + RECTANGLE_ROUNDED_VERTEX_COUNT, ioffset + RECTANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
+                new BuilderRectangleRounded(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + RECTANGLE_ROUNDED_VERTEX_COUNT, ioffset + RECTANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -37199,10 +37310,11 @@
      */
     var BuilderCircle = /** @class */ (function (_super) {
         __extends(BuilderCircle, _super);
-        function BuilderCircle(vertexOffset, indexOffset) {
-            return _super.call(this, vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT) || this;
+        function BuilderCircle(buffer, vertexOffset, indexOffset) {
+            return _super.call(this, buffer, vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT) || this;
         }
-        BuilderCircle.prototype.init = function (buffer) {
+        BuilderCircle.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             var voffset = this.vertexOffset;
@@ -37210,7 +37322,8 @@
             buildCircleIndex(buffer.indices, voffset, this.indexOffset);
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderCircle.prototype.update = function (buffer, shape) {
+        BuilderCircle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexAndStep(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -37276,8 +37389,8 @@
         var icount = CIRCLE_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderCircle(voffset, ioffset),
-                new BuilderText(voffset + CIRCLE_VERTEX_COUNT, ioffset + CIRCLE_INDEX_COUNT, tvcount, ticount)
+                new BuilderCircle(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + CIRCLE_VERTEX_COUNT, ioffset + CIRCLE_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -37302,21 +37415,22 @@
 
     var LINE_FMIN = 0.00001;
     var LINE_WORK_POINT = new pixi_js.Point();
-    var toPointsCount = function (points) {
+    var toPointCount = function (points) {
         if (points) {
-            return points.formatted.length;
+            return points.formatted.plength;
         }
         return 0;
     };
     var toLinePointCount = function (points) {
-        return Math.ceil(toPointsCount(points) / 12) * 12;
+        var pointCount = toPointCount(points);
+        return ((pointCount >> 4) + (0 < (pointCount & 0xf) ? 1 : 0)) << 4;
     };
     var toLineVertexCount = function (pointCount, isClosed) {
         if (isClosed) {
-            return pointCount * 4 + 2;
+            return (pointCount << 2) + 2;
         }
         else {
-            return pointCount * 4;
+            return pointCount << 2;
         }
     };
     var toLineIndexCount = function (pointCount, isClosed) {
@@ -37704,24 +37818,53 @@
      */
     var BuilderLine = /** @class */ (function (_super) {
         __extends(BuilderLine, _super);
-        function BuilderLine(vertexOffset, indexOffset, vertexCount, indexCount) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount) || this;
+        function BuilderLine(buffer, vertexOffset, indexOffset, vertexCount, indexCount) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, vertexCount, indexCount) || this;
             _this.pointId = -1;
             _this.pointCount = 0;
             _this.pointsClosed = false;
             _this.length = 1;
             return _this;
         }
-        BuilderLine.prototype.init = function (buffer) {
+        BuilderLine.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildLineIndex(buffer.indices, this.vertexOffset, this.indexOffset, this.indexCount);
             this.inited |= BuilderFlag.INDEX;
         };
+        BuilderLine.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            var pointCount = toLinePointCount(shape.points);
+            var vertexCount = toLineVertexCount(pointCount, true);
+            var indexCount = toLineIndexCount(pointCount, true);
+            if (this.buffer !== buffer ||
+                this.vertexOffset !== vertexOffset ||
+                this.indexOffset !== indexOffset ||
+                this.vertexCount !== vertexCount ||
+                this.indexCount !== indexCount) {
+                if (buffer.check(vertexOffset, indexOffset, vertexCount, indexCount)) {
+                    this.inited = BuilderFlag.NONE;
+                    this.buffer = buffer;
+                    this.vertexOffset = vertexOffset;
+                    this.indexOffset = indexOffset;
+                    this.vertexCount = vertexCount;
+                    this.indexCount = indexCount;
+                    this.init();
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        };
         BuilderLine.prototype.isCompatible = function (shape) {
             var vcount = toLineVertexCount(toLinePointCount(shape.points), true);
             return vcount === this.vertexCount;
         };
-        BuilderLine.prototype.update = function (buffer, shape) {
+        BuilderLine.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateLineClipping(buffer, shape);
             this.updateLineVertexStepAndColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -37970,19 +38113,21 @@
      */
     var BuilderMarkerTriangle = /** @class */ (function (_super) {
         __extends(BuilderMarkerTriangle, _super);
-        function BuilderMarkerTriangle(vertexOffset, indexOffset) {
-            var _this = _super.call(this, vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT) || this;
+        function BuilderMarkerTriangle(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT) || this;
             _this.pointId = -1;
             return _this;
         }
-        BuilderMarkerTriangle.prototype.init = function (buffer) {
+        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;
         };
-        BuilderMarkerTriangle.prototype.update = function (buffer, shape) {
+        BuilderMarkerTriangle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -38087,12 +38232,13 @@
      */
     var BuilderMarkerCircle = /** @class */ (function (_super) {
         __extends(BuilderMarkerCircle, _super);
-        function BuilderMarkerCircle(vertexOffset, indexOffset) {
-            var _this = _super.call(this, vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT) || this;
+        function BuilderMarkerCircle(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, CIRCLE_VERTEX_COUNT, CIRCLE_INDEX_COUNT) || this;
             _this.pointId = -1;
             return _this;
         }
-        BuilderMarkerCircle.prototype.init = function (buffer) {
+        BuilderMarkerCircle.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             var vertexOffset = this.vertexOffset;
@@ -38100,7 +38246,8 @@
             buildCircleIndex(buffer.indices, vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderMarkerCircle.prototype.update = function (buffer, shape) {
+        BuilderMarkerCircle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexAndStep(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -38208,20 +38355,27 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var BuilderNull = /** @class */ (function () {
-        function BuilderNull(vertexOffset, indexOffset) {
+        function BuilderNull(buffer, vertexOffset, indexOffset) {
+            this.buffer = buffer;
             this.vertexOffset = vertexOffset;
             this.indexOffset = indexOffset;
             this.vertexCount = 0;
             this.indexCount = 0;
             this.texture = null;
         }
-        BuilderNull.prototype.init = function (buffer) {
-            // DO NOTHING
+        BuilderNull.prototype.init = function () {
+            return this;
+        };
+        BuilderNull.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            this.buffer = buffer;
+            this.vertexOffset = vertexOffset;
+            this.indexOffset = indexOffset;
+            return true;
         };
         BuilderNull.prototype.isCompatible = function (shape) {
             return true;
         };
-        BuilderNull.prototype.update = function (buffer, shape) {
+        BuilderNull.prototype.update = function (shape) {
             this.texture = toTexture(shape);
         };
         BuilderNull.prototype.buildUnit = function (builder) {
@@ -38651,17 +38805,19 @@
      */
     var BuilderMarkerRectangle = /** @class */ (function (_super) {
         __extends(BuilderMarkerRectangle, _super);
-        function BuilderMarkerRectangle(vertexOffset, indexOffset) {
-            var _this = _super.call(this, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT) || this;
+        function BuilderMarkerRectangle(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT) || this;
             _this.pointId = -1;
             return _this;
         }
-        BuilderMarkerRectangle.prototype.init = function (buffer) {
+        BuilderMarkerRectangle.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderMarkerRectangle.prototype.update = function (buffer, shape) {
+        BuilderMarkerRectangle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexClippingStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -38800,31 +38956,31 @@
         }
         return 0;
     };
-    var toBuilderMarkerHead = function (type, vertexOffset, indexOffset) {
+    var toBuilderMarkerHead = function (type, buffer, vertexOffset, indexOffset) {
         switch (type) {
             case EShapePointsMarkerType.NONE:
-                return new BuilderNull(vertexOffset, indexOffset);
+                return new BuilderNull(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.CIRCLE:
-                return new BuilderMarkerCircleHead(vertexOffset, indexOffset);
+                return new BuilderMarkerCircleHead(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.TRIANGLE:
-                return new BuilderMarkerTriangleHead(vertexOffset, indexOffset);
+                return new BuilderMarkerTriangleHead(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.RECTANGLE:
-                return new BuilderMarkerRectangleHead(vertexOffset, indexOffset);
+                return new BuilderMarkerRectangleHead(buffer, vertexOffset, indexOffset);
         }
-        return new BuilderNull(vertexOffset, indexOffset);
+        return new BuilderNull(buffer, vertexOffset, indexOffset);
     };
-    var toBuilderMarkerTail = function (type, vertexOffset, indexOffset) {
+    var toBuilderMarkerTail = function (type, buffer, vertexOffset, indexOffset) {
         switch (type) {
             case EShapePointsMarkerType.NONE:
-                return new BuilderNull(vertexOffset, indexOffset);
+                return new BuilderNull(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.CIRCLE:
-                return new BuilderMarkerCircleTail(vertexOffset, indexOffset);
+                return new BuilderMarkerCircleTail(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.TRIANGLE:
-                return new BuilderMarkerTriangleTail(vertexOffset, indexOffset);
+                return new BuilderMarkerTriangleTail(buffer, vertexOffset, indexOffset);
             case EShapePointsMarkerType.RECTANGLE:
-                return new BuilderMarkerRectangleTail(vertexOffset, indexOffset);
+                return new BuilderMarkerRectangleTail(buffer, vertexOffset, indexOffset);
         }
-        return new BuilderNull(vertexOffset, indexOffset);
+        return new BuilderNull(buffer, vertexOffset, indexOffset);
     };
     var createLineUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
         // Line
@@ -38861,10 +39017,10 @@
         var icount = licount + mhicount + mticount + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderLine(voffset, ioffset, lvcount, licount),
-                toBuilderMarkerTail(mttype, mtvoffset, mtioffset),
-                toBuilderMarkerHead(mhtype, mhvoffset, mhioffset),
-                new BuilderText(tvoffset, tioffset, tvcount, ticount)
+                new BuilderLine(buffer, voffset, ioffset, lvcount, licount),
+                toBuilderMarkerTail(mttype, buffer, mtvoffset, mtioffset),
+                toBuilderMarkerHead(mhtype, buffer, mhvoffset, mhioffset),
+                new BuilderText(buffer, tvoffset, tioffset, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -39363,15 +39519,17 @@
      */
     var BuilderRectanglePivoted = /** @class */ (function (_super) {
         __extends(BuilderRectanglePivoted, _super);
-        function BuilderRectanglePivoted() {
-            return _super !== null && _super.apply(this, arguments) || this;
+        function BuilderRectanglePivoted(buffer, vertexOffset, indexOffset) {
+            return _super.call(this, buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT) || this;
         }
-        BuilderRectanglePivoted.prototype.init = function (buffer) {
+        BuilderRectanglePivoted.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderRectanglePivoted.prototype.update = function (buffer, shape) {
+        BuilderRectanglePivoted.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexClippingStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -39444,8 +39602,8 @@
         var icount = RECTANGLE_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderRectanglePivoted(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset + RECTANGLE_VERTEX_COUNT, ioffset + RECTANGLE_INDEX_COUNT, tvcount, ticount)
+                new BuilderRectanglePivoted(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + RECTANGLE_VERTEX_COUNT, ioffset + RECTANGLE_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -39463,7 +39621,7 @@
         var icount = ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderText(voffset, ioffset, tvcount, ticount)
+                new BuilderText(buffer, voffset, ioffset, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -39750,6 +39908,20 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EShapeGroupPoints.prototype, "plength", {
+            get: function () {
+                var children = this._parent.children;
+                if (0 < children.length) {
+                    var points = children[children.length - 1].points;
+                    if (points != null) {
+                        return points.plength;
+                    }
+                }
+                return 0;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(EShapeGroupPoints.prototype, "id", {
             get: function () {
                 var children = this._parent.children;
@@ -40452,15 +40624,17 @@
      */
     var BuilderRectangle = /** @class */ (function (_super) {
         __extends(BuilderRectangle, _super);
-        function BuilderRectangle() {
-            return _super !== null && _super.apply(this, arguments) || this;
+        function BuilderRectangle(buffer, vertexOffset, indexOffset) {
+            return _super.call(this, buffer, vertexOffset, indexOffset, RECTANGLE_VERTEX_COUNT, RECTANGLE_INDEX_COUNT) || this;
         }
-        BuilderRectangle.prototype.init = function (buffer) {
+        BuilderRectangle.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildRectangleIndex(buffer.indices, this.vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderRectangle.prototype.update = function (buffer, shape) {
+        BuilderRectangle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexClippingStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -40533,8 +40707,8 @@
         var icount = RECTANGLE_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderRectangle(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset + RECTANGLE_VERTEX_COUNT, ioffset + RECTANGLE_INDEX_COUNT, tvcount, ticount)
+                new BuilderRectangle(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + RECTANGLE_VERTEX_COUNT, ioffset + RECTANGLE_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -40769,21 +40943,23 @@
      */
     var BuilderImageSdf = /** @class */ (function (_super) {
         __extends(BuilderImageSdf, _super);
-        function BuilderImageSdf(vertexOffset, indexOffset) {
-            var _this = _super.call(this, vertexOffset, indexOffset, IMAGE_SDF_VERTEX_COUNT, IMAGE_SDF_INDEX_COUNT) || this;
+        function BuilderImageSdf(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, IMAGE_SDF_VERTEX_COUNT, IMAGE_SDF_INDEX_COUNT) || this;
             _this.textureWidth = -1;
             _this.textureHeight = -1;
             return _this;
         }
-        BuilderImageSdf.prototype.init = function (buffer) {
+        BuilderImageSdf.prototype.init = function () {
             var voffset = this.vertexOffset;
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             buildImageSdfClipping(buffer.clippings, voffset);
             buildImageSdfIndex(buffer.indices, voffset, this.indexOffset);
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderImageSdf.prototype.update = function (buffer, shape) {
+        BuilderImageSdf.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexAndStep(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -40859,8 +41035,8 @@
         var icount = IMAGE_SDF_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderImageSdf(voffset, ioffset),
-                new BuilderText(voffset + IMAGE_SDF_VERTEX_COUNT, ioffset + IMAGE_SDF_INDEX_COUNT, tvcount, ticount)
+                new BuilderImageSdf(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + IMAGE_SDF_VERTEX_COUNT, ioffset + IMAGE_SDF_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -40904,20 +41080,27 @@
      * SPDX-License-Identifier: Apache-2.0
      */
     var BuilderLabel = /** @class */ (function () {
-        function BuilderLabel(vertexOffset, indexOffset, vertexCount, indexCount) {
+        function BuilderLabel(buffer, vertexOffset, indexOffset) {
+            this.buffer = buffer;
             this.vertexOffset = vertexOffset;
             this.indexOffset = indexOffset;
-            this.vertexCount = vertexCount;
-            this.indexCount = indexCount;
+            this.vertexCount = 0;
+            this.indexCount = 0;
             this.texture = null;
         }
-        BuilderLabel.prototype.init = function (buffer) {
-            // DO NOTHING
+        BuilderLabel.prototype.init = function () {
+            return this;
+        };
+        BuilderLabel.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            this.buffer = buffer;
+            this.vertexOffset = vertexOffset;
+            this.indexOffset = indexOffset;
+            return true;
         };
         BuilderLabel.prototype.isCompatible = function (shape) {
             return true;
         };
-        BuilderLabel.prototype.update = function (buffer, shape) {
+        BuilderLabel.prototype.update = function (shape) {
             this.texture = toTexture(shape);
         };
         BuilderLabel.prototype.buildUnit = function (builder) {
@@ -40944,8 +41127,8 @@
         var icount = ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderLabel(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset, ioffset, tvcount, ticount)
+                new BuilderLabel(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset, ioffset, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -41081,7 +41264,7 @@
     };
 
     var toLineOfAnyPointCount = function (pointCount) {
-        return Math.ceil(pointCount / 12) * 12;
+        return ((pointCount >> 4) + (0 < (pointCount & 0xf) ? 1 : 0)) << 4;
     };
     var buildLineOfAnyColor = function (voffset, vcountPerPoint, point, pointCount, colors, isEnabled, colorDef, alphaDef) {
         if (isEnabled) {
@@ -41135,8 +41318,8 @@
      */
     var BuilderLineOfAny = /** @class */ (function (_super) {
         __extends(BuilderLineOfAny, _super);
-        function BuilderLineOfAny(vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount) || this;
+        function BuilderLineOfAny(buffer, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved, vcountPerPoint, icountPerPoint) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, vertexCount, indexCount) || this;
             _this.pointId = -1;
             _this.pointCount = 0;
             _this.pointCountReserved = pointCountReserved;
@@ -41144,10 +41327,39 @@
             _this.pointOffsetId = -1;
             _this.pointFillId = -1;
             _this.pointStrokeId = -1;
+            _this.vcountPerPoint = vcountPerPoint;
+            _this.icountPerPoint = icountPerPoint;
             return _this;
         }
+        BuilderLineOfAny.prototype.reinit = function (buffer, shape, vertexOffset, indexOffset) {
+            var pointCount = toLineOfAnyPointCount(toPointCount(shape.points));
+            if (this.buffer !== buffer ||
+                this.vertexOffset !== vertexOffset ||
+                this.indexOffset !== indexOffset ||
+                this.pointCountReserved !== pointCount) {
+                var vertexCount = pointCount * this.vcountPerPoint;
+                var indexCount = pointCount * this.icountPerPoint;
+                if (buffer.check(vertexOffset, indexOffset, vertexCount, indexCount)) {
+                    this.inited = BuilderFlag.NONE;
+                    this.buffer = buffer;
+                    this.vertexOffset = vertexOffset;
+                    this.indexOffset = indexOffset;
+                    this.vertexCount = vertexCount;
+                    this.indexCount = indexCount;
+                    this.pointCountReserved = pointCount;
+                    this.init();
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        };
         BuilderLineOfAny.prototype.isCompatible = function (shape) {
-            var pointCount = toLineOfAnyPointCount(toPointsCount(shape.points));
+            var pointCount = toLineOfAnyPointCount(toPointCount(shape.points));
             return pointCount === this.pointCountReserved;
         };
         BuilderLineOfAny.prototype.updateLineOfAnyColorFill = function (buffer, shape, points, vcountPerPoint) {
@@ -41159,7 +41371,9 @@
             var colorFill = fill.color;
             var alphaFill = isFillEnabled ? fill.alpha : 0;
             var isFillChanged = colorFill !== this.colorFill || alphaFill !== this.alphaFill;
-            if (isPointFillChanged || isFillChanged) {
+            var isNotInited = !(this.inited & BuilderFlag.COLOR_FILL);
+            if (isNotInited || isPointFillChanged || isFillChanged) {
+                this.inited |= BuilderFlag.COLOR_FILL;
                 this.colorFill = colorFill;
                 this.alphaFill = alphaFill;
                 this.pointFillId = pointFillId;
@@ -41634,6 +41848,8 @@
             this._values = [];
             this._valuesLength = 0;
             this._segments = [];
+            this._length = 0;
+            this._plength = 0;
             this._size = new EShapeLineOfAnyPointsPointImpl(this, EShapeDefaults.SIZE_X, EShapeDefaults.SIZE_Y);
             this._offset = new EShapeLineOfAnyPointsPointImpl(this, 0, 0);
             this._fill = new EShapeLineOfAnyPointsFillImpl(parent);
@@ -41642,7 +41858,14 @@
         }
         Object.defineProperty(EShapeLineOfAnyPointsImpl.prototype, "length", {
             get: function () {
-                return this._values.length >> 1;
+                return this._length;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(EShapeLineOfAnyPointsImpl.prototype, "plength", {
+            get: function () {
+                return this._plength;
             },
             enumerable: false,
             configurable: true
@@ -41787,6 +42010,11 @@
                         isUpdated = true;
                     }
                 }
+                var newLength = newValuesLength >> 1;
+                this._length = newLength;
+                if (this._plength < newLength) {
+                    this._plength = newLength;
+                }
             }
             //
             if (isDirty) {
@@ -41798,7 +42026,6 @@
                         parent_1.updateUploaded();
                     }
                     else {
-                        parent_1.uploaded = undefined;
                         parent_1.toDirty();
                     }
                 }
@@ -41873,7 +42100,8 @@
         function BuilderLineOfCircles() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        BuilderLineOfCircles.prototype.init = function (buffer) {
+        BuilderLineOfCircles.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             var clippings = buffer.clippings;
@@ -41889,9 +42117,10 @@
             }
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderLineOfCircles.prototype.update = function (buffer, shape) {
+        BuilderLineOfCircles.prototype.update = function (shape) {
             var points = shape.points;
             if (points instanceof EShapeLineOfAnyPointsImpl) {
+                var buffer = this.buffer;
                 this.updateVertexAndStep(buffer, shape, points);
                 this.updateLineOfAnyColorFill(buffer, shape, points, CIRCLE_VERTEX_COUNT);
                 this.updateLineOfAnyColorStroke(buffer, shape, points, CIRCLE_VERTEX_COUNT);
@@ -42009,15 +42238,15 @@
         var tvcount = tcount << TEXT_VERTEX_COUNT_SHIFT;
         var ticount = tcount << TEXT_INDEX_COUNT_SHIFT;
         var points = shape.points;
-        var pointCount = toLineOfAnyPointCount(toPointsCount(points));
+        var pointCount = toLineOfAnyPointCount(toPointCount(points));
         var pvcount = pointCount * vcountPerPoint;
         var picount = pointCount * icountPerPoint;
         var vcount = pvcount + tvcount;
         var icount = picount + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new constructor(voffset, ioffset, pvcount, picount, pointCount),
-                new BuilderText(voffset + pvcount, ioffset + picount, tvcount, ticount)
+                new constructor(buffer, voffset, ioffset, pvcount, picount, pointCount, vcountPerPoint, icountPerPoint),
+                new BuilderText(buffer, voffset + pvcount, ioffset + picount, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -42100,13 +42329,14 @@
      */
     var BuilderLineOfRectangleRoundeds = /** @class */ (function (_super) {
         __extends(BuilderLineOfRectangleRoundeds, _super);
-        function BuilderLineOfRectangleRoundeds(vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved) || this;
+        function BuilderLineOfRectangleRoundeds(buffer, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved, vcountPerPoint, icountPerPoint) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved, vcountPerPoint, icountPerPoint) || this;
             _this.radius = 0;
             _this.corner = 0;
             return _this;
         }
-        BuilderLineOfRectangleRoundeds.prototype.init = function (buffer) {
+        BuilderLineOfRectangleRoundeds.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             var indices = buffer.indices;
             var voffset = this.vertexOffset;
@@ -42118,9 +42348,10 @@
             }
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderLineOfRectangleRoundeds.prototype.update = function (buffer, shape) {
+        BuilderLineOfRectangleRoundeds.prototype.update = function (shape) {
             var points = shape.points;
             if (points instanceof EShapeLineOfAnyPointsImpl) {
+                var buffer = this.buffer;
                 this.updateVertexClippingStepAndUv(buffer, shape, points);
                 this.updateLineOfAnyColorFill(buffer, shape, points, RECTANGLE_ROUNDED_VERTEX_COUNT);
                 this.updateLineOfAnyColorStroke(buffer, shape, points, RECTANGLE_ROUNDED_VERTEX_COUNT);
@@ -42339,7 +42570,8 @@
         function BuilderLineOfRectangles() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        BuilderLineOfRectangles.prototype.init = function (buffer) {
+        BuilderLineOfRectangles.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             var indices = buffer.indices;
             var voffset = this.vertexOffset;
@@ -42351,9 +42583,10 @@
             }
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderLineOfRectangles.prototype.update = function (buffer, shape) {
+        BuilderLineOfRectangles.prototype.update = function (shape) {
             var points = shape.points;
             if (points instanceof EShapeLineOfAnyPointsImpl) {
+                var buffer = this.buffer;
                 this.updateVertexClippingStepAndUv(buffer, shape, points);
                 this.updateLineOfAnyColorFill(buffer, shape, points, RECTANGLE_VERTEX_COUNT);
                 this.updateLineOfAnyColorStroke(buffer, shape, points, RECTANGLE_VERTEX_COUNT);
@@ -42964,13 +43197,14 @@
      */
     var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
         __extends(BuilderLineOfTriangleRoundeds, _super);
-        function BuilderLineOfTriangleRoundeds(vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved) || this;
+        function BuilderLineOfTriangleRoundeds(buffer, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved, vcountPerPoint, icountPerPoint) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, vertexCount, indexCount, pointCountReserved, vcountPerPoint, icountPerPoint) || this;
             _this.radius = 0;
             _this.corner = 0;
             return _this;
         }
-        BuilderLineOfTriangleRoundeds.prototype.init = function (buffer) {
+        BuilderLineOfTriangleRoundeds.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             var voffset = this.vertexOffset;
             var ioffset = this.indexOffset;
@@ -42981,9 +43215,10 @@
             }
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderLineOfTriangleRoundeds.prototype.update = function (buffer, shape) {
+        BuilderLineOfTriangleRoundeds.prototype.update = function (shape) {
             var points = shape.points;
             if (points instanceof EShapeLineOfAnyPointsImpl) {
+                var buffer = this.buffer;
                 this.updateVertexClippingStepAndUv(buffer, shape, points);
                 this.updateLineOfAnyColorFill(buffer, shape, points, TRIANGLE_ROUNDED_VERTEX_COUNT);
                 this.updateLineOfAnyColorStroke(buffer, shape, points, TRIANGLE_ROUNDED_VERTEX_COUNT);
@@ -43346,7 +43581,8 @@
         function BuilderLineOfTriangles() {
             return _super !== null && _super.apply(this, arguments) || this;
         }
-        BuilderLineOfTriangles.prototype.init = function (buffer) {
+        BuilderLineOfTriangles.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             var clippings = buffer.clippings;
@@ -43362,9 +43598,10 @@
             }
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderLineOfTriangles.prototype.update = function (buffer, shape) {
+        BuilderLineOfTriangles.prototype.update = function (shape) {
             var points = shape.points;
             if (points instanceof EShapeLineOfAnyPointsImpl) {
+                var buffer = this.buffer;
                 this.updateVertexStepAndUvs(buffer, shape, points);
                 this.updateLineOfAnyColorFill(buffer, shape, points, TRIANGLE_VERTEX_COUNT);
                 this.updateLineOfAnyColorStroke(buffer, shape, points, TRIANGLE_VERTEX_COUNT);
@@ -43570,7 +43807,7 @@
      */
     var createNullUploaded = function (buffer, shape, voffset, ioffset) {
         return new EShapeUploadedImpl(buffer, voffset, ioffset, 0, 0, [
-            new BuilderNull(voffset, ioffset)
+            new BuilderNull(buffer, voffset, ioffset)
         ]).init(shape);
     };
 
@@ -43790,10 +44027,11 @@
      */
     var BuilderSemicircle = /** @class */ (function (_super) {
         __extends(BuilderSemicircle, _super);
-        function BuilderSemicircle(vertexOffset, indexOffset) {
-            return _super.call(this, vertexOffset, indexOffset, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_INDEX_COUNT) || this;
+        function BuilderSemicircle(buffer, vertexOffset, indexOffset) {
+            return _super.call(this, buffer, vertexOffset, indexOffset, SEMICIRCLE_VERTEX_COUNT, SEMICIRCLE_INDEX_COUNT) || this;
         }
-        BuilderSemicircle.prototype.init = function (buffer) {
+        BuilderSemicircle.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateClippings();
             buffer.updateIndices();
             var voffset = this.vertexOffset;
@@ -43801,7 +44039,8 @@
             buildSemicircleIndex(buffer.indices, voffset, this.indexOffset);
             this.inited |= BuilderFlag.CLIPPING_AND_INDEX;
         };
-        BuilderSemicircle.prototype.update = function (buffer, shape) {
+        BuilderSemicircle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexAndStep(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -43867,8 +44106,8 @@
         var icount = SEMICIRCLE_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderSemicircle(voffset, ioffset),
-                new BuilderText(voffset + SEMICIRCLE_VERTEX_COUNT, ioffset + SEMICIRCLE_INDEX_COUNT, tvcount, ticount)
+                new BuilderSemicircle(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + SEMICIRCLE_VERTEX_COUNT, ioffset + SEMICIRCLE_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -43937,17 +44176,19 @@
      */
     var BuilderTriangle = /** @class */ (function (_super) {
         __extends(BuilderTriangle, _super);
-        function BuilderTriangle() {
-            return _super !== null && _super.apply(this, arguments) || this;
+        function BuilderTriangle(buffer, vertexOffset, indexOffset) {
+            return _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_VERTEX_COUNT, TRIANGLE_INDEX_COUNT) || this;
         }
-        BuilderTriangle.prototype.init = function (buffer) {
+        BuilderTriangle.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;
         };
-        BuilderTriangle.prototype.update = function (buffer, shape) {
+        BuilderTriangle.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -44009,8 +44250,8 @@
         var icount = TRIANGLE_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderTriangle(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset + TRIANGLE_VERTEX_COUNT, ioffset + TRIANGLE_INDEX_COUNT, tvcount, ticount)
+                new BuilderTriangle(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + TRIANGLE_VERTEX_COUNT, ioffset + TRIANGLE_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -44039,18 +44280,20 @@
      */
     var BuilderTriangleRounded = /** @class */ (function (_super) {
         __extends(BuilderTriangleRounded, _super);
-        function BuilderTriangleRounded(vertexOffset, indexOffset, vertexCount, indexCount) {
-            var _this = _super.call(this, vertexOffset, indexOffset, vertexCount, indexCount) || this;
+        function BuilderTriangleRounded(buffer, vertexOffset, indexOffset) {
+            var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_ROUNDED_VERTEX_COUNT, TRIANGLE_ROUNDED_INDEX_COUNT) || this;
             _this.radius = 0;
             _this.corner = 0;
             return _this;
         }
-        BuilderTriangleRounded.prototype.init = function (buffer) {
+        BuilderTriangleRounded.prototype.init = function () {
+            var buffer = this.buffer;
             buffer.updateIndices();
             buildTriangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
             this.inited |= BuilderFlag.INDEX;
         };
-        BuilderTriangleRounded.prototype.update = function (buffer, shape) {
+        BuilderTriangleRounded.prototype.update = function (shape) {
+            var buffer = this.buffer;
             this.updateVertexClippingStepAndUv(buffer, shape);
             this.updateColorFill(buffer, shape);
             this.updateColorStroke(buffer, shape);
@@ -44126,8 +44369,8 @@
         var icount = TRIANGLE_ROUNDED_INDEX_COUNT + ticount;
         if (buffer.check(voffset, ioffset, vcount, icount)) {
             return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
-                new BuilderTriangleRounded(voffset, ioffset, vcount - tvcount, icount - ticount),
-                new BuilderText(voffset + TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset + TRIANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
+                new BuilderTriangleRounded(buffer, voffset, ioffset),
+                new BuilderText(buffer, voffset + TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset + TRIANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
             ]).init(shape);
         }
         return null;
@@ -76766,7 +77009,7 @@
         buildImageSdfUv: buildImageSdfUv,
         toLineOfAnyPointCount: toLineOfAnyPointCount,
         buildLineOfAnyColor: buildLineOfAnyColor,
-        toPointsCount: toPointsCount,
+        toPointCount: toPointCount,
         toLinePointCount: toLinePointCount,
         toLineVertexCount: toLineVertexCount,
         toLineIndexCount: toLineIndexCount,