@wcardinal/wcardinal-ui 0.459.0-beta.0 → 0.459.0-beta.2

package/dist/wcardinal-ui.cjs.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.459.0-beta.0
+ Winter Cardinal UI v0.459.0-beta.2
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1391,16 +1391,18 @@ var EShapePointsStyle = {
     DASHED_LOOSELY: DASHED_LOOSELY,
     /** @deprecated in favor of EShapeStrokeStyle. */
     DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
-    /** @deprecated in favor of CURVE_SPLINE. */
+    /** @deprecated in favor of {@link CURVE_BEZIER_QUADRATIC}. */
     CURVE: CURVE_SPLINE,
+    /** @deprecated in favor of {@link CURVE_BEZIER_QUADRATIC}. */
     CURVE_SPLINE: CURVE_SPLINE,
     CURVE_BEZIER_QUADRATIC: CURVE_BEZIER_QUADRATIC,
     FORMATTER_SHIFT: FORMATTER_SHIFT,
     FORMATTER_MASK: FORMATTER_MASK,
     FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
     FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
-    /** @deprecated in favor of FORMATTER_CURVE_SPLINE. */
+    /** @deprecated in favor of {@link FORMATTER_CURVE_BEZIER_QUADRATIC}. */
     FORMATTER_CURVE: FORMATTER_CURVE_SPLINE,
+    /** @deprecated in favor of {@link FORMATTER_CURVE_BEZIER_QUADRATIC}. */
     FORMATTER_CURVE_SPLINE: FORMATTER_CURVE_SPLINE,
     FORMATTER_CURVE_BEZIER_QUADRATIC: FORMATTER_CURVE_BEZIER_QUADRATIC
 };
@@ -14361,11 +14363,11 @@ var EShapePointsFormatters = /** @class */ (function () {
         }
         this.data.set(id, datum);
     };
-    EShapePointsFormatters.get = function (index) {
+    EShapePointsFormatters.get = function (id) {
         if (this.data == null) {
             this.data = this.newData();
         }
-        return this.data.get(index);
+        return this.data.get(id);
     };
     EShapePointsFormatters.each = function (iteratee) {
         if (this.data == null) {
@@ -48660,58 +48662,49 @@ var buildPolygonVertex = function (vertices, polygonVertices, voffset, internalT
 /**
  * Build step buffer for polygons.
  */
-var buildPolygonStep = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, sizeX, sizeY, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle) {
+var buildPolygonStep = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, polygonBoundary, voffset, vertexCount, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle) {
     var scaleInvariant = toScaleInvariant(strokeStyle);
     var dash = toDash(strokeStyle);
     var w = (strokeSide & EShapeStrokeSide.ALL) === EShapeStrokeSide.ALL ? 1 : 0;
     var e = toPackedI4x64(7 + dash, scaleInvariant, w, 0);
     var fp = Math.max(0, Math.min(1, fillPercent));
-    var ax = Math.abs(sizeX);
-    var ay = Math.abs(sizeY);
-    var is = voffset * 6 - 1;
     switch (fillDirection) {
         case EShapeFillDirection.TOP:
-            for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
-                steps[++is] = strokeWidth;
-                steps[++is] = e;
-                steps[++is] = polygonDistances[i];
-                steps[++is] = ay * (fp - polygonUvs[j]);
-                steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                steps[++is] = polygonLengths[i];
-            }
+            buildPolygonStepY(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[3] - polygonBoundary[1], fp);
             break;
         case EShapeFillDirection.RIGHT:
-            for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
-                steps[++is] = strokeWidth;
-                steps[++is] = e;
-                steps[++is] = polygonDistances[i];
-                steps[++is] = ax * (fp - polygonUvs[j]);
-                steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                steps[++is] = polygonLengths[i];
-            }
+            buildPolygonStepX(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[0] - polygonBoundary[2], 1 - fp);
             break;
         case EShapeFillDirection.BOTTOM:
-            for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
-                steps[++is] = strokeWidth;
-                steps[++is] = e;
-                steps[++is] = polygonDistances[i];
-                steps[++is] = ay * (fp - (1 - polygonUvs[j]));
-                steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                steps[++is] = polygonLengths[i];
-            }
+            buildPolygonStepY(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[1] - polygonBoundary[3], 1 - fp);
             break;
         case EShapeFillDirection.LEFT:
-            for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
-                steps[++is] = strokeWidth;
-                steps[++is] = e;
-                steps[++is] = polygonDistances[i];
-                steps[++is] = ax * (fp - (1 - polygonUvs[j]));
-                steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                steps[++is] = polygonLengths[i];
-            }
+            buildPolygonStepX(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[2] - polygonBoundary[0], fp);
             break;
     }
 };
+var buildPolygonStepX = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, afp, fp) {
+    var is = voffset * 6 - 1;
+    for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
+        steps[++is] = strokeWidth;
+        steps[++is] = e;
+        steps[++is] = polygonDistances[i];
+        steps[++is] = afp * (fp - polygonUvs[j]);
+        steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
+        steps[++is] = polygonLengths[i];
+    }
+};
+var buildPolygonStepY = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, afp, fp) {
+    var is = voffset * 6 - 1;
+    for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
+        steps[++is] = strokeWidth;
+        steps[++is] = e;
+        steps[++is] = polygonDistances[i];
+        steps[++is] = afp * (fp - polygonUvs[j]);
+        steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
+        steps[++is] = polygonLengths[i];
+    }
+};
 /**
  * Build UV buffer for polygons.
  */
@@ -50042,6 +50035,7 @@ var EShapePolygonTriangulatedImpl = /** @class */ (function () {
         this._uvs = [];
         this._indices = [];
         this._nindices = 0;
+        this._boundary = [0, 0, 0, 0];
     }
     Object.defineProperty(EShapePolygonTriangulatedImpl.prototype, "id", {
         get: function () {
@@ -50115,6 +50109,14 @@ var EShapePolygonTriangulatedImpl = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(EShapePolygonTriangulatedImpl.prototype, "boundary", {
+        get: function () {
+            this.triangulate();
+            return this._boundary;
+        },
+        enumerable: false,
+        configurable: true
+    });
     EShapePolygonTriangulatedImpl.prototype.set = function (parentPointsId, vertices, distances, lengths, clippings, uvs, indices) {
         var isChanged = false;
         // Parent Vertex ID
@@ -50205,26 +50207,32 @@ var EShapePolygonTriangulatedImpl = /** @class */ (function () {
             this._parentPointsId = parentPointsId;
             var buffer = UtilStraightSkeletonBuffer.from(UtilStraightSkeleton.from(parentPoints.formatted.values));
             this._id += 1;
-            this._vertices = buffer.vertices;
+            var vertices = buffer.vertices;
+            this._vertices = vertices;
             this._nvertices = buffer.vertices.length >> 1;
             this._distances = buffer.distances;
             this._lengths = buffer.lengths;
             this._clippings = buffer.clippings;
-            this._uvs = this.toUvs(buffer.vertices);
+            var boundary = this._boundary;
+            toPointsBoundary(vertices, boundary);
+            this._uvs = this.toUvs(vertices, boundary);
             this._indices = buffer.indices;
             this._nindices = buffer.indices.length / 3;
         }
     };
-    EShapePolygonTriangulatedImpl.prototype.toUvs = function (vertices) {
+    EShapePolygonTriangulatedImpl.prototype.toUvs = function (vertices, boundary) {
         var result = [];
-        var size = this._parent.size;
-        var ax = Math.abs(size.x);
-        var ay = Math.abs(size.y);
-        var fx = 0 < ax ? 1 / ax : 0;
-        var fy = 0 < ay ? 1 / ay : 0;
+        var xmin = boundary[0];
+        var ymin = boundary[1];
+        var xmax = boundary[2];
+        var ymax = boundary[3];
+        var sx = xmax - xmin;
+        var sy = ymax - ymin;
+        var fx = 0 < sx ? 1 / sx : 0;
+        var fy = 0 < sy ? 1 / sy : 0;
         var verticesLength = vertices.length;
         for (var i = 0; i < verticesLength; i += 2) {
-            result.push(0.5 + vertices[i] * fx, 0.5 + vertices[i + 1] * fy);
+            result.push((vertices[i] - xmin) * fx, (vertices[i + 1] - ymin) * fy);
         }
         return result;
     };
@@ -50372,55 +50380,78 @@ var calcPolygonSquaredDistance = function (values, valuesLength, x, y) {
     return result;
 };
 var hitTestPolygon = function (shape, x, y, ax, ay, sw, ss) {
-    var filled = shape.fill.enable;
+    var fill = shape.fill;
+    var filled = fill.enable;
     if (!filled && sw <= 0) {
         return false;
     }
     var values = shape.points.values;
     var valuesLength = values.length;
     if (6 <= valuesLength) {
-        if (0 < ax && 0 < ay) {
-            var count = 0;
-            var ppvy = values[valuesLength - 3];
-            var pvx = values[valuesLength - 2];
-            var pvy = values[valuesLength - 1];
-            for (var i = 0; i < valuesLength; i += 2) {
-                var vx = values[i];
-                var vy = values[i + 1];
-                if ((pvy <= y && y < vy) || (y <= pvy && vy < y)) {
-                    var dy = vy - pvy;
-                    var t = 0;
-                    if (0 < Math.abs(dy)) {
-                        t = (y - pvy) / dy;
-                    }
-                    var cx = pvx + t * (vx - pvx);
-                    if (x <= cx) {
-                        if (t <= 0) {
-                            // Since we could be just grazing vertices,
-                            // we need to check if the second-previous vertex is on the opposite side.
-                            if ((ppvy <= y && y < vy) || (y <= ppvy && vy < y)) {
-                                count += 1;
-                            }
-                        }
-                        else {
+        var count = 0;
+        var ppvy = values[valuesLength - 3];
+        var pvx = values[valuesLength - 2];
+        var pvy = values[valuesLength - 1];
+        for (var i = 0; i < valuesLength; i += 2) {
+            var vx = values[i];
+            var vy = values[i + 1];
+            if ((pvy <= y && y < vy) || (y <= pvy && vy < y)) {
+                var dy = vy - pvy;
+                var t = 0;
+                if (0 < Math.abs(dy)) {
+                    t = (y - pvy) / dy;
+                }
+                var cx = pvx + t * (vx - pvx);
+                if (x <= cx) {
+                    if (t <= 0) {
+                        // Since we could be just grazing vertices,
+                        // we need to check if the second-previous vertex is on the opposite side.
+                        if ((ppvy <= y && y < vy) || (y <= ppvy && vy < y)) {
                             count += 1;
                         }
                     }
+                    else {
+                        count += 1;
+                    }
                 }
-                ppvy = pvy;
-                pvx = vx;
-                pvy = vy;
             }
-            if (count % 2 === 1) {
-                if (filled) {
+            ppvy = pvy;
+            pvx = vx;
+            pvy = vy;
+        }
+        if (count % 2 === 1) {
+            if (filled) {
+                var percent = fill.percent;
+                if (1 <= percent) {
                     return true;
                 }
-                else {
-                    var sd = calcPolygonSquaredDistance(values, valuesLength, x, y);
-                    var s = sw * ss;
-                    return sd <= s * s;
+                var boundary = shape.triangulated.boundary;
+                switch (fill.direction) {
+                    case EShapeFillDirection.TOP:
+                        if (y - boundary[1] <= percent * (boundary[3] - boundary[1])) {
+                            return true;
+                        }
+                        break;
+                    case EShapeFillDirection.RIGHT:
+                        if ((1 - percent) * (boundary[2] - boundary[0]) <= x - boundary[0]) {
+                            return true;
+                        }
+                        break;
+                    case EShapeFillDirection.BOTTOM:
+                        if ((1 - percent) * (boundary[3] - boundary[1]) <= y - boundary[1]) {
+                            return true;
+                        }
+                        break;
+                    case EShapeFillDirection.LEFT:
+                        if (x - boundary[0] <= percent * (boundary[2] - boundary[0])) {
+                            return true;
+                        }
+                        break;
                 }
             }
+            var sd = calcPolygonSquaredDistance(values, valuesLength, x, y);
+            var s = sw * ss;
+            return sd <= s * s;
         }
     }
     return false;
@@ -50625,8 +50656,7 @@ var BuilderPolygon = /** @class */ (function (_super) {
             // Steps
             if (isNotInited || isTriangulatedIdChanged || isFillChanged || isStrokeChanged) {
                 buffer.updateSteps();
-                var size = shape.size;
-                buildPolygonStep(buffer.steps, triangulated.distances, triangulated.lengths, triangulated.clippings, triangulated.uvs, voffset, this.vertexCount, size.x, size.y, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle);
+                buildPolygonStep(buffer.steps, triangulated.distances, triangulated.lengths, triangulated.clippings, triangulated.uvs, triangulated.boundary, voffset, this.vertexCount, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle);
             }
             // UVs
             if (isNotInited || isTriangulatedIdChanged || isTextureChanged) {
@@ -105859,6 +105889,8 @@ exports.buildNullUv = buildNullUv;
 exports.buildNullVertex = buildNullVertex;
 exports.buildPolygonIndex = buildPolygonIndex;
 exports.buildPolygonStep = buildPolygonStep;
+exports.buildPolygonStepX = buildPolygonStepX;
+exports.buildPolygonStepY = buildPolygonStepY;
 exports.buildPolygonUv = buildPolygonUv;
 exports.buildPolygonVertex = buildPolygonVertex;
 exports.buildRectangleIndex = buildRectangleIndex;

package/dist/wcardinal-ui.js

@@ -1,5 +1,5 @@
 /*
- Winter Cardinal UI v0.459.0-beta.0
+ Winter Cardinal UI v0.459.0-beta.2
  Copyright (C) 2019 Toshiba Corporation
  SPDX-License-Identifier: Apache-2.0
 
@@ -1388,16 +1388,18 @@
         DASHED_LOOSELY: DASHED_LOOSELY,
         /** @deprecated in favor of EShapeStrokeStyle. */
         DASHED_MASK: DASHED | DASHED_DENSELY | DASHED_LOOSELY,
-        /** @deprecated in favor of CURVE_SPLINE. */
+        /** @deprecated in favor of {@link CURVE_BEZIER_QUADRATIC}. */
         CURVE: CURVE_SPLINE,
+        /** @deprecated in favor of {@link CURVE_BEZIER_QUADRATIC}. */
         CURVE_SPLINE: CURVE_SPLINE,
         CURVE_BEZIER_QUADRATIC: CURVE_BEZIER_QUADRATIC,
         FORMATTER_SHIFT: FORMATTER_SHIFT,
         FORMATTER_MASK: FORMATTER_MASK,
         FORMATTER_EXTENSION_LOWEST: FORMATTER_EXTENSION_LOWEST,
         FORMATTER_EXTENSION_HIGHEST: FORMATTER_EXTENSION_HIGHEST,
-        /** @deprecated in favor of FORMATTER_CURVE_SPLINE. */
+        /** @deprecated in favor of {@link FORMATTER_CURVE_BEZIER_QUADRATIC}. */
         FORMATTER_CURVE: FORMATTER_CURVE_SPLINE,
+        /** @deprecated in favor of {@link FORMATTER_CURVE_BEZIER_QUADRATIC}. */
         FORMATTER_CURVE_SPLINE: FORMATTER_CURVE_SPLINE,
         FORMATTER_CURVE_BEZIER_QUADRATIC: FORMATTER_CURVE_BEZIER_QUADRATIC
     };
@@ -14358,11 +14360,11 @@
             }
             this.data.set(id, datum);
         };
-        EShapePointsFormatters.get = function (index) {
+        EShapePointsFormatters.get = function (id) {
             if (this.data == null) {
                 this.data = this.newData();
             }
-            return this.data.get(index);
+            return this.data.get(id);
         };
         EShapePointsFormatters.each = function (iteratee) {
             if (this.data == null) {
@@ -48657,58 +48659,49 @@
     /**
      * Build step buffer for polygons.
      */
-    var buildPolygonStep = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, sizeX, sizeY, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle) {
+    var buildPolygonStep = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, polygonBoundary, voffset, vertexCount, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle) {
         var scaleInvariant = toScaleInvariant(strokeStyle);
         var dash = toDash(strokeStyle);
         var w = (strokeSide & EShapeStrokeSide.ALL) === EShapeStrokeSide.ALL ? 1 : 0;
         var e = toPackedI4x64(7 + dash, scaleInvariant, w, 0);
         var fp = Math.max(0, Math.min(1, fillPercent));
-        var ax = Math.abs(sizeX);
-        var ay = Math.abs(sizeY);
-        var is = voffset * 6 - 1;
         switch (fillDirection) {
             case EShapeFillDirection.TOP:
-                for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
-                    steps[++is] = strokeWidth;
-                    steps[++is] = e;
-                    steps[++is] = polygonDistances[i];
-                    steps[++is] = ay * (fp - polygonUvs[j]);
-                    steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                    steps[++is] = polygonLengths[i];
-                }
+                buildPolygonStepY(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[3] - polygonBoundary[1], fp);
                 break;
             case EShapeFillDirection.RIGHT:
-                for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
-                    steps[++is] = strokeWidth;
-                    steps[++is] = e;
-                    steps[++is] = polygonDistances[i];
-                    steps[++is] = ax * (fp - polygonUvs[j]);
-                    steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                    steps[++is] = polygonLengths[i];
-                }
+                buildPolygonStepX(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[0] - polygonBoundary[2], 1 - fp);
                 break;
             case EShapeFillDirection.BOTTOM:
-                for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
-                    steps[++is] = strokeWidth;
-                    steps[++is] = e;
-                    steps[++is] = polygonDistances[i];
-                    steps[++is] = ay * (fp - (1 - polygonUvs[j]));
-                    steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                    steps[++is] = polygonLengths[i];
-                }
+                buildPolygonStepY(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[1] - polygonBoundary[3], 1 - fp);
                 break;
             case EShapeFillDirection.LEFT:
-                for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
-                    steps[++is] = strokeWidth;
-                    steps[++is] = e;
-                    steps[++is] = polygonDistances[i];
-                    steps[++is] = ax * (fp - (1 - polygonUvs[j]));
-                    steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
-                    steps[++is] = polygonLengths[i];
-                }
+                buildPolygonStepX(steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, polygonBoundary[2] - polygonBoundary[0], fp);
                 break;
         }
     };
+    var buildPolygonStepX = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, afp, fp) {
+        var is = voffset * 6 - 1;
+        for (var i = 0, j = 0; i < vertexCount; i += 1, j += 2) {
+            steps[++is] = strokeWidth;
+            steps[++is] = e;
+            steps[++is] = polygonDistances[i];
+            steps[++is] = afp * (fp - polygonUvs[j]);
+            steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
+            steps[++is] = polygonLengths[i];
+        }
+    };
+    var buildPolygonStepY = function (steps, polygonDistances, polygonLengths, polygonClippings, polygonUvs, voffset, vertexCount, strokeWidth, e, afp, fp) {
+        var is = voffset * 6 - 1;
+        for (var i = 0, j = 1; i < vertexCount; i += 1, j += 2) {
+            steps[++is] = strokeWidth;
+            steps[++is] = e;
+            steps[++is] = polygonDistances[i];
+            steps[++is] = afp * (fp - polygonUvs[j]);
+            steps[++is] = toPackedF2x1024(polygonClippings[i], 0);
+            steps[++is] = polygonLengths[i];
+        }
+    };
     /**
      * Build UV buffer for polygons.
      */
@@ -50039,6 +50032,7 @@
             this._uvs = [];
             this._indices = [];
             this._nindices = 0;
+            this._boundary = [0, 0, 0, 0];
         }
         Object.defineProperty(EShapePolygonTriangulatedImpl.prototype, "id", {
             get: function () {
@@ -50112,6 +50106,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(EShapePolygonTriangulatedImpl.prototype, "boundary", {
+            get: function () {
+                this.triangulate();
+                return this._boundary;
+            },
+            enumerable: false,
+            configurable: true
+        });
         EShapePolygonTriangulatedImpl.prototype.set = function (parentPointsId, vertices, distances, lengths, clippings, uvs, indices) {
             var isChanged = false;
             // Parent Vertex ID
@@ -50202,26 +50204,32 @@
                 this._parentPointsId = parentPointsId;
                 var buffer = UtilStraightSkeletonBuffer.from(UtilStraightSkeleton.from(parentPoints.formatted.values));
                 this._id += 1;
-                this._vertices = buffer.vertices;
+                var vertices = buffer.vertices;
+                this._vertices = vertices;
                 this._nvertices = buffer.vertices.length >> 1;
                 this._distances = buffer.distances;
                 this._lengths = buffer.lengths;
                 this._clippings = buffer.clippings;
-                this._uvs = this.toUvs(buffer.vertices);
+                var boundary = this._boundary;
+                toPointsBoundary(vertices, boundary);
+                this._uvs = this.toUvs(vertices, boundary);
                 this._indices = buffer.indices;
                 this._nindices = buffer.indices.length / 3;
             }
         };
-        EShapePolygonTriangulatedImpl.prototype.toUvs = function (vertices) {
+        EShapePolygonTriangulatedImpl.prototype.toUvs = function (vertices, boundary) {
             var result = [];
-            var size = this._parent.size;
-            var ax = Math.abs(size.x);
-            var ay = Math.abs(size.y);
-            var fx = 0 < ax ? 1 / ax : 0;
-            var fy = 0 < ay ? 1 / ay : 0;
+            var xmin = boundary[0];
+            var ymin = boundary[1];
+            var xmax = boundary[2];
+            var ymax = boundary[3];
+            var sx = xmax - xmin;
+            var sy = ymax - ymin;
+            var fx = 0 < sx ? 1 / sx : 0;
+            var fy = 0 < sy ? 1 / sy : 0;
             var verticesLength = vertices.length;
             for (var i = 0; i < verticesLength; i += 2) {
-                result.push(0.5 + vertices[i] * fx, 0.5 + vertices[i + 1] * fy);
+                result.push((vertices[i] - xmin) * fx, (vertices[i + 1] - ymin) * fy);
             }
             return result;
         };
@@ -50369,55 +50377,78 @@
         return result;
     };
     var hitTestPolygon = function (shape, x, y, ax, ay, sw, ss) {
-        var filled = shape.fill.enable;
+        var fill = shape.fill;
+        var filled = fill.enable;
         if (!filled && sw <= 0) {
             return false;
         }
         var values = shape.points.values;
         var valuesLength = values.length;
         if (6 <= valuesLength) {
-            if (0 < ax && 0 < ay) {
-                var count = 0;
-                var ppvy = values[valuesLength - 3];
-                var pvx = values[valuesLength - 2];
-                var pvy = values[valuesLength - 1];
-                for (var i = 0; i < valuesLength; i += 2) {
-                    var vx = values[i];
-                    var vy = values[i + 1];
-                    if ((pvy <= y && y < vy) || (y <= pvy && vy < y)) {
-                        var dy = vy - pvy;
-                        var t = 0;
-                        if (0 < Math.abs(dy)) {
-                            t = (y - pvy) / dy;
-                        }
-                        var cx = pvx + t * (vx - pvx);
-                        if (x <= cx) {
-                            if (t <= 0) {
-                                // Since we could be just grazing vertices,
-                                // we need to check if the second-previous vertex is on the opposite side.
-                                if ((ppvy <= y && y < vy) || (y <= ppvy && vy < y)) {
-                                    count += 1;
-                                }
-                            }
-                            else {
+            var count = 0;
+            var ppvy = values[valuesLength - 3];
+            var pvx = values[valuesLength - 2];
+            var pvy = values[valuesLength - 1];
+            for (var i = 0; i < valuesLength; i += 2) {
+                var vx = values[i];
+                var vy = values[i + 1];
+                if ((pvy <= y && y < vy) || (y <= pvy && vy < y)) {
+                    var dy = vy - pvy;
+                    var t = 0;
+                    if (0 < Math.abs(dy)) {
+                        t = (y - pvy) / dy;
+                    }
+                    var cx = pvx + t * (vx - pvx);
+                    if (x <= cx) {
+                        if (t <= 0) {
+                            // Since we could be just grazing vertices,
+                            // we need to check if the second-previous vertex is on the opposite side.
+                            if ((ppvy <= y && y < vy) || (y <= ppvy && vy < y)) {
                                 count += 1;
                             }
                         }
+                        else {
+                            count += 1;
+                        }
                     }
-                    ppvy = pvy;
-                    pvx = vx;
-                    pvy = vy;
                 }
-                if (count % 2 === 1) {
-                    if (filled) {
+                ppvy = pvy;
+                pvx = vx;
+                pvy = vy;
+            }
+            if (count % 2 === 1) {
+                if (filled) {
+                    var percent = fill.percent;
+                    if (1 <= percent) {
                         return true;
                     }
-                    else {
-                        var sd = calcPolygonSquaredDistance(values, valuesLength, x, y);
-                        var s = sw * ss;
-                        return sd <= s * s;
+                    var boundary = shape.triangulated.boundary;
+                    switch (fill.direction) {
+                        case EShapeFillDirection.TOP:
+                            if (y - boundary[1] <= percent * (boundary[3] - boundary[1])) {
+                                return true;
+                            }
+                            break;
+                        case EShapeFillDirection.RIGHT:
+                            if ((1 - percent) * (boundary[2] - boundary[0]) <= x - boundary[0]) {
+                                return true;
+                            }
+                            break;
+                        case EShapeFillDirection.BOTTOM:
+                            if ((1 - percent) * (boundary[3] - boundary[1]) <= y - boundary[1]) {
+                                return true;
+                            }
+                            break;
+                        case EShapeFillDirection.LEFT:
+                            if (x - boundary[0] <= percent * (boundary[2] - boundary[0])) {
+                                return true;
+                            }
+                            break;
                     }
                 }
+                var sd = calcPolygonSquaredDistance(values, valuesLength, x, y);
+                var s = sw * ss;
+                return sd <= s * s;
             }
         }
         return false;
@@ -50622,8 +50653,7 @@
                 // Steps
                 if (isNotInited || isTriangulatedIdChanged || isFillChanged || isStrokeChanged) {
                     buffer.updateSteps();
-                    var size = shape.size;
-                    buildPolygonStep(buffer.steps, triangulated.distances, triangulated.lengths, triangulated.clippings, triangulated.uvs, voffset, this.vertexCount, size.x, size.y, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle);
+                    buildPolygonStep(buffer.steps, triangulated.distances, triangulated.lengths, triangulated.clippings, triangulated.uvs, triangulated.boundary, voffset, this.vertexCount, fillDirection, fillPercent, strokeWidth, strokeSide, strokeStyle);
                 }
                 // UVs
                 if (isNotInited || isTriangulatedIdChanged || isTextureChanged) {
@@ -83341,6 +83371,8 @@
         buildPolygonIndex: buildPolygonIndex,
         buildPolygonVertex: buildPolygonVertex,
         buildPolygonStep: buildPolygonStep,
+        buildPolygonStepX: buildPolygonStepX,
+        buildPolygonStepY: buildPolygonStepY,
         buildPolygonUv: buildPolygonUv,
         RECTANGLE_ROUNDED_VERTEX_COUNT: RECTANGLE_ROUNDED_VERTEX_COUNT,
         RECTANGLE_ROUNDED_INDEX_COUNT: RECTANGLE_ROUNDED_INDEX_COUNT,