@wcardinal/wcardinal-ui 0.467.0 → 0.468.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/dist/types/wcardinal/ui/shape/e-shape-type.d.ts +1 -0
  2. package/dist/types/wcardinal/ui/shape/load/index.d.ts +1 -0
  3. package/dist/types/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.d.ts +1 -0
  4. package/dist/types/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.d.ts +10 -0
  5. package/dist/types/wcardinal/ui/shape/variant/build-triangle-rounded.d.ts +1 -10
  6. package/dist/types/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.d.ts +12 -0
  7. package/dist/types/wcardinal/ui/shape/variant/builder-triangle-rounded.d.ts +1 -12
  8. package/dist/types/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.d.ts +4 -0
  9. package/dist/types/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.d.ts +1 -4
  10. package/dist/types/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.d.ts +4 -0
  11. package/dist/types/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.d.ts +2 -0
  12. package/dist/types/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.d.ts +2 -2
  13. package/dist/types/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.d.ts +18 -18
  14. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.d.ts +7 -0
  15. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.d.ts +42 -0
  16. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.d.ts +3 -0
  17. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded.d.ts +4 -0
  18. package/dist/types/wcardinal/ui/shape/variant/hit-test-fill.d.ts +2 -0
  19. package/dist/types/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.d.ts +1 -0
  20. package/dist/types/wcardinal/ui/shape/variant/hit-test-triangle-rounded.d.ts +1 -0
  21. package/dist/types/wcardinal/ui/shape/variant/index.d.ts +7 -0
  22. package/dist/wcardinal/ui/shape/e-shape-type.js +1 -0
  23. package/dist/wcardinal/ui/shape/e-shape-type.js.map +1 -1
  24. package/dist/wcardinal/ui/shape/load/index.js +1 -0
  25. package/dist/wcardinal/ui/shape/load/index.js.map +1 -1
  26. package/dist/wcardinal/ui/shape/load/load-shape-all.js +2 -0
  27. package/dist/wcardinal/ui/shape/load/load-shape-all.js.map +1 -1
  28. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js +17 -0
  29. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js.map +1 -0
  30. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js +2 -2
  31. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js.map +1 -1
  32. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js +4 -0
  33. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js.map +1 -1
  34. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js +20 -19
  35. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js.map +1 -1
  36. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js +4 -0
  37. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js.map +1 -1
  38. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js +538 -0
  39. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js.map +1 -0
  40. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js +5 -536
  41. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js.map +1 -1
  42. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js +84 -0
  43. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js.map +1 -0
  44. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js +1 -79
  45. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js.map +1 -1
  46. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js +24 -0
  47. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js.map +1 -0
  48. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js +1 -19
  49. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js.map +1 -1
  50. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js +10 -0
  51. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js.map +1 -0
  52. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js +134 -199
  53. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js.map +1 -1
  54. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js +2 -2
  55. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js.map +1 -1
  56. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js +2 -2
  57. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js.map +1 -1
  58. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js +62 -64
  59. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js.map +1 -1
  60. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js +27 -0
  61. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js.map +1 -0
  62. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js +437 -0
  63. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js.map +1 -0
  64. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js +6 -0
  65. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js.map +1 -0
  66. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js +15 -2
  67. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js.map +1 -1
  68. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js +3 -29
  69. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js.map +1 -1
  70. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js +33 -0
  71. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js.map +1 -0
  72. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js +120 -97
  73. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js.map +1 -1
  74. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js +3 -29
  75. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js.map +1 -1
  76. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js +71 -11
  77. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js.map +1 -1
  78. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js +3 -29
  79. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js.map +1 -1
  80. package/dist/wcardinal/ui/shape/variant/index.js +7 -0
  81. package/dist/wcardinal/ui/shape/variant/index.js.map +1 -1
  82. package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
  83. package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
  84. package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
  85. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
  86. package/dist/wcardinal-ui-theme-dark.js +1 -1
  87. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  88. package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
  89. package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
  90. package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
  91. package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
  92. package/dist/wcardinal-ui-theme-white.js +1 -1
  93. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  94. package/dist/wcardinal-ui.cjs.js +1050 -567
  95. package/dist/wcardinal-ui.js +1050 -567
  96. package/dist/wcardinal-ui.min.js +2 -2
  97. package/dist/wcardinal-ui.min.js.map +1 -1
  98. package/package.json +1 -1
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.0
2
+ Winter Cardinal UI v0.468.0
3
3
  Copyright (C) 2019-2026 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -61,6 +61,7 @@ var EShapeType = {
61
61
  RECTANGLE_LEGACY: 28,
62
62
  TRIANGLE_LEGACY: 29,
63
63
  RECTANGLE_ROUNDED_LEGACY: 30,
64
+ TRIANGLE_ROUNDED_LEGACY: 31,
64
65
  EXTENSION: 1000
65
66
  };
66
67
 
@@ -8473,6 +8474,38 @@ var EShapePrimitive = /** @class */ (function (_super) {
8473
8474
  return EShapePrimitive;
8474
8475
  }(EShapeBase));
8475
8476
 
8477
+ var hitTestFill = function (x, y, ax, ay, fill) {
8478
+ if (fill.enable) {
8479
+ var percent = Math.max(0, Math.min(1, fill.percent));
8480
+ if (1 <= percent) {
8481
+ return true;
8482
+ }
8483
+ switch (fill.direction) {
8484
+ case EShapeFillDirection.TOP:
8485
+ if (y + ay <= percent * (2 * ay)) {
8486
+ return true;
8487
+ }
8488
+ break;
8489
+ case EShapeFillDirection.RIGHT:
8490
+ if ((1 - percent) * (2 * ax) <= x + ax) {
8491
+ return true;
8492
+ }
8493
+ break;
8494
+ case EShapeFillDirection.BOTTOM:
8495
+ if ((1 - percent) * (2 * ay) <= y + ay) {
8496
+ return true;
8497
+ }
8498
+ break;
8499
+ case EShapeFillDirection.LEFT:
8500
+ if (x + ax <= percent * (2 * ax)) {
8501
+ return true;
8502
+ }
8503
+ break;
8504
+ }
8505
+ }
8506
+ return false;
8507
+ };
8508
+
8476
8509
  /*
8477
8510
  * Copyright (C) 2019 Toshiba Corporation
8478
8511
  * SPDX-License-Identifier: Apache-2.0
@@ -8510,34 +8543,8 @@ var hitTestCircle = function (shape, x, y, ax, ay, sw, ss) {
8510
8543
  if (!hitTestCircleFilled(x, y, ax, ay)) {
8511
8544
  return false;
8512
8545
  }
8513
- var fill = shape.fill;
8514
- if (fill.enable) {
8515
- var percent = Math.max(0, Math.min(1, fill.percent));
8516
- if (1 <= percent) {
8517
- return true;
8518
- }
8519
- switch (fill.direction) {
8520
- case EShapeFillDirection.TOP:
8521
- if (y + ay <= percent * (2 * ay)) {
8522
- return true;
8523
- }
8524
- break;
8525
- case EShapeFillDirection.RIGHT:
8526
- if ((1 - percent) * (2 * ax) <= x + ax) {
8527
- return true;
8528
- }
8529
- break;
8530
- case EShapeFillDirection.BOTTOM:
8531
- if ((1 - percent) * (2 * ay) <= y + ay) {
8532
- return true;
8533
- }
8534
- break;
8535
- case EShapeFillDirection.LEFT:
8536
- if (x + ax <= percent * (2 * ax)) {
8537
- return true;
8538
- }
8539
- break;
8540
- }
8546
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
8547
+ return true;
8541
8548
  }
8542
8549
  return hitTestCircleStroke(x, y, ax, ay, sw, ss);
8543
8550
  };
@@ -8611,34 +8618,8 @@ var hitTestRectangle = function (shape, x, y, ax, ay, sw, ss) {
8611
8618
  if (!hitTestBBox(x, y, ax, ay)) {
8612
8619
  return false;
8613
8620
  }
8614
- var fill = shape.fill;
8615
- if (fill.enable) {
8616
- var percent = Math.max(0, Math.min(1, fill.percent));
8617
- if (1 <= percent) {
8618
- return true;
8619
- }
8620
- switch (fill.direction) {
8621
- case EShapeFillDirection.TOP:
8622
- if (y + ay <= percent * (2 * ay)) {
8623
- return true;
8624
- }
8625
- break;
8626
- case EShapeFillDirection.RIGHT:
8627
- if ((1 - percent) * (2 * ax) <= x + ax) {
8628
- return true;
8629
- }
8630
- break;
8631
- case EShapeFillDirection.BOTTOM:
8632
- if ((1 - percent) * (2 * ay) <= y + ay) {
8633
- return true;
8634
- }
8635
- break;
8636
- case EShapeFillDirection.LEFT:
8637
- if (x + ax <= percent * (2 * ax)) {
8638
- return true;
8639
- }
8640
- break;
8641
- }
8621
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
8622
+ return true;
8642
8623
  }
8643
8624
  return hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);
8644
8625
  };
@@ -8688,34 +8669,8 @@ var hitTestTriangle = function (shape, x, y, ax, ay, sw, ss) {
8688
8669
  if (!hitTestTriangleFilled(x, y, a, -ay, +ay)) {
8689
8670
  return false;
8690
8671
  }
8691
- var fill = shape.fill;
8692
- if (fill.enable) {
8693
- var percent = Math.max(0, Math.min(1, fill.percent));
8694
- if (1 <= percent) {
8695
- return true;
8696
- }
8697
- switch (fill.direction) {
8698
- case EShapeFillDirection.TOP:
8699
- if (y + ay <= percent * (2 * ay)) {
8700
- return true;
8701
- }
8702
- break;
8703
- case EShapeFillDirection.RIGHT:
8704
- if ((1 - percent) * (2 * ax) <= x + ax) {
8705
- return true;
8706
- }
8707
- break;
8708
- case EShapeFillDirection.BOTTOM:
8709
- if ((1 - percent) * (2 * ay) <= y + ay) {
8710
- return true;
8711
- }
8712
- break;
8713
- case EShapeFillDirection.LEFT:
8714
- if (x + ax <= percent * (2 * ax)) {
8715
- return true;
8716
- }
8717
- break;
8718
- }
8672
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
8673
+ return true;
8719
8674
  }
8720
8675
  return hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);
8721
8676
  };
@@ -32595,6 +32550,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32595
32550
  this._nvertices = 0;
32596
32551
  this._distances = [];
32597
32552
  this._lengths = [];
32553
+ this._lengthShifts = [];
32598
32554
  this._clippings = [];
32599
32555
  this._uvs = [];
32600
32556
  this._indices = [];
@@ -32721,7 +32677,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32721
32677
  boundary[2] = +ax;
32722
32678
  boundary[3] = +ay;
32723
32679
  // # of vertices and # of indices
32724
- var nv = 3 * n - 3;
32680
+ var nv = 4 * n - 4;
32725
32681
  var ni = 2 * n - 4;
32726
32682
  this._nvertices = nv;
32727
32683
  this._nindices = ni;
@@ -32786,83 +32742,56 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32786
32742
  var dangle = (2 * Math.PI) / n;
32787
32743
  var c = Math.cos(dangle);
32788
32744
  var s = Math.sin(dangle);
32789
- // First Edge
32790
- var x0 = 0;
32791
- var y0 = sizeY;
32792
- var u = -s;
32793
- var v = c;
32794
- var su = scale * u;
32795
- var sv = scale * v;
32796
- var x1 = u * sizeX;
32797
- var y1 = v * sizeY;
32798
- var dx = 0.5 * (x1 + x0) - 0;
32799
- var dy = 0.5 * (y1 + y0) - 0;
32800
- var fdistance = 1 / Math.sqrt(dx * dx + dy * dy);
32801
- var lx = x1 - x0;
32802
- var ly = y1 - y0;
32803
- var dl = Math.sqrt(lx * lx + ly * ly);
32804
- var l1 = dl;
32805
- var l2 = 0.5 * dl;
32806
- vertices[0] = 0;
32807
- vertices[1] = scale * sizeY;
32808
- vertices[2] = su * sizeX;
32809
- vertices[3] = sv * sizeY;
32810
- vertices[4] = 0;
32811
- vertices[5] = 0;
32812
- distances[0] = fdistance;
32813
- distances[1] = fdistance;
32814
- distances[2] = fdistance;
32815
- clippings[0] = scale;
32816
- clippings[1] = scale;
32817
- clippings[2] = 0;
32818
- lengths[0] = 0;
32819
- lengths[1] = l1;
32820
- lengths[2] = l2;
32821
- uvs[0] = 0.5;
32822
- uvs[1] = 0.5 * (scale + 1);
32823
- uvs[2] = 0.5 * (su + 1);
32824
- uvs[3] = 0.5 * (sv + 1);
32825
- uvs[4] = 0.5;
32826
- uvs[5] = 0.5;
32827
- indices[0] = 0;
32828
- indices[1] = 1;
32829
- indices[2] = 2;
32830
- // The Other Edges
32831
- var iv1 = 3;
32832
- var iv2 = 6;
32833
- var ii = 3;
32834
- for (var i = 2; i <= n; ++i) {
32835
- var un = c * u - s * v;
32836
- var vn = s * u + c * v;
32837
- u = un;
32838
- v = vn;
32839
- su = scale * u;
32840
- sv = scale * v;
32841
- l1 += dl;
32842
- l2 += dl;
32843
- vertices[iv2 + 0] = su * sizeX;
32844
- vertices[iv2 + 1] = sv * sizeY;
32845
- vertices[iv2 + 2] = 0;
32846
- vertices[iv2 + 3] = 0;
32847
- distances[iv1 + 0] = fdistance;
32848
- distances[iv1 + 1] = fdistance;
32849
- clippings[iv1 + 0] = scale;
32850
- clippings[iv1 + 1] = 0;
32851
- lengths[iv1 + 0] = l1;
32852
- lengths[iv1 + 1] = l2;
32853
- uvs[iv2 + 0] = 0.5 * (su + 1);
32854
- uvs[iv2 + 1] = 0.5 * (sv + 1);
32855
- uvs[iv2 + 2] = 0.5;
32856
- uvs[iv2 + 3] = 0.5;
32857
- indices[ii + 0] = iv1 - 2;
32858
- indices[ii + 1] = iv1;
32859
- indices[ii + 2] = iv1 + 1;
32860
- iv1 += 2;
32861
- iv2 += 4;
32745
+ // Edge length and apothem of the unscaled polygon
32746
+ var ex = -s * sizeX;
32747
+ var ey = (c - 1) * sizeY;
32748
+ var dl = Math.sqrt(ex * ex + ey * ey);
32749
+ var mx = 0.5 * ex;
32750
+ var my = 0.5 * (c + 1) * sizeY;
32751
+ var fdistance = 1 / Math.sqrt(mx * mx + my * my);
32752
+ // Half edge length at clipping = scale
32753
+ var hl = 0.5 * scale * dl;
32754
+ // Each triangle owns its vertices so that the lengths are exact at clipping = 1 on both sides.
32755
+ var u0 = 0;
32756
+ var v0 = scale;
32757
+ var iv = 0;
32758
+ var ii = 0;
32759
+ for (var i = 0; i < n; ++i) {
32760
+ var u1 = c * u0 - s * v0;
32761
+ var v1 = s * u0 + c * v0;
32762
+ var lm = (i + 0.5) * dl;
32763
+ var iv2 = iv << 1;
32764
+ vertices[iv2 + 0] = u0 * sizeX;
32765
+ vertices[iv2 + 1] = v0 * sizeY;
32766
+ vertices[iv2 + 2] = u1 * sizeX;
32767
+ vertices[iv2 + 3] = v1 * sizeY;
32768
+ vertices[iv2 + 4] = 0;
32769
+ vertices[iv2 + 5] = 0;
32770
+ distances[iv + 0] = fdistance;
32771
+ distances[iv + 1] = fdistance;
32772
+ distances[iv + 2] = fdistance;
32773
+ clippings[iv + 0] = scale;
32774
+ clippings[iv + 1] = scale;
32775
+ clippings[iv + 2] = 0;
32776
+ lengths[iv + 0] = lm - hl;
32777
+ lengths[iv + 1] = lm + hl;
32778
+ lengths[iv + 2] = lm;
32779
+ uvs[iv2 + 0] = 0.5 * (u0 + 1);
32780
+ uvs[iv2 + 1] = 0.5 * (v0 + 1);
32781
+ uvs[iv2 + 2] = 0.5 * (u1 + 1);
32782
+ uvs[iv2 + 3] = 0.5 * (v1 + 1);
32783
+ uvs[iv2 + 4] = 0.5;
32784
+ uvs[iv2 + 5] = 0.5;
32785
+ indices[ii + 0] = iv + 0;
32786
+ indices[ii + 1] = iv + 1;
32787
+ indices[ii + 2] = iv + 2;
32788
+ u0 = u1;
32789
+ v0 = v1;
32790
+ iv += 3;
32862
32791
  ii += 3;
32863
32792
  }
32864
32793
  // Degenerate triangles keep the buffer sizes consistent with elongated circles.
32865
- this.pad(iv1, ii, nv, ni, fdistance);
32794
+ this.pad(iv, ii, nv, ni, fdistance);
32866
32795
  };
32867
32796
  /**
32868
32797
  * Precondition: sizeX !== 0 && sizeY !== 0 && abs(sizeY) < abs(sizeX)
@@ -32877,8 +32806,10 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32877
32806
  var dangle = (2 * Math.PI) / n;
32878
32807
  var c = Math.cos(dangle);
32879
32808
  var s = Math.sin(dangle);
32880
- var fx = sizeX / sizeY;
32881
- var fy = sizeY / sizeX;
32809
+ var fx = 1 / sizeX;
32810
+ var fy = 1 / sizeY;
32811
+ var fxy = sizeX * fy;
32812
+ var fyx = sizeY * fx;
32882
32813
  var ileft = n >> 2;
32883
32814
  var iright = ileft * 3;
32884
32815
  var ppx = sizeX * s;
@@ -32887,20 +32818,12 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32887
32818
  var py = sizeY;
32888
32819
  var nx = -sizeX * s;
32889
32820
  var ny = sizeY * c;
32890
- var nnx = nx * c - ny * fx * s;
32891
- var nny = nx * fy * s + ny * c;
32821
+ var nnx = nx * c - ny * fxy * s;
32822
+ var nny = nx * fyx * s + ny * c;
32892
32823
  var sx = this.toSkeletonX(ppx, ppy, px, py, nx, ny);
32893
- vertices[0] = 0;
32894
- vertices[1] = sizeY;
32895
- clippings[0] = -1;
32896
- distances[0] = sx;
32897
- lengths[0] = 0;
32898
- uvs[0] = 0.5;
32899
- uvs[1] = 1;
32900
- var iv = 1;
32824
+ var iv = 0;
32901
32825
  var ii = 0;
32902
- var length = 0;
32903
- var current = 0;
32826
+ var l = 0;
32904
32827
  var maxDistance = 0;
32905
32828
  for (var i = 0; i < n; ++i) {
32906
32829
  var inext = (i + 1) % n;
@@ -32916,59 +32839,38 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32916
32839
  var dy = ny - py;
32917
32840
  var dl = Math.sqrt(dx * dx + dy * dy);
32918
32841
  var fl = 1 / dl;
32919
- var nlength = length + dl;
32920
- var iv1 = iv++;
32921
- var iv2 = iv1 << 1;
32922
- var niv1 = iv++;
32923
- var niv2 = niv1 << 1;
32924
- var ndistance = Math.abs(-dx * py - dy * (nsx - px)) * fl;
32925
- maxDistance = Math.max(maxDistance, ndistance);
32926
- vertices[iv2 + 0] = nx;
32927
- vertices[iv2 + 1] = ny;
32928
- clippings[iv1] = -1 - ndistance;
32929
- distances[iv1] = nsx;
32930
- lengths[iv1] = nlength;
32931
- uvs[iv2 + 0] = 0.5 * (nx / sizeX + 1);
32932
- uvs[iv2 + 1] = 0.5 * (ny / sizeY + 1);
32933
- vertices[niv2 + 0] = nsx;
32934
- vertices[niv2 + 1] = 0;
32935
- clippings[niv1] = ndistance;
32936
- distances[niv1] = 0;
32937
- lengths[niv1] = length + ((nsx - px) * dx - py * dy) * fl;
32938
- uvs[niv2] = 0.5 * (nsx / sizeX + 1);
32939
- uvs[niv2 + 1] = 0.5;
32940
- indices[ii++] = current;
32941
- indices[ii++] = iv1;
32942
- indices[ii++] = niv1;
32943
- distances[current] = sx;
32944
- if (sx === nsx) {
32945
- clippings[current] = -1 - ndistance;
32946
- }
32947
- else {
32948
- var mdistance = Math.abs(-dx * py - dy * (sx - px)) * fl;
32949
- maxDistance = Math.max(maxDistance, mdistance);
32950
- clippings[current] = -1 - mdistance;
32951
- var miv1 = iv++;
32952
- var miv2 = miv1 << 1;
32953
- vertices[miv2] = sx;
32954
- vertices[miv2 + 1] = 0;
32955
- clippings[miv1] = mdistance;
32956
- distances[miv1] = 0;
32957
- lengths[miv1] = length + ((sx - px) * dx - py * dy) * fl;
32958
- uvs[miv2] = 0.5 * (sx / sizeX + 1);
32959
- uvs[miv2 + 1] = 0.5;
32960
- indices[ii++] = current;
32961
- indices[ii++] = niv1;
32962
- indices[ii++] = miv1;
32963
- }
32964
- current = iv1;
32965
- length = nlength;
32842
+ var nl = l + dl;
32843
+ var nd = Math.abs(-dx * py - dy * (nsx - px)) * fl;
32844
+ var md = sx === nsx ? nd : Math.abs(-dx * py - dy * (sx - px)) * fl;
32845
+ maxDistance = Math.max(maxDistance, nd, md);
32846
+ // Each edge owns its vertices so that the lengths are exact at clipping = 1 on both sides.
32847
+ var iva = iv++;
32848
+ var ivb = iv++;
32849
+ var ivn = iv++;
32850
+ var ls0 = ((px - sx) * dx + py * dy) * fl;
32851
+ var ls1 = ((nx - nsx) * dx + ny * dy) * fl;
32852
+ var ls2 = ((nsx - px) * dx - py * dy) * fl;
32853
+ this.writeVertex(iva, px, py, fx, fy, sx, l, -1 - md, ls0);
32854
+ this.writeVertex(ivb, nx, ny, fx, fy, nsx, nl, -1 - nd, ls1);
32855
+ this.writeVertex(ivn, nsx, 0, fx, fy, 0, l + ls2, nd, 0);
32856
+ indices[ii++] = iva;
32857
+ indices[ii++] = ivb;
32858
+ indices[ii++] = ivn;
32859
+ if (sx !== nsx) {
32860
+ var ivm = iv++;
32861
+ var ls3 = ((sx - px) * dx - py * dy) * fl;
32862
+ this.writeVertex(ivm, sx, 0, fx, fy, 0, l + ls3, md, 0);
32863
+ indices[ii++] = iva;
32864
+ indices[ii++] = ivn;
32865
+ indices[ii++] = ivm;
32866
+ }
32867
+ l = nl;
32966
32868
  px = nx;
32967
32869
  py = ny;
32968
32870
  nx = nnx;
32969
32871
  ny = nny;
32970
- nnx = c * nx - s * ny * fx;
32971
- nny = s * nx * fy + c * ny;
32872
+ nnx = c * nx - s * ny * fxy;
32873
+ nny = s * nx * fyx + c * ny;
32972
32874
  sx = nsx;
32973
32875
  }
32974
32876
  var fdistance = 0;
@@ -32976,6 +32878,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32976
32878
  fdistance = 1 / maxDistance;
32977
32879
  }
32978
32880
  var shift = (scale - 1) * maxDistance;
32881
+ var lengthShifts = this._lengthShifts;
32979
32882
  for (var i = 0; i < iv; ++i) {
32980
32883
  var clipping = clippings[i];
32981
32884
  if (0 <= clipping) {
@@ -32988,6 +32891,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32988
32891
  var factor = shift / distance;
32989
32892
  var x = vertices[i2] + (vertices[i2] - distances[i]) * factor;
32990
32893
  var y = vertices[i2 + 1] * (1 + factor);
32894
+ lengths[i] += factor * lengthShifts[i];
32991
32895
  vertices[i2] = x;
32992
32896
  vertices[i2 + 1] = y;
32993
32897
  uvs[i2] = 0.5 * (x / sizeX + 1);
@@ -33024,8 +32928,10 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33024
32928
  var dangle = (2 * Math.PI) / n;
33025
32929
  var c = Math.cos(dangle);
33026
32930
  var s = Math.sin(dangle);
33027
- var fx = sizeX / sizeY;
33028
- var fy = sizeY / sizeX;
32931
+ var fx = 1 / sizeX;
32932
+ var fy = 1 / sizeY;
32933
+ var fxy = sizeX * fy;
32934
+ var fyx = sizeY * fx;
33029
32935
  var itop = 0;
33030
32936
  var ibottom = n >> 1;
33031
32937
  var ppx = sizeX * s;
@@ -33036,20 +32942,12 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33036
32942
  var py = sizeY;
33037
32943
  var nx = -sizeX * s;
33038
32944
  var ny = sizeY * c;
33039
- var nnx = c * nx - s * ny * fx;
33040
- var nny = s * nx * fy + c * ny;
32945
+ var nnx = c * nx - s * ny * fxy;
32946
+ var nny = s * nx * fyx + c * ny;
33041
32947
  var sy = this.toSkeletonY(pppx, pppy, ppx, ppy, px, py);
33042
- vertices[0] = 0;
33043
- vertices[1] = sizeY;
33044
- clippings[0] = -1;
33045
- distances[0] = sy;
33046
- lengths[0] = 0;
33047
- uvs[0] = 0.5;
33048
- uvs[1] = 1;
33049
- var iv = 1;
32948
+ var iv = 0;
33050
32949
  var ii = 0;
33051
- var length = 0;
33052
- var current = 0;
32950
+ var l = 0;
33053
32951
  var maxDistance = 0;
33054
32952
  for (var i = 0; i < n; ++i) {
33055
32953
  var inext = (i + 1) % n;
@@ -33065,59 +32963,38 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33065
32963
  var dy = ny - py;
33066
32964
  var dl = Math.sqrt(dx * dx + dy * dy);
33067
32965
  var fl = 1 / dl;
33068
- var nlength = length + dl;
33069
- var iv1 = iv++;
33070
- var iv2 = iv1 << 1;
33071
- var niv1 = iv++;
33072
- var niv2 = niv1 << 1;
33073
- var ndistance = Math.abs(dx * (nsy - py) + dy * px) * fl;
33074
- maxDistance = Math.max(maxDistance, ndistance);
33075
- vertices[iv2 + 0] = nx;
33076
- vertices[iv2 + 1] = ny;
33077
- clippings[iv1] = -1 - ndistance;
33078
- distances[iv1] = nsy;
33079
- lengths[iv1] = nlength;
33080
- uvs[iv2 + 0] = 0.5 * (nx / sizeX + 1);
33081
- uvs[iv2 + 1] = 0.5 * (ny / sizeY + 1);
33082
- vertices[niv2] = 0;
33083
- vertices[niv2 + 1] = nsy;
33084
- clippings[niv1] = ndistance;
33085
- distances[niv1] = 0;
33086
- lengths[niv1] = length + (-px * dx + (nsy - py) * dy) * fl;
33087
- uvs[niv2] = 0.5;
33088
- uvs[niv2 + 1] = 0.5 * (nsy / sizeY + 1);
33089
- indices[ii++] = current;
33090
- indices[ii++] = iv1;
33091
- indices[ii++] = niv1;
33092
- distances[current] = sy;
33093
- if (sy === nsy) {
33094
- clippings[current] = -1 - ndistance;
33095
- }
33096
- else {
33097
- var mdistance = Math.abs(dx * (sy - py) + dy * px) * fl;
33098
- maxDistance = Math.max(maxDistance, mdistance);
33099
- clippings[current] = -1 - mdistance;
33100
- var miv1 = iv++;
33101
- var miv2 = miv1 << 1;
33102
- vertices[miv2] = 0;
33103
- vertices[miv2 + 1] = sy;
33104
- clippings[miv1] = mdistance;
33105
- distances[miv1] = 0;
33106
- lengths[miv1] = length + (-px * dx + (sy - py) * dy) * fl;
33107
- uvs[miv2] = 0.5;
33108
- uvs[miv2 + 1] = 0.5 * (sy / sizeY + 1);
33109
- indices[ii++] = current;
33110
- indices[ii++] = niv1;
33111
- indices[ii++] = miv1;
33112
- }
33113
- current = iv1;
33114
- length = nlength;
32966
+ var nl = l + dl;
32967
+ var nd = Math.abs(dx * (nsy - py) + dy * px) * fl;
32968
+ var md = sy === nsy ? nd : Math.abs(dx * (sy - py) + dy * px) * fl;
32969
+ maxDistance = Math.max(maxDistance, nd, md);
32970
+ // Each edge owns its vertices so that the lengths are exact at clipping = 1 on both sides.
32971
+ var iva = iv++;
32972
+ var ivb = iv++;
32973
+ var ivn = iv++;
32974
+ var ls0 = (px * dx + (py - sy) * dy) * fl;
32975
+ var ls1 = (nx * dx + (ny - nsy) * dy) * fl;
32976
+ var ls2 = (-px * dx + (nsy - py) * dy) * fl;
32977
+ this.writeVertex(iva, px, py, fx, fy, sy, l, -1 - md, ls0);
32978
+ this.writeVertex(ivb, nx, ny, fx, fy, nsy, nl, -1 - nd, ls1);
32979
+ this.writeVertex(ivn, 0, nsy, fx, fy, 0, l + ls2, nd, 0);
32980
+ indices[ii++] = iva;
32981
+ indices[ii++] = ivb;
32982
+ indices[ii++] = ivn;
32983
+ if (sy !== nsy) {
32984
+ var ivm = iv++;
32985
+ var ls3 = (-px * dx + (sy - py) * dy) * fl;
32986
+ this.writeVertex(ivm, 0, sy, fx, fy, 0, l + ls3, md, 0);
32987
+ indices[ii++] = iva;
32988
+ indices[ii++] = ivn;
32989
+ indices[ii++] = ivm;
32990
+ }
32991
+ l = nl;
33115
32992
  px = nx;
33116
32993
  py = ny;
33117
32994
  nx = nnx;
33118
32995
  ny = nny;
33119
- nnx = c * nx - s * ny * fx;
33120
- nny = s * nx * fy + c * ny;
32996
+ nnx = c * nx - s * ny * fxy;
32997
+ nny = s * nx * fyx + c * ny;
33121
32998
  sy = nsy;
33122
32999
  }
33123
33000
  var fdistance = 0;
@@ -33125,6 +33002,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33125
33002
  fdistance = 1 / maxDistance;
33126
33003
  }
33127
33004
  var shift = (scale - 1) * maxDistance;
33005
+ var lengthShifts = this._lengthShifts;
33128
33006
  for (var i = 0; i < iv; ++i) {
33129
33007
  var clipping = clippings[i];
33130
33008
  if (0 <= clipping) {
@@ -33137,6 +33015,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33137
33015
  var factor = shift / distance;
33138
33016
  var x = vertices[i2] * (1 + factor);
33139
33017
  var y = vertices[i2 + 1] + (vertices[i2 + 1] - distances[i]) * factor;
33018
+ lengths[i] += factor * lengthShifts[i];
33140
33019
  vertices[i2] = x;
33141
33020
  vertices[i2 + 1] = y;
33142
33021
  uvs[i2] = 0.5 * (x / sizeX + 1);
@@ -33160,6 +33039,17 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33160
33039
  var by = pdy * fp + ndy * fn;
33161
33040
  return py - (px * by) / bx;
33162
33041
  };
33042
+ EShapeCircleTriangulatedImpl.prototype.writeVertex = function (iv, x, y, fx, fy, distance, length, clipping, lengthShift) {
33043
+ var iv2 = iv << 1;
33044
+ this._vertices[iv2] = x;
33045
+ this._vertices[iv2 + 1] = y;
33046
+ this._distances[iv] = distance;
33047
+ this._lengths[iv] = length;
33048
+ this._clippings[iv] = clipping;
33049
+ this._lengthShifts[iv] = lengthShift;
33050
+ this._uvs[iv2] = 0.5 * (x * fx + 1);
33051
+ this._uvs[iv2 + 1] = 0.5 * (y * fy + 1);
33052
+ };
33163
33053
  return EShapeCircleTriangulatedImpl;
33164
33054
  }());
33165
33055
 
@@ -63398,7 +63288,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
63398
63288
  boundary[3] = +ay;
63399
63289
  // # of vertices and # of indices
63400
63290
  var n = this._n >> 2;
63401
- var nv = 8 * n + 18;
63291
+ var nv = 12 * n + 10;
63402
63292
  var ni = 4 * n + 10;
63403
63293
  this._nvertices = nv;
63404
63294
  this._nindices = ni;
@@ -64028,7 +63918,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64028
63918
  * Preconditions:
64029
63919
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
64030
63920
  * * ay <= ax
64031
- * * 5 * N + 5 <= nv
63921
+ * * 6 * N + 3 <= nv
64032
63922
  * * 4 * N + 1 <= ni
64033
63923
  */
64034
63924
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64039,7 +63929,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64039
63929
  * Preconditions:
64040
63930
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
64041
63931
  * * ax < ay
64042
- * * 5 * N + 5 <= nv
63932
+ * * 6 * N + 3 <= nv
64043
63933
  * * 4 * N + 1 <= ni
64044
63934
  */
64045
63935
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64171,7 +64061,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64171
64061
  if (ctr) {
64172
64062
  var lo = lot + 2 * ax - r;
64173
64063
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64174
- iv += 2 * n - 1;
64064
+ iv += 3 * (n - 1);
64175
64065
  ii += 3 * (n - 1);
64176
64066
  }
64177
64067
  this.pad(iv, ii, nv, ni, fd);
@@ -64180,7 +64070,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64180
64070
  * Preconditions:
64181
64071
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
64182
64072
  * * ay <= ax
64183
- * * 5 * N + 5 <= nv
64073
+ * * 6 * N + 3 <= nv
64184
64074
  * * 4 * N + 1 <= ni
64185
64075
  */
64186
64076
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64191,7 +64081,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64191
64081
  * Preconditions:
64192
64082
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
64193
64083
  * * ax < ay
64194
- * * 5 * N + 5 <= nv
64084
+ * * 6 * N + 3 <= nv
64195
64085
  * * 4 * N + 1 <= ni
64196
64086
  */
64197
64087
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64325,7 +64215,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64325
64215
  if (cbl) {
64326
64216
  var lo = lob + 2 * ax - r;
64327
64217
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64328
- iv += 2 * n - 1;
64218
+ iv += 3 * (n - 1);
64329
64219
  ii += 3 * (n - 1);
64330
64220
  }
64331
64221
  this.pad(iv, ii, nv, ni, fd);
@@ -64342,7 +64232,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64342
64232
  * Preconditions:
64343
64233
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
64344
64234
  * * ay <= ax
64345
- * * 5 * N + 5 <= nv
64235
+ * * 6 * N + 3 <= nv
64346
64236
  * * 4 * N + 1 <= ni
64347
64237
  */
64348
64238
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64353,7 +64243,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64353
64243
  * Preconditions:
64354
64244
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
64355
64245
  * * ax < ay
64356
- * * 5 * N + 5 <= nv
64246
+ * * 6 * N + 3 <= nv
64357
64247
  * * 4 * N + 1 <= ni
64358
64248
  */
64359
64249
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64499,7 +64389,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64499
64389
  if (ctl) {
64500
64390
  var lo = lol + 2 * ay - r;
64501
64391
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64502
- iv += 2 * n - 1;
64392
+ iv += 3 * (n - 1);
64503
64393
  ii += 3 * (n - 1);
64504
64394
  }
64505
64395
  this.pad(iv, ii, nv, ni, fd);
@@ -64508,7 +64398,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64508
64398
  * Preconditions:
64509
64399
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
64510
64400
  * * ay <= ax
64511
- * * 5 * N + 5 <= nv
64401
+ * * 6 * N + 3 <= nv
64512
64402
  * * 4 * N + 1 <= ni
64513
64403
  */
64514
64404
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64519,7 +64409,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64519
64409
  * Preconditions:
64520
64410
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
64521
64411
  * * ax < ay
64522
- * * 5 * N + 5 <= nv
64412
+ * * 6 * N + 3 <= nv
64523
64413
  * * 4 * N + 1 <= ni
64524
64414
  */
64525
64415
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64662,7 +64552,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64662
64552
  if (cbr) {
64663
64553
  var lo = lor + 2 * ay - r;
64664
64554
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64665
- iv += 2 * n - 1;
64555
+ iv += 3 * (n - 1);
64666
64556
  ii += 3 * (n - 1);
64667
64557
  }
64668
64558
  this.pad(iv, ii, nv, ni, fd);
@@ -64671,7 +64561,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64671
64561
  * Preconditions:
64672
64562
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
64673
64563
  * * ay <= ax
64674
- * * 6 * N + 12 <= nv
64564
+ * * 8 * N + 8 <= nv
64675
64565
  * * 4 * N + 6 <= ni
64676
64566
  */
64677
64567
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64714,13 +64604,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64714
64604
  if (cbl) {
64715
64605
  var lo = lob + 2 * ax - r;
64716
64606
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64717
- iv += 2 * n - 1;
64607
+ iv += 3 * (n - 1);
64718
64608
  ii += 3 * (n - 1);
64719
64609
  }
64720
64610
  if (cbr) {
64721
64611
  var lo = lor + 2 * ay - r;
64722
64612
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64723
- iv += 2 * n - 1;
64613
+ iv += 3 * (n - 1);
64724
64614
  ii += 3 * (n - 1);
64725
64615
  }
64726
64616
  this.pad(iv, ii, nv, ni, fd);
@@ -64729,7 +64619,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64729
64619
  * Preconditions:
64730
64620
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
64731
64621
  * * ax < ay
64732
- * * 6 * N + 12 <= nv
64622
+ * * 8 * N + 8 <= nv
64733
64623
  * * 4 * N + 6 <= ni
64734
64624
  */
64735
64625
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64770,13 +64660,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64770
64660
  if (cbl) {
64771
64661
  var lo = lob + 2 * ax - r;
64772
64662
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64773
- iv += 2 * n - 1;
64663
+ iv += 3 * (n - 1);
64774
64664
  ii += 3 * (n - 1);
64775
64665
  }
64776
64666
  if (cbr) {
64777
64667
  var lo = lor + 2 * ay - r;
64778
64668
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64779
- iv += 2 * n - 1;
64669
+ iv += 3 * (n - 1);
64780
64670
  ii += 3 * (n - 1);
64781
64671
  }
64782
64672
  this.pad(iv, ii, nv, ni, fd);
@@ -64854,7 +64744,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64854
64744
  * Preconditions:
64855
64745
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
64856
64746
  * * ay <= ax
64857
- * * 6 * N + 12 <= nv
64747
+ * * 8 * N + 8 <= nv
64858
64748
  * * 4 * N + 6 <= ni
64859
64749
  */
64860
64750
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64903,13 +64793,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64903
64793
  if (ctl) {
64904
64794
  var lo = lol + 2 * ay - r;
64905
64795
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64906
- iv += 2 * n - 1;
64796
+ iv += 3 * (n - 1);
64907
64797
  ii += 3 * (n - 1);
64908
64798
  }
64909
64799
  if (ctr) {
64910
64800
  var lo = lot + 2 * ax - r;
64911
64801
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64912
- iv += 2 * n - 1;
64802
+ iv += 3 * (n - 1);
64913
64803
  ii += 3 * (n - 1);
64914
64804
  }
64915
64805
  this.pad(iv, ii, nv, ni, fd);
@@ -64918,7 +64808,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64918
64808
  * Preconditions:
64919
64809
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
64920
64810
  * * ax < ay
64921
- * * 6 * N + 12 <= nv
64811
+ * * 8 * N + 8 <= nv
64922
64812
  * * 4 * N + 6 <= ni
64923
64813
  */
64924
64814
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64966,13 +64856,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64966
64856
  if (ctl) {
64967
64857
  var lo = lol + 2 * ay - r;
64968
64858
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64969
- iv += 2 * n - 1;
64859
+ iv += 3 * (n - 1);
64970
64860
  ii += 3 * (n - 1);
64971
64861
  }
64972
64862
  if (ctr) {
64973
64863
  var lo = lot + 2 * ax - r;
64974
64864
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64975
- iv += 2 * n - 1;
64865
+ iv += 3 * (n - 1);
64976
64866
  ii += 3 * (n - 1);
64977
64867
  }
64978
64868
  this.pad(iv, ii, nv, ni, fd);
@@ -65047,7 +64937,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65047
64937
  * Preconditions:
65048
64938
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
65049
64939
  * * ay <= ax
65050
- * * 6 * N + 12 <= nv
64940
+ * * 8 * N + 8 <= nv
65051
64941
  * * 4 * N + 6 <= ni
65052
64942
  */
65053
64943
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65094,13 +64984,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65094
64984
  if (ctr) {
65095
64985
  var lo = lot + 2 * ax - r;
65096
64986
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65097
- iv += 2 * n - 1;
64987
+ iv += 3 * (n - 1);
65098
64988
  ii += 3 * (n - 1);
65099
64989
  }
65100
64990
  if (cbr) {
65101
64991
  var lo = lor + 2 * ay - r;
65102
64992
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65103
- iv += 2 * n - 1;
64993
+ iv += 3 * (n - 1);
65104
64994
  ii += 3 * (n - 1);
65105
64995
  }
65106
64996
  this.pad(iv, ii, nv, ni, fd);
@@ -65109,7 +64999,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65109
64999
  * Preconditions:
65110
65000
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
65111
65001
  * * ax < ay
65112
- * * 6 * N + 12 <= nv
65002
+ * * 8 * N + 8 <= nv
65113
65003
  * * 4 * N + 6 <= ni
65114
65004
  */
65115
65005
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65157,13 +65047,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65157
65047
  if (ctr) {
65158
65048
  var lo = lot + 2 * ax - r;
65159
65049
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65160
- iv += 2 * n - 1;
65050
+ iv += 3 * (n - 1);
65161
65051
  ii += 3 * (n - 1);
65162
65052
  }
65163
65053
  if (cbr) {
65164
65054
  var lo = lor + 2 * ay - r;
65165
65055
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65166
- iv += 2 * n - 1;
65056
+ iv += 3 * (n - 1);
65167
65057
  ii += 3 * (n - 1);
65168
65058
  }
65169
65059
  this.pad(iv, ii, nv, ni, fd);
@@ -65238,7 +65128,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65238
65128
  * Preconditions:
65239
65129
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
65240
65130
  * * ay <= ax
65241
- * * 6 * N + 12 <= nv
65131
+ * * 8 * N + 8 <= nv
65242
65132
  * * 4 * N + 6 <= ni
65243
65133
  */
65244
65134
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65279,13 +65169,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65279
65169
  if (ctl) {
65280
65170
  var lo = lol + 2 * ay - r;
65281
65171
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65282
- iv += 2 * n - 1;
65172
+ iv += 3 * (n - 1);
65283
65173
  ii += 3 * (n - 1);
65284
65174
  }
65285
65175
  if (cbl) {
65286
65176
  var lo = lob + 2 * ax - r;
65287
65177
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65288
- iv += 2 * n - 1;
65178
+ iv += 3 * (n - 1);
65289
65179
  ii += 3 * (n - 1);
65290
65180
  }
65291
65181
  this.pad(iv, ii, nv, ni, fd);
@@ -65294,7 +65184,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65294
65184
  * Preconditions:
65295
65185
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
65296
65186
  * * ax < ay
65297
- * * 6 * N + 12 <= nv
65187
+ * * 8 * N + 8 <= nv
65298
65188
  * * 4 * N + 6 <= ni
65299
65189
  */
65300
65190
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65336,13 +65226,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65336
65226
  if (ctl) {
65337
65227
  var lo = lol + 2 * ay - r;
65338
65228
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65339
- iv += 2 * n - 1;
65229
+ iv += 3 * (n - 1);
65340
65230
  ii += 3 * (n - 1);
65341
65231
  }
65342
65232
  if (cbl) {
65343
65233
  var lo = lob + 2 * ax - r;
65344
65234
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65345
- iv += 2 * n - 1;
65235
+ iv += 3 * (n - 1);
65346
65236
  ii += 3 * (n - 1);
65347
65237
  }
65348
65238
  this.pad(iv, ii, nv, ni, fd);
@@ -65417,7 +65307,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65417
65307
  * Preconditions:
65418
65308
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
65419
65309
  * * ay <= ax
65420
- * * 8 * N + 18 <= nv
65310
+ * * 12 * N + 10 <= nv
65421
65311
  * * 4 * N + 10 <= ni
65422
65312
  */
65423
65313
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65462,10 +65352,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65462
65352
  iv += 5;
65463
65353
  ii += 9;
65464
65354
  var rs = r + fs;
65465
- var l = 2 * ax + lot;
65355
+ var l = 2 * ax + lot - r;
65466
65356
  if (ctr) {
65467
65357
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65468
- iv += 2 * n - 1;
65358
+ iv += 3 * (n - 1);
65469
65359
  ii += 3 * (n - 1);
65470
65360
  l += 2 * ay + lc;
65471
65361
  }
@@ -65474,7 +65364,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65474
65364
  }
65475
65365
  if (cbr) {
65476
65366
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65477
- iv += 2 * n - 1;
65367
+ iv += 3 * (n - 1);
65478
65368
  ii += 3 * (n - 1);
65479
65369
  l += 2 * ax + lc;
65480
65370
  }
@@ -65483,7 +65373,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65483
65373
  }
65484
65374
  if (cbl) {
65485
65375
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65486
- iv += 2 * n - 1;
65376
+ iv += 3 * (n - 1);
65487
65377
  ii += 3 * (n - 1);
65488
65378
  l += 2 * ay + lc;
65489
65379
  }
@@ -65492,7 +65382,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65492
65382
  }
65493
65383
  if (ctl) {
65494
65384
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65495
- iv += 2 * n - 1;
65385
+ iv += 3 * (n - 1);
65496
65386
  ii += 3 * (n - 1);
65497
65387
  }
65498
65388
  this.pad(iv, ii, nv, ni, fd);
@@ -65501,7 +65391,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65501
65391
  * Preconditions:
65502
65392
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
65503
65393
  * * ax < ay
65504
- * * 8 * N + 18 <= nv
65394
+ * * 12 * N + 10 <= nv
65505
65395
  * * 4 * N + 10 <= ni
65506
65396
  */
65507
65397
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65546,10 +65436,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65546
65436
  this.writeHexaLeft(iv, ii, lol, cbl ? x1 : ol, cbl ? y4 : y5, ol, y4, ol, y1, ctl ? x1 : ol, ctl ? y1 : y0, 0, y2, 0, y3, fd, s, fx, fy, ax, ay);
65547
65437
  iv += 6;
65548
65438
  ii += 12;
65549
- var l = 2 * ax + lot;
65439
+ var l = 2 * ax + lot - r;
65550
65440
  if (ctr) {
65551
65441
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65552
- iv += 1 + 2 * (n - 1);
65442
+ iv += 3 * (n - 1);
65553
65443
  ii += 3 * (n - 1);
65554
65444
  l += 2 * ay + lc;
65555
65445
  }
@@ -65558,7 +65448,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65558
65448
  }
65559
65449
  if (cbr) {
65560
65450
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65561
- iv += 1 + 2 * (n - 1);
65451
+ iv += 3 * (n - 1);
65562
65452
  ii += 3 * (n - 1);
65563
65453
  l += 2 * ax + lc;
65564
65454
  }
@@ -65567,7 +65457,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65567
65457
  }
65568
65458
  if (cbl) {
65569
65459
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65570
- iv += 1 + 2 * (n - 1);
65460
+ iv += 3 * (n - 1);
65571
65461
  ii += 3 * (n - 1);
65572
65462
  l += 2 * ay + lc;
65573
65463
  }
@@ -65576,7 +65466,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65576
65466
  }
65577
65467
  if (ctl) {
65578
65468
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65579
- iv += 1 + 2 * (n - 1);
65469
+ iv += 3 * (n - 1);
65580
65470
  ii += 3 * (n - 1);
65581
65471
  }
65582
65472
  this.pad(iv, ii, nv, ni, fd);
@@ -65849,29 +65739,27 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65849
65739
  var dangle = (Math.PI * 0.5) / (n - 1);
65850
65740
  var c = Math.cos(dangle);
65851
65741
  var s = Math.sin(dangle);
65852
- var dl = 0.5 * r * dangle;
65742
+ var dl = r * dangle;
65743
+ // Rim vertices at radius rs sit dl / 2 * (rs / r) from the chord midpoint, so the length is exact at radius r.
65744
+ var dlm = 0.5 * dl * (rs / r - 1);
65745
+ var cc = 1 - r * fd;
65746
+ var indices = this._indices;
65853
65747
  var dx = rs * cos0;
65854
65748
  var dy = rs * sin0;
65855
- var iv0 = iv++;
65856
65749
  var l = lo;
65857
- this.writeVertex(iv0, cx + dx, cy + dy, fd, lo, scale, fx, fy);
65858
- var indices = this._indices;
65859
- var cc = 1 - r * fd;
65860
65750
  for (var i = 0; i < n - 1; ++i) {
65861
- var iv1 = iv++;
65862
- l += dl;
65863
- this.writeVertex(iv1, cx, cy, fd, l, cc, fx, fy);
65864
- var iv2 = iv++;
65865
- l += dl;
65866
65751
  var ndx = c * dx - s * dy;
65867
65752
  var ndy = s * dx + c * dy;
65868
- this.writeVertex(iv2, cx + ndx, cy + ndy, fd, l, scale, fx, fy);
65753
+ this.writeVertex(iv + 0, cx + dx, cy + dy, fd, l - dlm, scale, fx, fy);
65754
+ this.writeVertex(iv + 1, cx + ndx, cy + ndy, fd, l + dl + dlm, scale, fx, fy);
65755
+ this.writeVertex(iv + 2, cx, cy, fd, l + 0.5 * dl, cc, fx, fy);
65756
+ indices[ii++] = iv + 2;
65757
+ indices[ii++] = iv + 0;
65758
+ indices[ii++] = iv + 1;
65759
+ iv += 3;
65760
+ l += dl;
65869
65761
  dx = ndx;
65870
65762
  dy = ndy;
65871
- indices[ii++] = iv1;
65872
- indices[ii++] = iv0;
65873
- indices[ii++] = iv2;
65874
- iv0 = iv2;
65875
65763
  }
65876
65764
  };
65877
65765
  EShapeRectangleRoundedTriangulatedImpl.prototype.writeVertexTop = function (vertex, x, y, lengthOffset, fdistance, scale, fx, fy, ax, ay) {
@@ -65903,7 +65791,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65903
65791
  * Copyright (C) 2019 Toshiba Corporation
65904
65792
  * SPDX-License-Identifier: Apache-2.0
65905
65793
  */
65906
- var hitTestRectangleRounded_ = function (x, y, ax, ay, r, corner) {
65794
+ var hitTestRectangleRoundedFilled = function (x, y, ax, ay, r, corner) {
65907
65795
  var bx0 = -ax + r;
65908
65796
  if (x <= bx0) {
65909
65797
  var by0 = -ay + r;
@@ -65956,116 +65844,138 @@ var hitTestRectangleRounded_ = function (x, y, ax, ay, r, corner) {
65956
65844
  }
65957
65845
  }
65958
65846
  };
65959
- var hitTestRectangleRounded = function (shape, x, y, ax, ay, sw, ss) {
65847
+ var hitTestRectangleRoundedStroke = function (shape, x, y, ax, ay, sw, ss, r, corner) {
65848
+ var s = sw * ss;
65849
+ var wx = Math.max(0.0, ax - s);
65850
+ var wy = Math.max(0.0, ay - s);
65851
+ var wr = Math.max(0.0, r - s);
65852
+ if (!hitTestRectangleRoundedFilled(x, y, wx, wy, wr, corner)) {
65853
+ var strokeSide = shape.stroke.side;
65854
+ if (strokeSide === EShapeStrokeSide.ALL) {
65855
+ return true;
65856
+ }
65857
+ else {
65858
+ if (x <= -wx + wr) {
65859
+ var hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);
65860
+ if (y <= -wy + wr) {
65861
+ var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
65862
+ if (hasTopSide && hasLeftSide) {
65863
+ return true;
65864
+ }
65865
+ else if (hasTopSide) {
65866
+ return -wx <= y;
65867
+ }
65868
+ else if (hasLeftSide) {
65869
+ return x <= -wx;
65870
+ }
65871
+ else {
65872
+ return false;
65873
+ }
65874
+ }
65875
+ else if (+wy - wr <= y) {
65876
+ var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
65877
+ if (hasBottomSide && hasLeftSide) {
65878
+ return true;
65879
+ }
65880
+ else if (hasBottomSide) {
65881
+ return +wx <= y;
65882
+ }
65883
+ else if (hasLeftSide) {
65884
+ return x <= -wx;
65885
+ }
65886
+ else {
65887
+ return false;
65888
+ }
65889
+ }
65890
+ else {
65891
+ return hasLeftSide;
65892
+ }
65893
+ }
65894
+ else if (+wx - wr <= x) {
65895
+ var hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);
65896
+ if (y <= -wy + wr) {
65897
+ var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
65898
+ if (hasTopSide && hasRightSide) {
65899
+ return true;
65900
+ }
65901
+ else if (hasTopSide) {
65902
+ return -wx <= y;
65903
+ }
65904
+ else if (hasRightSide) {
65905
+ return +wx <= x;
65906
+ }
65907
+ else {
65908
+ return false;
65909
+ }
65910
+ }
65911
+ else if (+wy - wr <= y) {
65912
+ var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
65913
+ if (hasBottomSide && hasRightSide) {
65914
+ return true;
65915
+ }
65916
+ else if (hasBottomSide) {
65917
+ return +wx <= y;
65918
+ }
65919
+ else if (hasRightSide) {
65920
+ return +wx <= x;
65921
+ }
65922
+ else {
65923
+ return false;
65924
+ }
65925
+ }
65926
+ else {
65927
+ return hasRightSide;
65928
+ }
65929
+ }
65930
+ else {
65931
+ if (y <= -wy + wr) {
65932
+ return !!(strokeSide & EShapeStrokeSide.TOP);
65933
+ }
65934
+ else if (+wy - wr <= y) {
65935
+ return !!(strokeSide & EShapeStrokeSide.BOTTOM);
65936
+ }
65937
+ else {
65938
+ return false;
65939
+ }
65940
+ }
65941
+ }
65942
+ }
65943
+ return false;
65944
+ };
65945
+ var hitTestRectangleRoundedLegacy = function (shape, x, y, ax, ay, sw, ss) {
65960
65946
  var fill = shape.fill;
65961
65947
  if (fill.enable || 0 < sw) {
65962
65948
  var r = shape.radius * Math.min(ax, ay);
65963
65949
  var corner = shape.corner;
65964
- if (hitTestRectangleRounded_(x, y, ax, ay, r, corner)) {
65950
+ if (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {
65965
65951
  if (fill.enable) {
65966
65952
  return true;
65967
65953
  }
65968
65954
  else {
65969
- var s = sw * ss;
65970
- var wx = Math.max(0.0, ax - s);
65971
- var wy = Math.max(0.0, ay - s);
65972
- var wr = Math.max(0.0, r - s);
65973
- if (!hitTestRectangleRounded_(x, y, wx, wy, wr, corner)) {
65974
- var strokeSide = shape.stroke.side;
65975
- if (strokeSide === EShapeStrokeSide.ALL) {
65976
- return true;
65977
- }
65978
- else {
65979
- if (x <= -wx + wr) {
65980
- var hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);
65981
- if (y <= -wy + wr) {
65982
- var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
65983
- if (hasTopSide && hasLeftSide) {
65984
- return true;
65985
- }
65986
- else if (hasTopSide) {
65987
- return -wx <= y;
65988
- }
65989
- else if (hasLeftSide) {
65990
- return x <= -wx;
65991
- }
65992
- else {
65993
- return false;
65994
- }
65995
- }
65996
- else if (+wy - wr <= y) {
65997
- var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
65998
- if (hasBottomSide && hasLeftSide) {
65999
- return true;
66000
- }
66001
- else if (hasBottomSide) {
66002
- return +wx <= y;
66003
- }
66004
- else if (hasLeftSide) {
66005
- return x <= -wx;
66006
- }
66007
- else {
66008
- return false;
66009
- }
66010
- }
66011
- else {
66012
- return hasLeftSide;
66013
- }
66014
- }
66015
- else if (+wx - wr <= x) {
66016
- var hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);
66017
- if (y <= -wy + wr) {
66018
- var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
66019
- if (hasTopSide && hasRightSide) {
66020
- return true;
66021
- }
66022
- else if (hasTopSide) {
66023
- return -wx <= y;
66024
- }
66025
- else if (hasRightSide) {
66026
- return +wx <= x;
66027
- }
66028
- else {
66029
- return false;
66030
- }
66031
- }
66032
- else if (+wy - wr <= y) {
66033
- var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
66034
- if (hasBottomSide && hasRightSide) {
66035
- return true;
66036
- }
66037
- else if (hasBottomSide) {
66038
- return +wx <= y;
66039
- }
66040
- else if (hasRightSide) {
66041
- return +wx <= x;
66042
- }
66043
- else {
66044
- return false;
66045
- }
66046
- }
66047
- else {
66048
- return hasRightSide;
66049
- }
66050
- }
66051
- else {
66052
- if (y <= -wy + wr) {
66053
- return !!(strokeSide & EShapeStrokeSide.TOP);
66054
- }
66055
- else if (+wy - wr <= y) {
66056
- return !!(strokeSide & EShapeStrokeSide.BOTTOM);
66057
- }
66058
- else {
66059
- return false;
66060
- }
66061
- }
66062
- }
65955
+ if (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {
65956
+ return true;
66063
65957
  }
66064
65958
  }
66065
65959
  }
66066
65960
  }
66067
65961
  return false;
66068
65962
  };
65963
+ var hitTestRectangleRounded = function (shape, x, y, ax, ay, sw, ss) {
65964
+ var fill = shape.fill;
65965
+ if (fill.enable || 0 < sw) {
65966
+ var r = shape.radius * Math.min(ax, ay);
65967
+ var corner = shape.corner;
65968
+ if (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {
65969
+ if (hitTestFill(x, y, ax, ay, fill)) {
65970
+ return true;
65971
+ }
65972
+ if (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {
65973
+ return true;
65974
+ }
65975
+ }
65976
+ }
65977
+ return false;
65978
+ };
66069
65979
 
66070
65980
  /*
66071
65981
  * Copyright (C) 2019 Toshiba Corporation
@@ -67495,6 +67405,10 @@ var BuilderLine = /** @class */ (function (_super) {
67495
67405
  return BuilderLine;
67496
67406
  }(BuilderBase));
67497
67407
 
67408
+ /*
67409
+ * Copyright (C) 2019 Toshiba Corporation
67410
+ * SPDX-License-Identifier: Apache-2.0
67411
+ */
67498
67412
  var TRIANGLE_LEGACY_VERTEX_COUNT = 7;
67499
67413
  var TRIANGLE_LEGACY_INDEX_COUNT = 3;
67500
67414
  var TRIANGLE_LEGACY_WORLD_SIZE = [0, 0, 0];
@@ -67972,6 +67886,10 @@ var BuilderNull = /** @class */ (function () {
67972
67886
  return BuilderNull;
67973
67887
  }());
67974
67888
 
67889
+ /*
67890
+ * Copyright (C) 2019 Toshiba Corporation
67891
+ * SPDX-License-Identifier: Apache-2.0
67892
+ */
67975
67893
  var RECTANGLE_LEGACY_VERTEX_COUNT = 16;
67976
67894
  var RECTANGLE_LEGACY_INDEX_COUNT = 8;
67977
67895
  var RECTANGLE_LEGACY_WORLD_SIZE = [0, 0];
@@ -72768,12 +72686,15 @@ var loadShapeLineOfCircles = function () {
72768
72686
  EShapeDeserializers[EShapeType.LINE_OF_CIRCLES] = deserializeLineOfCircles;
72769
72687
  };
72770
72688
 
72689
+ /*
72690
+ * Copyright (C) 2019 Toshiba Corporation
72691
+ * SPDX-License-Identifier: Apache-2.0
72692
+ */
72771
72693
  var RECTANGLE_ROUNDED_LEGACY_VERTEX_COUNT = 44;
72772
72694
  var RECTANGLE_ROUNDED_LEGACY_INDEX_COUNT = 24;
72773
72695
  var RECTANGLE_ROUNDED_LEGACY_WORLD_SIZE = [
72774
72696
  0, 0, 0, 0, 0
72775
72697
  ];
72776
- var RECTANGLE_ROUNDED_LEGACY_WORK_POINT = new pixi_js.Point();
72777
72698
  var buildRectangleRoundedLegacyIndex = function (indices, voffset, ioffset) {
72778
72699
  // c0 c1 c4 c5
72779
72700
  // |---| |---|
@@ -72887,22 +72808,21 @@ var buildRectangleRoundedLegacyVertex = function (vertices, voffset, originX, or
72887
72808
  var sy = sizeY * 0.5 + (0 <= sizeY ? +s : -s);
72888
72809
  var ax = Math.abs(sx);
72889
72810
  var ay = Math.abs(sy);
72890
- var a = radius * Math.min(ax, ay);
72891
- var rx = a / ax;
72892
- var ry = a / ay;
72893
- var work = RECTANGLE_ROUNDED_LEGACY_WORK_POINT;
72894
- work.set(originX - sx, originY - sy);
72895
- internalTransform.apply(work, work);
72896
- var b0x = work.x;
72897
- var b0y = work.y;
72898
- work.set(originX, originY - sy);
72899
- internalTransform.apply(work, work);
72900
- var b1x = work.x;
72901
- var b1y = work.y;
72902
- work.set(originX - sx, originY);
72903
- internalTransform.apply(work, work);
72904
- var b3x = work.x;
72905
- var b3y = work.y;
72811
+ var az = radius * Math.min(ax, ay);
72812
+ var rx = az / ax;
72813
+ var ry = az / ay;
72814
+ var a = internalTransform.a;
72815
+ var b = internalTransform.b;
72816
+ var c = internalTransform.c;
72817
+ var d = internalTransform.d;
72818
+ var tx = internalTransform.tx;
72819
+ var ty = internalTransform.ty;
72820
+ var b0x = a * (originX - sx) + c * (originY - sy) + tx;
72821
+ var b0y = b * (originX - sx) + d * (originY - sy) + ty;
72822
+ var b1x = a * originX + c * (originY - sy) + tx;
72823
+ var b1y = b * originX + d * (originY - sy) + ty;
72824
+ var b3x = a * (originX - sx) + c * originY + tx;
72825
+ var b3y = b * (originX - sx) + d * originY + ty;
72906
72826
  var d01x = b1x - b0x;
72907
72827
  var d01y = b1y - b0y;
72908
72828
  var d03x = b3x - b0x;
@@ -73128,7 +73048,7 @@ var buildRectangleRoundedLegacyVertex = function (vertices, voffset, originX, or
73128
73048
  // World size
73129
73049
  worldSize[0] = ax;
73130
73050
  worldSize[1] = ay;
73131
- worldSize[2] = a;
73051
+ worldSize[2] = az;
73132
73052
  worldSize[3] = rx;
73133
73053
  worldSize[4] = ry;
73134
73054
  };
@@ -73976,7 +73896,7 @@ var EShapeRectangleRoundedLegacy = /** @class */ (function (_super) {
73976
73896
  };
73977
73897
  EShapeRectangleRoundedLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
73978
73898
  if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
73979
- return hitTestRectangleRounded(this, x, y, ax, ay, sw, ss);
73899
+ return hitTestRectangleRoundedLegacy(this, x, y, ax, ay, sw, ss);
73980
73900
  }
73981
73901
  return false;
73982
73902
  };
@@ -74256,13 +74176,16 @@ var loadShapeLineOfRectangles = function () {
74256
74176
  EShapeCapabilities.set(EShapeType.LINE_OF_RECTANGLES, EShapeCapability.PRIMITIVE | EShapeCapability.STROKE_SIDE);
74257
74177
  };
74258
74178
 
74259
- var TRIANGLE_ROUNDED_VERTEX_COUNT = 22;
74260
- var TRIANGLE_ROUNDED_INDEX_COUNT = 15;
74261
- var TRIANGLE_ROUNDED_WORLD_SIZE = [
74179
+ /*
74180
+ * Copyright (C) 2019 Toshiba Corporation
74181
+ * SPDX-License-Identifier: Apache-2.0
74182
+ */
74183
+ var TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT = 22;
74184
+ var TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT = 15;
74185
+ var TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE = [
74262
74186
  0, 0, 0, 0, 0
74263
74187
  ];
74264
- var TRIANGLE_ROUNDED_WORK_POINT = new pixi_js.Point();
74265
- var buildTriangleRoundedIndex = function (indices, voffset, ioffset) {
74188
+ var buildTriangleRoundedLegacyIndex = function (indices, voffset, ioffset) {
74266
74189
  // Top corner
74267
74190
  var ii = ioffset * 3 - 1;
74268
74191
  indices[++ii] = voffset + 0;
@@ -74316,7 +74239,7 @@ var buildTriangleRoundedIndex = function (indices, voffset, ioffset) {
74316
74239
  indices[++ii] = voffset + 21;
74317
74240
  indices[++ii] = voffset + 13;
74318
74241
  };
74319
- var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY, sizeX, sizeY, strokeAlign, strokeWidth, radius, internalTransform, worldSize) {
74242
+ var buildTriangleRoundedLegacyVertex = function (vertices, voffset, originX, originY, sizeX, sizeY, strokeAlign, strokeWidth, radius, internalTransform, worldSize) {
74320
74243
  // Calculate the transformed positions
74321
74244
  var s = strokeAlign * strokeWidth;
74322
74245
  var sx = sizeX * 0.5 + (0 <= sizeX ? +s : -s);
@@ -74326,23 +74249,24 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74326
74249
  var ry = (sw * radius) / (2 * sy);
74327
74250
  var rz = (0.5 * (sz - sw) * radius) / sz;
74328
74251
  var rx = (ry * sz) / (2 * sx);
74329
- var work = TRIANGLE_ROUNDED_WORK_POINT;
74330
- work.set(originX, originY - sy);
74331
- internalTransform.apply(work, work);
74332
- var x1 = work.x;
74333
- var y1 = work.y;
74334
- work.set(originX, originY);
74335
- internalTransform.apply(work, work);
74336
- var tx = work.x;
74337
- var ty = work.y;
74338
- work.set(originX + sx, originY);
74339
- internalTransform.apply(work, work);
74340
- var dx = tx - x1;
74341
- var dy = ty - y1;
74342
- var x4 = work.x + dx;
74343
- var y4 = work.y + dy;
74344
- var x7 = tx + (tx - work.x) + dx;
74345
- var y7 = ty + (ty - work.y) + dy;
74252
+ var a = internalTransform.a;
74253
+ var b = internalTransform.b;
74254
+ var c = internalTransform.c;
74255
+ var d = internalTransform.d;
74256
+ var tx = internalTransform.tx;
74257
+ var ty = internalTransform.ty;
74258
+ var x1 = a * originX + c * (originY - sy) + tx;
74259
+ var y1 = b * originX + d * (originY - sy) + ty;
74260
+ var ox = a * originX + c * originY + tx;
74261
+ var oy = b * originX + d * originY + ty;
74262
+ var dx = ox - x1;
74263
+ var dy = oy - y1;
74264
+ var wx = a * (originX + sx) + c * originY + tx;
74265
+ var wy = b * (originX + sx) + d * originY + ty;
74266
+ var x4 = wx + dx;
74267
+ var y4 = wy + dy;
74268
+ var x7 = ox + (ox - wx) + dx;
74269
+ var y7 = oy + (oy - wy) + dy;
74346
74270
  var dx14 = x4 - x1;
74347
74271
  var dy14 = y4 - y1;
74348
74272
  var x2 = x1 + rz * dx14;
@@ -74361,10 +74285,8 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74361
74285
  var y8 = y7 + ry * dy71;
74362
74286
  var x9 = x1 - rz * dx71;
74363
74287
  var y9 = y1 - rz * dy71;
74364
- work.set(originX, originY + sy - sw); // Incenter of a triangle
74365
- internalTransform.apply(work, work);
74366
- var x0 = work.x;
74367
- var y0 = work.y;
74288
+ var x0 = a * originX + c * (originY + sy - sw) + tx;
74289
+ var y0 = b * originX + d * (originY + sy - sw) + ty;
74368
74290
  var x10 = x1 + radius * (x0 - x1);
74369
74291
  var y10 = y1 + radius * (y0 - y1);
74370
74292
  var x11 = x4 + radius * (x0 - x4);
@@ -74372,8 +74294,8 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74372
74294
  var x12 = x7 + radius * (x0 - x7);
74373
74295
  var y12 = y7 + radius * (y0 - y7);
74374
74296
  // World size
74375
- var xb = tx + dx;
74376
- var yb = ty + dy;
74297
+ var xb = ox + dx;
74298
+ var yb = oy + dy;
74377
74299
  worldSize[0] = toLength(xb, yb, x0, y0);
74378
74300
  worldSize[1] = rx;
74379
74301
  worldSize[2] = ry;
@@ -74430,7 +74352,7 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74430
74352
  vertices[++iv] = x9;
74431
74353
  vertices[++iv] = y9;
74432
74354
  };
74433
- var buildTriangleRoundedStep = function (steps, voffset, strokeWidth, strokeStyle, corner, radius, worldSize) {
74355
+ var buildTriangleRoundedLegacyStep = function (steps, voffset, strokeWidth, strokeStyle, corner, radius, worldSize) {
74434
74356
  var scaleInvariant = toScaleInvariant(strokeStyle);
74435
74357
  var s = worldSize[0];
74436
74358
  var sr = radius * s;
@@ -74701,7 +74623,7 @@ var buildTriangleRoundedStep = function (steps, voffset, strokeWidth, strokeStyl
74701
74623
  steps[++is] = c10;
74702
74624
  steps[++is] = 0;
74703
74625
  };
74704
- var buildTriangleRoundedUv = function (uvs, voffset, textureUvs, radius, worldSize) {
74626
+ var buildTriangleRoundedLegacyUv = function (uvs, voffset, textureUvs, radius, worldSize) {
74705
74627
  var x0 = textureUvs.x0;
74706
74628
  var x1 = textureUvs.x1;
74707
74629
  var x2 = textureUvs.x2;
@@ -74807,8 +74729,8 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74807
74729
  var ioffset = this.indexOffset;
74808
74730
  var pointCountReserved = this.pointCountReserved;
74809
74731
  if (0 < pointCountReserved) {
74810
- buildTriangleRoundedIndex(buffer.indices, voffset, ioffset);
74811
- copyIndex(buffer.indices, TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset, TRIANGLE_ROUNDED_INDEX_COUNT, pointCountReserved);
74732
+ buildTriangleRoundedLegacyIndex(buffer.indices, voffset, ioffset);
74733
+ copyIndex(buffer.indices, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, ioffset, TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT, pointCountReserved);
74812
74734
  }
74813
74735
  this.inited |= BuilderFlag.INDEX;
74814
74736
  };
@@ -74817,7 +74739,7 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74817
74739
  if (points instanceof EShapeLineOfAnyPointsImpl) {
74818
74740
  var buffer = this.buffer;
74819
74741
  this.updateVertexStepAndUv(buffer, shape, points);
74820
- this.updateLineOfAnyColor(buffer, shape, points, TRIANGLE_ROUNDED_VERTEX_COUNT);
74742
+ this.updateLineOfAnyColor(buffer, shape, points, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT);
74821
74743
  }
74822
74744
  };
74823
74745
  BuilderLineOfTriangleRoundeds.prototype.updateVertexStepAndUv = function (buffer, shape, points) {
@@ -74895,17 +74817,17 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74895
74817
  var pointSizeX = pointSize.getX(0);
74896
74818
  var pointSizeY = pointSize.getY(0);
74897
74819
  // Vertices
74898
- buildTriangleRoundedVertex(vertices, voffset, 0, 0, pointSizeX, pointSizeY, strokeAlign, strokeWidth, radius, internalTransform, TRIANGLE_ROUNDED_WORLD_SIZE);
74899
- copyVertex(vertices, internalTransform, voffset, TRIANGLE_ROUNDED_VERTEX_COUNT, pointCount, pointsValues, pointOffset);
74820
+ buildTriangleRoundedLegacyVertex(vertices, voffset, 0, 0, pointSizeX, pointSizeY, strokeAlign, strokeWidth, radius, internalTransform, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74821
+ copyVertex(vertices, internalTransform, voffset, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, pointCount, pointsValues, pointOffset);
74900
74822
  // Steps
74901
74823
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
74902
- buildTriangleRoundedStep(steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74903
- copyStep(steps, voffset, TRIANGLE_ROUNDED_VERTEX_COUNT, pointCount);
74824
+ buildTriangleRoundedLegacyStep(steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74825
+ copyStep(steps, voffset, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, pointCount);
74904
74826
  }
74905
74827
  // UVs
74906
74828
  if (isNotInited || isVertexChanged || isTextureChanged) {
74907
- buildTriangleRoundedUv(uvs, voffset, textureUvs, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74908
- copyUvs(uvs, voffset, TRIANGLE_ROUNDED_VERTEX_COUNT, pointCount);
74829
+ buildTriangleRoundedLegacyUv(uvs, voffset, textureUvs, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74830
+ copyUvs(uvs, voffset, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, pointCount);
74909
74831
  }
74910
74832
  }
74911
74833
  else {
@@ -74915,23 +74837,23 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74915
74837
  var py = pointsValues[ip + 1] + pointOffset.getY(i);
74916
74838
  var pointSizeX = pointSize.getX(i);
74917
74839
  var pointSizeY = pointSize.getY(i);
74918
- var iv = voffset + i * TRIANGLE_ROUNDED_VERTEX_COUNT;
74840
+ var iv = voffset + i * TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT;
74919
74841
  // Vertices
74920
- buildTriangleRoundedVertex(vertices, iv, px, py, pointSizeX, pointSizeY, strokeAlign, strokeWidth, radius, internalTransform, TRIANGLE_ROUNDED_WORLD_SIZE);
74842
+ buildTriangleRoundedLegacyVertex(vertices, iv, px, py, pointSizeX, pointSizeY, strokeAlign, strokeWidth, radius, internalTransform, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74921
74843
  // Steps
74922
74844
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
74923
- buildTriangleRoundedStep(steps, iv, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74845
+ buildTriangleRoundedLegacyStep(steps, iv, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74924
74846
  }
74925
74847
  // UVs
74926
74848
  if (isNotInited || isVertexChanged || isTextureChanged) {
74927
- buildTriangleRoundedUv(uvs, iv, textureUvs, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74849
+ buildTriangleRoundedLegacyUv(uvs, iv, textureUvs, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74928
74850
  }
74929
74851
  }
74930
74852
  }
74931
74853
  // Fill the rest
74932
74854
  var pointCountReserved = this.pointCountReserved;
74933
- var voffsetReserved = voffset + pointCount * TRIANGLE_ROUNDED_VERTEX_COUNT;
74934
- var vcountReserved = TRIANGLE_ROUNDED_VERTEX_COUNT * (pointCountReserved - pointCount);
74855
+ var voffsetReserved = voffset + pointCount * TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT;
74856
+ var vcountReserved = TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT * (pointCountReserved - pointCount);
74935
74857
  buildNullVertex(vertices, voffsetReserved, vcountReserved);
74936
74858
  buildNullStep(steps, voffsetReserved, vcountReserved);
74937
74859
  buildNullUv(uvs, voffsetReserved, vcountReserved);
@@ -74945,16 +74867,15 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74945
74867
  * SPDX-License-Identifier: Apache-2.0
74946
74868
  */
74947
74869
  var createLineOfTriangleRoundedsUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
74948
- return createLineOfAnyUploaded(buffer, shape, voffset, TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset, TRIANGLE_ROUNDED_INDEX_COUNT, antialiasWeight, BuilderLineOfTriangleRoundeds);
74870
+ return createLineOfAnyUploaded(buffer, shape, voffset, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, ioffset, TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT, antialiasWeight, BuilderLineOfTriangleRoundeds);
74949
74871
  };
74950
74872
 
74951
74873
  /*
74952
74874
  * Copyright (C) 2019 Toshiba Corporation
74953
74875
  * SPDX-License-Identifier: Apache-2.0
74954
74876
  */
74955
- var containsCorner_ = function (shape, x, y, r, aw, sw, ss) {
74956
- var fill = shape.fill;
74957
- if (fill.enable) {
74877
+ var containsCorner_ = function (x, y, r, aw, sw, ss, filled) {
74878
+ if (filled) {
74958
74879
  if (x * x + y * y <= r * r) {
74959
74880
  return true;
74960
74881
  }
@@ -74972,7 +74893,7 @@ var containsCorner_ = function (shape, x, y, r, aw, sw, ss) {
74972
74893
  }
74973
74894
  return false;
74974
74895
  };
74975
- var containsCorner = function (shape, x, y, x0, y0, x1, y1, x2, y2, x3, y3, r12, r13, aw, radius, sw, ss) {
74896
+ var containsCorner = function (x, y, x0, y0, x1, y1, x2, y2, x3, y3, r12, r13, aw, radius, sw, ss, filled) {
74976
74897
  var xl = x1 + r12 * (x2 - x1) - x0;
74977
74898
  var yl = y1 + r12 * (y2 - y1) - y0;
74978
74899
  var n = Math.sqrt(xl * xl + yl * yl);
@@ -74992,14 +74913,14 @@ var containsCorner = function (shape, x, y, x0, y0, x1, y1, x2, y2, x3, y3, r12,
74992
74913
  var yc = y - y0;
74993
74914
  var dx = (+nry * xc - nrx * yc) * deti;
74994
74915
  var dy = (-nly * xc + nlx * yc) * deti;
74995
- if (containsCorner_(shape, dx, dy, n, aw * radius, sw, ss)) {
74916
+ if (containsCorner_(dx, dy, n, aw * radius, sw, ss, filled)) {
74996
74917
  return true;
74997
74918
  }
74998
74919
  }
74999
74920
  }
75000
74921
  return false;
75001
74922
  };
75002
- var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
74923
+ var hitTestTriangleRoundedImpl = function (shape, x, y, ax, ay, sw, ss, filled) {
75003
74924
  var a = (2 * ay) / ax;
75004
74925
  if (hitTestTriangleFilled(x, y, a, -ay, +ay)) {
75005
74926
  var az = Math.sqrt(ax * ax + 4 * ay * ay);
@@ -75026,7 +74947,7 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75026
74947
  if (!c0 && !c1 && corner & EShapeCorner.TOP) {
75027
74948
  // Top corner
75028
74949
  var rz = (0.5 * (az - aw) * radius) / az;
75029
- if (containsCorner(shape, x, y, x10, y10, x1, y1, x7, y7, x4, y4, rz, rz, aw, radius, sw, ss)) {
74950
+ if (containsCorner(x, y, x10, y10, x1, y1, x7, y7, x4, y4, rz, rz, aw, radius, sw, ss, filled)) {
75030
74951
  return true;
75031
74952
  }
75032
74953
  }
@@ -75034,7 +74955,7 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75034
74955
  // Bottom-left corner
75035
74956
  var ry = (aw * radius) / (2 * ay);
75036
74957
  var rx = (ry * az) / (2 * ax);
75037
- if (containsCorner(shape, x, y, x12, y12, x7, y7, x4, y4, x1, y1, rx, ry, aw, radius, sw, ss)) {
74958
+ if (containsCorner(x, y, x12, y12, x7, y7, x4, y4, x1, y1, rx, ry, aw, radius, sw, ss, filled)) {
75038
74959
  return true;
75039
74960
  }
75040
74961
  }
@@ -75042,14 +74963,13 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75042
74963
  // Bottom-right corner
75043
74964
  var ry = (aw * radius) / (2 * ay);
75044
74965
  var rx = (ry * az) / (2 * ax);
75045
- if (containsCorner(shape, x, y, x11, y11, x4, y4, x1, y1, x7, y7, ry, rx, aw, radius, sw, ss)) {
74966
+ if (containsCorner(x, y, x11, y11, x4, y4, x1, y1, x7, y7, ry, rx, aw, radius, sw, ss, filled)) {
75046
74967
  return true;
75047
74968
  }
75048
74969
  }
75049
74970
  else {
75050
74971
  // Others
75051
- var fill = shape.fill;
75052
- if (fill.enable) {
74972
+ if (filled) {
75053
74973
  return true;
75054
74974
  }
75055
74975
  else {
@@ -75067,27 +74987,88 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75067
74987
  }
75068
74988
  return false;
75069
74989
  };
74990
+ var hitTestTriangleRoundedLegacy = function (shape, x, y, ax, ay, sw, ss) {
74991
+ return hitTestTriangleRoundedImpl(shape, x, y, ax, ay, sw, ss, shape.fill.enable);
74992
+ };
74993
+ /**
74994
+ * Returns true if the point is in the cone with the apex (cx, cy) spanned by the unit normals n1 and n2
74995
+ * but outside the circle of radius `rho`, that is, in the part cut off by a rounded corner.
74996
+ */
74997
+ var isCutByCorner = function (x, y, cx, cy, n1x, n1y, n2x, n2y, rho) {
74998
+ var dx = x - cx;
74999
+ var dy = y - cy;
75000
+ var det = n1x * n2y - n1y * n2x;
75001
+ var a = (dx * n2y - dy * n2x) / det;
75002
+ var b = (n1x * dy - n1y * dx) / det;
75003
+ return 0 <= a && 0 <= b && rho * rho < dx * dx + dy * dy;
75004
+ };
75005
+ /**
75006
+ * Tests whether the point is in the rounded triangle shrunk by `s`.
75007
+ * Sharp corners and corners whose radius is not larger than `s` stay sharp.
75008
+ */
75009
+ var hitTestTriangleRoundedInset = function (shape, x, y, ax, ay, s) {
75010
+ var az = Math.sqrt(ax * ax + 4 * ay * ay);
75011
+ // The outward unit normals of the left side (nlx, nly) and the right side (-nlx, nly)
75012
+ var nlx = (-2 * ay) / az;
75013
+ var nly = -ax / az;
75014
+ var yt = y + ay;
75015
+ if (-s < nlx * x + nly * yt || -s < -nlx * x + nly * yt || ay - s < y) {
75016
+ return false;
75017
+ }
75018
+ var radius = shape.radius;
75019
+ var aw = (2 * ax * ay) / (ax + az);
75020
+ var rho = radius * aw - s;
75021
+ if (0 < rho) {
75022
+ var corner = shape.corner;
75023
+ var cby = ay - radius * aw;
75024
+ if (corner & EShapeCorner.TOP &&
75025
+ isCutByCorner(x, y, 0, -ay + radius * (2 * ay - aw), nlx, nly, -nlx, nly, rho)) {
75026
+ return false;
75027
+ }
75028
+ if (corner & EShapeCorner.BOTTOM_RIGHT &&
75029
+ isCutByCorner(x, y, ax * (1 - radius), cby, -nlx, nly, 0, 1, rho)) {
75030
+ return false;
75031
+ }
75032
+ if (corner & EShapeCorner.BOTTOM_LEFT &&
75033
+ isCutByCorner(x, y, -ax * (1 - radius), cby, nlx, nly, 0, 1, rho)) {
75034
+ return false;
75035
+ }
75036
+ }
75037
+ return true;
75038
+ };
75039
+ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75040
+ var fill = shape.fill;
75041
+ if ((fill.enable || 0 < sw) && hitTestTriangleRoundedInset(shape, x, y, ax, ay, 0)) {
75042
+ if (fill.enable && hitTestFill(x, y, ax, ay, fill)) {
75043
+ return true;
75044
+ }
75045
+ if (0 < sw && !hitTestTriangleRoundedInset(shape, x, y, ax, ay, sw * ss)) {
75046
+ return true;
75047
+ }
75048
+ }
75049
+ return false;
75050
+ };
75070
75051
 
75071
75052
  /*
75072
75053
  * Copyright (C) 2019 Toshiba Corporation
75073
75054
  * SPDX-License-Identifier: Apache-2.0
75074
75055
  */
75075
- var EShapeTriangleRounded = /** @class */ (function (_super) {
75076
- __extends(EShapeTriangleRounded, _super);
75077
- function EShapeTriangleRounded(type) {
75078
- if (type === void 0) { type = EShapeType.TRIANGLE_ROUNDED; }
75056
+ var EShapeTriangleRoundedLegacy = /** @class */ (function (_super) {
75057
+ __extends(EShapeTriangleRoundedLegacy, _super);
75058
+ function EShapeTriangleRoundedLegacy(type) {
75059
+ if (type === void 0) { type = EShapeType.TRIANGLE_ROUNDED_LEGACY; }
75079
75060
  return _super.call(this, type) || this;
75080
75061
  }
75081
- EShapeTriangleRounded.prototype.clone = function () {
75082
- return new EShapeTriangleRounded(this.type).copy(this);
75062
+ EShapeTriangleRoundedLegacy.prototype.clone = function () {
75063
+ return new EShapeTriangleRoundedLegacy(this.type).copy(this);
75083
75064
  };
75084
- EShapeTriangleRounded.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
75065
+ EShapeTriangleRoundedLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
75085
75066
  if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
75086
- return hitTestTriangleRounded(this, x, y, ax, ay, sw, ss);
75067
+ return hitTestTriangleRoundedLegacy(this, x, y, ax, ay, sw, ss);
75087
75068
  }
75088
75069
  return false;
75089
75070
  };
75090
- return EShapeTriangleRounded;
75071
+ return EShapeTriangleRoundedLegacy;
75091
75072
  }(EShapePrimitive));
75092
75073
 
75093
75074
  /*
@@ -75134,7 +75115,7 @@ var EShapeLineOfTriangleRoundeds = /** @class */ (function (_super) {
75134
75115
  return false;
75135
75116
  };
75136
75117
  return EShapeLineOfTriangleRoundeds;
75137
- }(EShapeTriangleRounded));
75118
+ }(EShapeTriangleRoundedLegacy));
75138
75119
 
75139
75120
  /*
75140
75121
  * Copyright (C) 2019 Toshiba Corporation
@@ -78319,30 +78300,516 @@ var loadShapeTriangleLegacy = function () {
78319
78300
  EShapeDeserializers[EShapeType.TRIANGLE_LEGACY] = deserializeTriangleLegacy;
78320
78301
  };
78321
78302
 
78303
+ /*
78304
+ * Copyright (C) 2019-2026 Toshiba Corporation
78305
+ * SPDX-License-Identifier: Apache-2.0
78306
+ */
78307
+ var EShapeTriangleRoundedTriangulatedImpl = /** @class */ (function () {
78308
+ function EShapeTriangleRoundedTriangulatedImpl(parent) {
78309
+ this._id = 0;
78310
+ this._parent = parent;
78311
+ this._width = 0;
78312
+ this._height = 0;
78313
+ this._strokeAlign = 0;
78314
+ this._strokeWidth = 0;
78315
+ this._sizeX = 0;
78316
+ this._sizeY = 0;
78317
+ this._radius = 0;
78318
+ this._corner = EShapeCorner.NONE;
78319
+ this._vertices = [];
78320
+ this._nvertices = 0;
78321
+ this._distances = [];
78322
+ this._lengths = [];
78323
+ this._clippings = [];
78324
+ this._uvs = [];
78325
+ this._indices = [];
78326
+ this._nindices = 0;
78327
+ this._boundary = [0, 0, 0, 0];
78328
+ }
78329
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "id", {
78330
+ get: function () {
78331
+ this.triangulate();
78332
+ return this._id;
78333
+ },
78334
+ enumerable: false,
78335
+ configurable: true
78336
+ });
78337
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "vertices", {
78338
+ get: function () {
78339
+ this.triangulate();
78340
+ return this._vertices;
78341
+ },
78342
+ enumerable: false,
78343
+ configurable: true
78344
+ });
78345
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "nvertices", {
78346
+ get: function () {
78347
+ this.triangulate();
78348
+ return this._nvertices;
78349
+ },
78350
+ enumerable: false,
78351
+ configurable: true
78352
+ });
78353
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "distances", {
78354
+ get: function () {
78355
+ this.triangulate();
78356
+ return this._distances;
78357
+ },
78358
+ enumerable: false,
78359
+ configurable: true
78360
+ });
78361
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "lengths", {
78362
+ get: function () {
78363
+ this.triangulate();
78364
+ return this._lengths;
78365
+ },
78366
+ enumerable: false,
78367
+ configurable: true
78368
+ });
78369
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "clippings", {
78370
+ get: function () {
78371
+ this.triangulate();
78372
+ return this._clippings;
78373
+ },
78374
+ enumerable: false,
78375
+ configurable: true
78376
+ });
78377
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "uvs", {
78378
+ get: function () {
78379
+ this.triangulate();
78380
+ return this._uvs;
78381
+ },
78382
+ enumerable: false,
78383
+ configurable: true
78384
+ });
78385
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "indices", {
78386
+ get: function () {
78387
+ this.triangulate();
78388
+ return this._indices;
78389
+ },
78390
+ enumerable: false,
78391
+ configurable: true
78392
+ });
78393
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "nindices", {
78394
+ get: function () {
78395
+ this.triangulate();
78396
+ return this._nindices;
78397
+ },
78398
+ enumerable: false,
78399
+ configurable: true
78400
+ });
78401
+ Object.defineProperty(EShapeTriangleRoundedTriangulatedImpl.prototype, "boundary", {
78402
+ get: function () {
78403
+ this.triangulate();
78404
+ return this._boundary;
78405
+ },
78406
+ enumerable: false,
78407
+ configurable: true
78408
+ });
78409
+ EShapeTriangleRoundedTriangulatedImpl.prototype.triangulate = function () {
78410
+ var isNotInitialized = this._id === 0;
78411
+ var parent = this._parent;
78412
+ var size = parent.size;
78413
+ var width = size.x;
78414
+ var height = size.y;
78415
+ var isRectChanged = this._width !== width || this._height !== height;
78416
+ var stroke = parent.stroke;
78417
+ var strokeAlign = stroke.align;
78418
+ var strokeWidth = stroke.enable ? stroke.width : 0;
78419
+ var isStrokeChanged = this._strokeAlign !== strokeAlign || this._strokeWidth !== strokeWidth;
78420
+ var radius = parent.radius;
78421
+ var isRadiusChanged = this._radius !== radius;
78422
+ var corner = parent.corner;
78423
+ var isCornerChanged = this._corner !== corner;
78424
+ var isSizeChanged = false;
78425
+ var sizeX = this._sizeX;
78426
+ var sizeY = this._sizeY;
78427
+ if (isRectChanged || isStrokeChanged) {
78428
+ this._width = width;
78429
+ this._height = height;
78430
+ this._strokeAlign = strokeAlign;
78431
+ this._strokeWidth = strokeWidth;
78432
+ var s = strokeAlign * strokeWidth;
78433
+ sizeX = width * 0.5 + (0 <= width ? +s : -s);
78434
+ sizeY = height * 0.5 + (0 <= height ? +s : -s);
78435
+ isSizeChanged = this._sizeX !== sizeX || this._sizeY !== sizeY;
78436
+ }
78437
+ if (isNotInitialized ||
78438
+ isSizeChanged ||
78439
+ isStrokeChanged ||
78440
+ isRadiusChanged ||
78441
+ isCornerChanged) {
78442
+ this._sizeX = sizeX;
78443
+ this._sizeY = sizeY;
78444
+ this._radius = radius;
78445
+ this._corner = corner;
78446
+ this.update(sizeX, sizeY, radius, corner);
78447
+ }
78448
+ };
78449
+ EShapeTriangleRoundedTriangulatedImpl.prototype.update = function (sx, sy, radius, corner) {
78450
+ var boundary = this._boundary;
78451
+ var ax = Math.abs(sx);
78452
+ var ay = Math.abs(sy);
78453
+ boundary[0] = -ax;
78454
+ boundary[1] = -ay;
78455
+ boundary[2] = +ax;
78456
+ boundary[3] = +ay;
78457
+ var n = EShapeDefaults.CIRCLE_SEGMENT_COUNT >> 2;
78458
+ var nv = 9 * n + 6;
78459
+ var ni = 3 * n + 6;
78460
+ this._nvertices = nv;
78461
+ this._nindices = ni;
78462
+ this._id += 1;
78463
+ if (ax <= 0 || ay <= 0) {
78464
+ this.pad(0, 0, nv, ni, 0);
78465
+ return;
78466
+ }
78467
+ var scale = 1.1;
78468
+ var az = 2 * ay;
78469
+ var b0 = Math.sqrt(ax * ax + az * az);
78470
+ var r0 = (ax * az) / (ax + b0);
78471
+ var r = radius * r0;
78472
+ var fs = (scale - 1) * r0;
78473
+ var rs = r + fs;
78474
+ var r0i = 1 / r0;
78475
+ var rr0 = r * r0i;
78476
+ var a0 = ax * rr0;
78477
+ var b1 = b0 - a0;
78478
+ var b2 = b0 - ax;
78479
+ var b3 = b2 * rr0;
78480
+ var b0i = 1 / b0;
78481
+ var b1b0 = b1 * b0i;
78482
+ var b3b0 = b3 * b0i;
78483
+ var b2b0 = b2 * b0i;
78484
+ var gx = Math.sign(sx);
78485
+ var x0 = -sx;
78486
+ var x1 = -sx + gx * ax * (1 - b1b0);
78487
+ var x2 = -sx + gx * ax * rr0;
78488
+ var x3 = -sx + gx * ax * (1 - b3b0);
78489
+ var x4 = 0;
78490
+ var x6 = -x2;
78491
+ var xl = -sx + gx * ax * (1 - b2b0);
78492
+ var gy = Math.sign(sy);
78493
+ var y0 = -sy;
78494
+ var y1 = -sy + gy * az * b3b0;
78495
+ var y2 = -sy + gy * (az - r0) * rr0;
78496
+ var y3 = -sy + gy * (az - r0);
78497
+ var y4 = -sy + gy * az * b1b0;
78498
+ var y5 = -sy + gy * (az - r);
78499
+ var y6 = +sy;
78500
+ var yc = -sy + gy * az * b2b0;
78501
+ var dlx = xl - x4;
78502
+ var dly = yc - y3;
78503
+ var nlx = dlx * r0i;
78504
+ var nly = dly * r0i;
78505
+ var nrx = -nlx;
78506
+ var nry = nly;
78507
+ var nbx = 0;
78508
+ var nby = gy;
78509
+ var tt = (nrx * (nrx - nlx) + nry * (nry - nly)) / (nry * nlx - nrx * nly);
78510
+ var tl = (nbx * (nbx - nlx) + nby * (nby - nly)) / (nby * nlx - nbx * nly);
78511
+ var sx0 = x0 + (nlx - nly * tl) * fs;
78512
+ var sx1 = x1 + nlx * fs;
78513
+ var sx3 = x3 + nlx * fs;
78514
+ var sx5 = -sx3;
78515
+ var sx7 = -sx1;
78516
+ var sx8 = -sx0;
78517
+ var sy0 = y0 + (nly + nlx * tt) * fs;
78518
+ var sy1 = y1 + nly * fs;
78519
+ var sy4 = y4 + nly * fs;
78520
+ var sy6 = y6 + gy * fs;
78521
+ var fd = r0i;
78522
+ var fx = 1 / sx;
78523
+ var fy = 1 / sy;
78524
+ var ct = 0 < r && !!(corner & EShapeCorner.TOP);
78525
+ var cr = 0 < r && !!(corner & EShapeCorner.BOTTOM_RIGHT);
78526
+ var cl = 0 < r && !!(corner & EShapeCorner.BOTTOM_LEFT);
78527
+ var aapex = ct || cr || cl ? Math.atan2(ax, az) : 0;
78528
+ var gz = gx * gy;
78529
+ var atop = gz * (Math.PI - 2 * aapex);
78530
+ var abottom = gz * (Math.PI * 0.5 + aapex);
78531
+ // Top Fan
78532
+ var iv = 0;
78533
+ var ii = 0;
78534
+ var l = 0;
78535
+ if (ct) {
78536
+ l = this.writeFan(x4, y2, sx3, sy1, atop, nlx, nly, l, r, rs, fd, scale, fx, fy, n, iv, ii);
78537
+ iv += 3 * (n - 1);
78538
+ ii += 3 * (n - 1);
78539
+ }
78540
+ // Right Pentagon
78541
+ var p1x = sx5;
78542
+ var p1y = sy1;
78543
+ var ttx = x3;
78544
+ var tty = y1;
78545
+ if (!ct) {
78546
+ p1x = x4;
78547
+ p1y = sy0;
78548
+ ttx = x4;
78549
+ tty = y0;
78550
+ }
78551
+ var p2x = sx7;
78552
+ var p2y = sy4;
78553
+ var trbx = -x1;
78554
+ var trby = y4;
78555
+ if (!cr) {
78556
+ p2x = sx8;
78557
+ p2y = sy6;
78558
+ trbx = -x0;
78559
+ trby = y6;
78560
+ }
78561
+ var lr = Math.sqrt((trbx + ttx) * (trbx + ttx) + (trby - tty) * (trby - tty));
78562
+ var lrc = Math.sqrt((ttx - xl) * (ttx - xl) + (yc - tty) * (yc - tty));
78563
+ var nlr = l + lr;
78564
+ var tdx = sx * b0i;
78565
+ var tdy = 2 * sy * b0i;
78566
+ var lr1 = l + (p1x + ttx) * tdx + (p1y - tty) * tdy;
78567
+ var lr2 = nlr + (p2x - trbx) * tdx + (p2y - trby) * tdy;
78568
+ var c0 = scale;
78569
+ var c1 = 1 - radius;
78570
+ this.writePenta(ct ? x4 : p1x, ct ? y2 : p1y, p1x, p1y, p2x, p2y, cr ? x6 : p2x, cr ? y5 : p2y, x4, y3, ct ? l : lr1, lr1, lr2, cr ? nlr : lr2, l + lrc, ct ? c1 : c0, c0, c0, cr ? c1 : c0, 0, fd, fx, fy, iv, ii);
78571
+ iv += 5;
78572
+ ii += 9;
78573
+ l = nlr;
78574
+ // Right Fan
78575
+ if (cr) {
78576
+ l = this.writeFan(x6, y5, sx7, sy4, abottom, nrx, nry, l, r, rs, fd, scale, fx, fy, n, iv, ii);
78577
+ iv += 3 * (n - 1);
78578
+ ii += 3 * (n - 1);
78579
+ }
78580
+ // Bottom Pentagon
78581
+ var p3x = x6;
78582
+ var p3y = sy6;
78583
+ var q3x = x6;
78584
+ var q3y = y5;
78585
+ var tbrx = x6;
78586
+ if (!cr) {
78587
+ p3x = sx8;
78588
+ q3x = p3x;
78589
+ q3y = p3y;
78590
+ tbrx = -x0;
78591
+ }
78592
+ var p4x = x2;
78593
+ var p4y = sy6;
78594
+ var q4x = x2;
78595
+ var q4y = y5;
78596
+ var tblx = x2;
78597
+ if (!cl) {
78598
+ p4x = sx0;
78599
+ q4x = p4x;
78600
+ q4y = p4y;
78601
+ tblx = x0;
78602
+ }
78603
+ var lb = Math.abs(tbrx - tblx);
78604
+ var lbc = Math.abs(tbrx - x4);
78605
+ var nlb = l + lb;
78606
+ var lb1 = l - gx * (p3x - tbrx);
78607
+ var lb2 = nlb - gx * (p4x - tblx);
78608
+ this.writePenta(q3x, q3y, p3x, p3y, p4x, p4y, q4x, q4y, x4, y3, cr ? l : lb1, lb1, lb2, cl ? nlb : lb2, l + lbc, cr ? c1 : c0, c0, c0, cl ? c1 : c0, 0, fd, fx, fy, iv, ii);
78609
+ iv += 5;
78610
+ ii += 9;
78611
+ l = nlb;
78612
+ // Left Fan
78613
+ if (cl) {
78614
+ l = this.writeFan(x2, y5, x2, sy6, abottom, nbx, nby, l, r, rs, fd, scale, fx, fy, n, iv, ii);
78615
+ iv += 3 * (n - 1);
78616
+ ii += 3 * (n - 1);
78617
+ }
78618
+ // Left Pentagon
78619
+ var p5x = sx1;
78620
+ var p5y = sy4;
78621
+ var q5x = x2;
78622
+ var q5y = y5;
78623
+ var tlbx = x1;
78624
+ var tlby = y4;
78625
+ if (!cl) {
78626
+ p5x = sx0;
78627
+ p5y = sy6;
78628
+ q5x = p5x;
78629
+ q5y = p5y;
78630
+ tlbx = x0;
78631
+ tlby = y6;
78632
+ }
78633
+ var p6x = sx3;
78634
+ var p6y = sy1;
78635
+ var q6x = x4;
78636
+ var q6y = y2;
78637
+ if (!ct) {
78638
+ p6x = x4;
78639
+ p6y = sy0;
78640
+ q6x = p6x;
78641
+ q6y = p6y;
78642
+ }
78643
+ var ll = Math.sqrt((tlbx - ttx) * (tlbx - ttx) + (tlby - tty) * (tlby - tty));
78644
+ var llc = Math.sqrt((xl - tlbx) * (xl - tlbx) + (yc - tlby) * (yc - tlby));
78645
+ var nll = l + ll;
78646
+ var ll0 = nll + (p6x - ttx) * tdx - (p6y - tty) * tdy;
78647
+ var ll4 = l + (p5x - tlbx) * tdx - (p5y - tlby) * tdy;
78648
+ this.writePenta(p6x, p6y, q6x, q6y, x4, y3, q5x, q5y, p5x, p5y, ll0, ct ? nll : ll0, l + llc, cl ? l : ll4, ll4, c0, ct ? c1 : c0, 0, cl ? c1 : c0, c0, fd, fx, fy, iv, ii);
78649
+ iv += 5;
78650
+ ii += 9;
78651
+ this.pad(iv, ii, nv, ni, fd);
78652
+ };
78653
+ EShapeTriangleRoundedTriangulatedImpl.prototype.writePenta = function (x0, y0, x1, y1, x2, y2, x3, y3, x4, y4, length0, length1, length2, length3, length4, clipping0, clipping1, clipping2, clipping3, clipping4, distance, fx, fy, iv, ii) {
78654
+ this.writeVertex(iv + 0, x0, y0, distance, length0, clipping0, fx, fy);
78655
+ this.writeVertex(iv + 1, x1, y1, distance, length1, clipping1, fx, fy);
78656
+ this.writeVertex(iv + 2, x2, y2, distance, length2, clipping2, fx, fy);
78657
+ this.writeVertex(iv + 3, x3, y3, distance, length3, clipping3, fx, fy);
78658
+ this.writeVertex(iv + 4, x4, y4, distance, length4, clipping4, fx, fy);
78659
+ var indices = this._indices;
78660
+ indices[ii + 0] = iv + 0;
78661
+ indices[ii + 1] = iv + 1;
78662
+ indices[ii + 2] = iv + 2;
78663
+ indices[ii + 3] = iv + 0;
78664
+ indices[ii + 4] = iv + 2;
78665
+ indices[ii + 5] = iv + 3;
78666
+ indices[ii + 6] = iv + 0;
78667
+ indices[ii + 7] = iv + 3;
78668
+ indices[ii + 8] = iv + 4;
78669
+ };
78670
+ EShapeTriangleRoundedTriangulatedImpl.prototype.writeFan = function (cx, cy, x0, y0, dt, nx, ny, l0, r, rs, fd, scale, fx, fy, n, iv, ii) {
78671
+ var m = n - 1;
78672
+ var da = dt / m;
78673
+ var dl = Math.abs(da) * r;
78674
+ // Rim vertices at radius rs sit dl / 2 * (rs / r) from the chord midpoint, so the length is exact at radius r.
78675
+ var dlm = 0.5 * dl * (rs / r - 1);
78676
+ var c0 = scale;
78677
+ var c1 = 1 - r * fd;
78678
+ var indices = this._indices;
78679
+ var l = l0;
78680
+ var xa = x0;
78681
+ var ya = y0;
78682
+ for (var i = 0; i < m; i += 1) {
78683
+ var angle = (i + 1) * da;
78684
+ var ca = Math.cos(angle);
78685
+ var sa = Math.sin(angle);
78686
+ var xb = cx + rs * (nx * ca - ny * sa);
78687
+ var yb = cy + rs * (nx * sa + ny * ca);
78688
+ var nl = l + dl;
78689
+ this.writeVertex(iv + 0, xa, ya, fd, l - dlm, c0, fx, fy);
78690
+ this.writeVertex(iv + 1, xb, yb, fd, nl + dlm, c0, fx, fy);
78691
+ this.writeVertex(iv + 2, cx, cy, fd, l + 0.5 * dl, c1, fx, fy);
78692
+ indices[ii + 0] = iv + 2;
78693
+ indices[ii + 1] = iv + 0;
78694
+ indices[ii + 2] = iv + 1;
78695
+ iv += 3;
78696
+ ii += 3;
78697
+ l = nl;
78698
+ xa = xb;
78699
+ ya = yb;
78700
+ }
78701
+ return l;
78702
+ };
78703
+ EShapeTriangleRoundedTriangulatedImpl.prototype.writeVertex = function (vertex, x, y, distance, length, clipping, fx, fy) {
78704
+ var vertex2 = vertex << 1;
78705
+ this._vertices[vertex2] = x;
78706
+ this._vertices[vertex2 + 1] = y;
78707
+ this._distances[vertex] = distance;
78708
+ this._lengths[vertex] = length;
78709
+ this._clippings[vertex] = clipping;
78710
+ this._uvs[vertex2] = 0.5 * (x * fx + 1);
78711
+ this._uvs[vertex2 + 1] = 0.5 * (y * fy + 1);
78712
+ };
78713
+ EShapeTriangleRoundedTriangulatedImpl.prototype.pad = function (iv, ii, nv, ni, distance) {
78714
+ for (var i = iv; i < nv; ++i) {
78715
+ var vertex2 = i << 1;
78716
+ this._vertices[vertex2] = 0;
78717
+ this._vertices[vertex2 + 1] = 0;
78718
+ this._distances[i] = distance;
78719
+ this._lengths[i] = 0;
78720
+ this._clippings[i] = 0;
78721
+ this._uvs[vertex2] = 0.5;
78722
+ this._uvs[vertex2 + 1] = 0.5;
78723
+ }
78724
+ for (var i = ii; i < ni * 3; ++i) {
78725
+ this._indices[i] = 0;
78726
+ }
78727
+ this._vertices.length = nv * 2;
78728
+ this._distances.length = nv;
78729
+ this._lengths.length = nv;
78730
+ this._clippings.length = nv;
78731
+ this._uvs.length = nv * 2;
78732
+ this._indices.length = ni * 3;
78733
+ };
78734
+ return EShapeTriangleRoundedTriangulatedImpl;
78735
+ }());
78736
+
78737
+ /*
78738
+ * Copyright (C) 2019-2026 Toshiba Corporation
78739
+ * SPDX-License-Identifier: Apache-2.0
78740
+ */
78741
+ var EShapeTriangleRounded = /** @class */ (function (_super) {
78742
+ __extends(EShapeTriangleRounded, _super);
78743
+ function EShapeTriangleRounded(type) {
78744
+ if (type === void 0) { type = EShapeType.TRIANGLE_ROUNDED; }
78745
+ var _this = _super.call(this, type) || this;
78746
+ _this._triangulated = _this.newTriangulated();
78747
+ return _this;
78748
+ }
78749
+ EShapeTriangleRounded.prototype.newTriangulated = function () {
78750
+ return new EShapeTriangleRoundedTriangulatedImpl(this);
78751
+ };
78752
+ Object.defineProperty(EShapeTriangleRounded.prototype, "triangulated", {
78753
+ get: function () {
78754
+ return this._triangulated;
78755
+ },
78756
+ enumerable: false,
78757
+ configurable: true
78758
+ });
78759
+ EShapeTriangleRounded.prototype.clone = function () {
78760
+ return new EShapeTriangleRounded(this.type).copy(this);
78761
+ };
78762
+ EShapeTriangleRounded.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
78763
+ if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
78764
+ return hitTestTriangleRounded(this, x, y, ax, ay, sw, ss);
78765
+ }
78766
+ return false;
78767
+ };
78768
+ return EShapeTriangleRounded;
78769
+ }(EShapePrimitive));
78770
+
78322
78771
  /*
78323
78772
  * Copyright (C) 2019 Toshiba Corporation
78324
78773
  * SPDX-License-Identifier: Apache-2.0
78325
78774
  */
78326
- var BuilderTriangleRounded = /** @class */ (function (_super) {
78327
- __extends(BuilderTriangleRounded, _super);
78328
- function BuilderTriangleRounded(buffer, vertexOffset, indexOffset) {
78329
- var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_ROUNDED_VERTEX_COUNT, TRIANGLE_ROUNDED_INDEX_COUNT) || this;
78775
+ var deserializeTriangleRounded = function (item, manager, shape) {
78776
+ return deserializeBase(item, manager, shape || new EShapeTriangleRounded());
78777
+ };
78778
+
78779
+ /*
78780
+ * Copyright (C) 2019 Toshiba Corporation
78781
+ * SPDX-License-Identifier: Apache-2.0
78782
+ */
78783
+ var loadShapeTriangleRounded = function () {
78784
+ EShapeUploadeds[EShapeType.TRIANGLE_ROUNDED] = createPolygonUploaded;
78785
+ EShapeDeserializers[EShapeType.TRIANGLE_ROUNDED] = deserializeTriangleRounded;
78786
+ EShapeCapabilities.set(EShapeType.TRIANGLE_ROUNDED, EShapeCapability.PRIMITIVE | EShapeCapability.BORDER_RADIUS);
78787
+ };
78788
+
78789
+ /*
78790
+ * Copyright (C) 2019 Toshiba Corporation
78791
+ * SPDX-License-Identifier: Apache-2.0
78792
+ */
78793
+ var BuilderTriangleRoundedLegacy = /** @class */ (function (_super) {
78794
+ __extends(BuilderTriangleRoundedLegacy, _super);
78795
+ function BuilderTriangleRoundedLegacy(buffer, vertexOffset, indexOffset) {
78796
+ var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT) || this;
78330
78797
  _this.radius = 0;
78331
78798
  _this.corner = 0;
78332
78799
  return _this;
78333
78800
  }
78334
- BuilderTriangleRounded.prototype.init = function () {
78801
+ BuilderTriangleRoundedLegacy.prototype.init = function () {
78335
78802
  var buffer = this.buffer;
78336
78803
  buffer.updateIndices();
78337
- buildTriangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
78804
+ buildTriangleRoundedLegacyIndex(buffer.indices, this.vertexOffset, this.indexOffset);
78338
78805
  this.inited |= BuilderFlag.INDEX;
78339
78806
  };
78340
- BuilderTriangleRounded.prototype.update = function (shape) {
78807
+ BuilderTriangleRoundedLegacy.prototype.update = function (shape) {
78341
78808
  var buffer = this.buffer;
78342
78809
  this.updateVertexStepAndUv(buffer, shape);
78343
78810
  this.updateColor(buffer, shape);
78344
78811
  };
78345
- BuilderTriangleRounded.prototype.updateVertexStepAndUv = function (buffer, shape) {
78812
+ BuilderTriangleRoundedLegacy.prototype.updateVertexStepAndUv = function (buffer, shape) {
78346
78813
  var size = shape.size;
78347
78814
  var sizeX = size.x;
78348
78815
  var sizeY = size.y;
@@ -78383,55 +78850,55 @@ var BuilderTriangleRounded = /** @class */ (function (_super) {
78383
78850
  this.textureTransformId = textureTransformId;
78384
78851
  var voffset = this.vertexOffset;
78385
78852
  buffer.updateVertices();
78386
- buildTriangleRoundedVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, radius, shape.transform.internalTransform, TRIANGLE_ROUNDED_WORLD_SIZE);
78853
+ buildTriangleRoundedLegacyVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, radius, shape.transform.internalTransform, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
78387
78854
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
78388
78855
  buffer.updateSteps();
78389
- buildTriangleRoundedStep(buffer.steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
78856
+ buildTriangleRoundedLegacyStep(buffer.steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
78390
78857
  }
78391
78858
  if (isNotInited || isVertexChanged || isTextureChanged) {
78392
78859
  buffer.updateUvs();
78393
- buildTriangleRoundedUv(buffer.uvs, voffset, toTextureUvs(texture), radius, TRIANGLE_ROUNDED_WORLD_SIZE);
78860
+ buildTriangleRoundedLegacyUv(buffer.uvs, voffset, toTextureUvs(texture), radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
78394
78861
  }
78395
78862
  }
78396
78863
  };
78397
- return BuilderTriangleRounded;
78864
+ return BuilderTriangleRoundedLegacy;
78398
78865
  }(BuilderBase));
78399
78866
 
78400
78867
  /*
78401
78868
  * Copyright (C) 2019 Toshiba Corporation
78402
78869
  * SPDX-License-Identifier: Apache-2.0
78403
78870
  */
78404
- var createTriangleRoundedUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
78871
+ var createTriangleRoundedLegacyUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
78405
78872
  var tcount = toTextBufferCount(shape);
78406
78873
  var tvcount = tcount << TEXT_VERTEX_COUNT_SHIFT;
78407
78874
  var ticount = tcount << TEXT_INDEX_COUNT_SHIFT;
78408
- var vcount = TRIANGLE_ROUNDED_VERTEX_COUNT + tvcount;
78409
- var icount = TRIANGLE_ROUNDED_INDEX_COUNT + ticount;
78875
+ var vcount = TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT + tvcount;
78876
+ var icount = TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT + ticount;
78410
78877
  if (buffer.check(voffset, ioffset, vcount, icount)) {
78411
78878
  return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
78412
- new BuilderTriangleRounded(buffer, voffset, ioffset),
78413
- new BuilderText(buffer, voffset + TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset + TRIANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
78879
+ new BuilderTriangleRoundedLegacy(buffer, voffset, ioffset),
78880
+ new BuilderText(buffer, voffset + TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT, ioffset + TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT, tvcount, ticount)
78414
78881
  ]).init(shape);
78415
78882
  }
78416
78883
  return null;
78417
78884
  };
78418
78885
 
78419
78886
  /*
78420
- * Copyright (C) 2019 Toshiba Corporation
78887
+ * Copyright (C) 2019-2026 Toshiba Corporation
78421
78888
  * SPDX-License-Identifier: Apache-2.0
78422
78889
  */
78423
- var deserializeTriangleRounded = function (item, manager, shape) {
78424
- return deserializeBase(item, manager, shape || new EShapeTriangleRounded());
78890
+ var deserializeTriangleRoundedLegacy = function (item, manager, shape) {
78891
+ return deserializeBase(item, manager, shape || new EShapeTriangleRoundedLegacy());
78425
78892
  };
78426
78893
 
78427
78894
  /*
78428
78895
  * Copyright (C) 2019 Toshiba Corporation
78429
78896
  * SPDX-License-Identifier: Apache-2.0
78430
78897
  */
78431
- var loadShapeTriangleRounded = function () {
78432
- EShapeUploadeds[EShapeType.TRIANGLE_ROUNDED] = createTriangleRoundedUploaded;
78433
- EShapeDeserializers[EShapeType.TRIANGLE_ROUNDED] = deserializeTriangleRounded;
78434
- EShapeCapabilities.set(EShapeType.TRIANGLE_ROUNDED, EShapeCapability.PRIMITIVE | EShapeCapability.BORDER_RADIUS);
78898
+ var loadShapeTriangleRoundedLegacy = function () {
78899
+ EShapeUploadeds[EShapeType.TRIANGLE_ROUNDED_LEGACY] = createTriangleRoundedLegacyUploaded;
78900
+ EShapeDeserializers[EShapeType.TRIANGLE_ROUNDED_LEGACY] = deserializeTriangleRoundedLegacy;
78901
+ EShapeCapabilities.set(EShapeType.TRIANGLE_ROUNDED_LEGACY, EShapeCapability.PRIMITIVE | EShapeCapability.BORDER_RADIUS);
78435
78902
  };
78436
78903
 
78437
78904
  /*
@@ -78461,6 +78928,7 @@ var loadShapeAll = function () {
78461
78928
  loadShapeRectangle();
78462
78929
  loadShapeSemicircle();
78463
78930
  loadShapeTriangleLegacy();
78931
+ loadShapeTriangleRoundedLegacy();
78464
78932
  loadShapeTriangleRounded();
78465
78933
  loadShapeTriangle();
78466
78934
  loadShapeLineOfCircles();
@@ -109601,7 +110069,8 @@ exports.BuilderSemicircle = BuilderSemicircle;
109601
110069
  exports.BuilderText = BuilderText;
109602
110070
  exports.BuilderTriangle = BuilderTriangleLegacy;
109603
110071
  exports.BuilderTriangleLegacy = BuilderTriangleLegacy;
109604
- exports.BuilderTriangleRounded = BuilderTriangleRounded;
110072
+ exports.BuilderTriangleRounded = BuilderTriangleRoundedLegacy;
110073
+ exports.BuilderTriangleRoundedLegacy = BuilderTriangleRoundedLegacy;
109605
110074
  exports.CIRCLE_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
109606
110075
  exports.CIRCLE_LEGACY_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
109607
110076
  exports.CIRCLE_LEGACY_VERTEX_COUNT = CIRCLE_LEGACY_VERTEX_COUNT;
@@ -110957,6 +111426,8 @@ exports.EShapeTransformImpl = EShapeTransformImpl;
110957
111426
  exports.EShapeTriangle = EShapeTriangle;
110958
111427
  exports.EShapeTriangleLegacy = EShapeTriangleLegacy;
110959
111428
  exports.EShapeTriangleRounded = EShapeTriangleRounded;
111429
+ exports.EShapeTriangleRoundedLegacy = EShapeTriangleRoundedLegacy;
111430
+ exports.EShapeTriangleRoundedTriangulatedImpl = EShapeTriangleRoundedTriangulatedImpl;
110960
111431
  exports.EShapeTriangleTriangulatedImpl = EShapeTriangleTriangulatedImpl;
110961
111432
  exports.EShapeType = EShapeType;
110962
111433
  exports.EShapeUploadedImpl = EShapeUploadedImpl;
@@ -111042,9 +111513,12 @@ exports.TRIANGLE_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
111042
111513
  exports.TRIANGLE_LEGACY_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
111043
111514
  exports.TRIANGLE_LEGACY_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
111044
111515
  exports.TRIANGLE_LEGACY_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
111045
- exports.TRIANGLE_ROUNDED_INDEX_COUNT = TRIANGLE_ROUNDED_INDEX_COUNT;
111046
- exports.TRIANGLE_ROUNDED_VERTEX_COUNT = TRIANGLE_ROUNDED_VERTEX_COUNT;
111047
- exports.TRIANGLE_ROUNDED_WORLD_SIZE = TRIANGLE_ROUNDED_WORLD_SIZE;
111516
+ exports.TRIANGLE_ROUNDED_INDEX_COUNT = TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT;
111517
+ exports.TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT = TRIANGLE_ROUNDED_LEGACY_INDEX_COUNT;
111518
+ exports.TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT = TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT;
111519
+ exports.TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE = TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE;
111520
+ exports.TRIANGLE_ROUNDED_VERTEX_COUNT = TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT;
111521
+ exports.TRIANGLE_ROUNDED_WORLD_SIZE = TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE;
111048
111522
  exports.TRIANGLE_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
111049
111523
  exports.TRIANGLE_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
111050
111524
  exports.UtilAlpha = UtilAlpha;
@@ -111151,10 +111625,14 @@ exports.buildTriangleLegacyIndex = buildTriangleLegacyIndex;
111151
111625
  exports.buildTriangleLegacyStep = buildTriangleLegacyStep;
111152
111626
  exports.buildTriangleLegacyUv = buildTriangleLegacyUv;
111153
111627
  exports.buildTriangleLegacyVertex = buildTriangleLegacyVertex;
111154
- exports.buildTriangleRoundedIndex = buildTriangleRoundedIndex;
111155
- exports.buildTriangleRoundedStep = buildTriangleRoundedStep;
111156
- exports.buildTriangleRoundedUv = buildTriangleRoundedUv;
111157
- exports.buildTriangleRoundedVertex = buildTriangleRoundedVertex;
111628
+ exports.buildTriangleRoundedIndex = buildTriangleRoundedLegacyIndex;
111629
+ exports.buildTriangleRoundedLegacyIndex = buildTriangleRoundedLegacyIndex;
111630
+ exports.buildTriangleRoundedLegacyStep = buildTriangleRoundedLegacyStep;
111631
+ exports.buildTriangleRoundedLegacyUv = buildTriangleRoundedLegacyUv;
111632
+ exports.buildTriangleRoundedLegacyVertex = buildTriangleRoundedLegacyVertex;
111633
+ exports.buildTriangleRoundedStep = buildTriangleRoundedLegacyStep;
111634
+ exports.buildTriangleRoundedUv = buildTriangleRoundedLegacyUv;
111635
+ exports.buildTriangleRoundedVertex = buildTriangleRoundedLegacyVertex;
111158
111636
  exports.buildTriangleStep = buildTriangleLegacyStep;
111159
111637
  exports.buildTriangleUv = buildTriangleLegacyUv;
111160
111638
  exports.buildTriangleVertex = buildTriangleLegacyVertex;
@@ -111189,7 +111667,8 @@ exports.createRectangleRoundedUploaded = createRectangleRoundedLegacyUploaded;
111189
111667
  exports.createRectangleUploaded = createRectangleLegacyUploaded;
111190
111668
  exports.createSemicircleUploaded = createSemicircleUploaded;
111191
111669
  exports.createTriangleLegacyUploaded = createTriangleLegacyUploaded;
111192
- exports.createTriangleRoundedUploaded = createTriangleRoundedUploaded;
111670
+ exports.createTriangleRoundedLegacyUploaded = createTriangleRoundedLegacyUploaded;
111671
+ exports.createTriangleRoundedUploaded = createTriangleRoundedLegacyUploaded;
111193
111672
  exports.createTriangleUploaded = createTriangleLegacyUploaded;
111194
111673
  exports.dThemeDarkEnUsDialogProcessingMessage = dThemeDarkEnUsDialogProcessingMessage;
111195
111674
  exports.dThemeDarkJaJpDialogProcessingMessage = dThemeDarkJaJpDialogProcessingMessage;
@@ -111231,6 +111710,7 @@ exports.deserializeSemicircle = deserializeSemicircle;
111231
111710
  exports.deserializeTriangle = deserializeTriangle;
111232
111711
  exports.deserializeTriangleLegacy = deserializeTriangleLegacy;
111233
111712
  exports.deserializeTriangleRounded = deserializeTriangleRounded;
111713
+ exports.deserializeTriangleRoundedLegacy = deserializeTriangleRoundedLegacy;
111234
111714
  exports.eShapePointsFormatterCurve = eShapePointsFormatterCurve;
111235
111715
  exports.eShapePointsFormatterCurveBezierQuadratic = eShapePointsFormatterCurveBezierQuadratic;
111236
111716
  exports.hitTestBBox = hitTestBBox;
@@ -111239,11 +111719,13 @@ exports.hitTestCircleLegacy = hitTestCircleLegacy;
111239
111719
  exports.hitTestRectangle = hitTestRectangle;
111240
111720
  exports.hitTestRectangleLegacy = hitTestRectangleLegacy;
111241
111721
  exports.hitTestRectangleRounded = hitTestRectangleRounded;
111722
+ exports.hitTestRectangleRoundedLegacy = hitTestRectangleRoundedLegacy;
111242
111723
  exports.hitTestSemicircle = hitTestSemicircle;
111243
111724
  exports.hitTestTriangle = hitTestTriangle;
111244
111725
  exports.hitTestTriangleFilled = hitTestTriangleFilled;
111245
111726
  exports.hitTestTriangleLegacy = hitTestTriangleLegacy;
111246
111727
  exports.hitTestTriangleRounded = hitTestTriangleRounded;
111728
+ exports.hitTestTriangleRoundedLegacy = hitTestTriangleRoundedLegacy;
111247
111729
  exports.isArray = isArray;
111248
111730
  exports.isFunction = isFunction;
111249
111731
  exports.isNaN = isNaN$1;
@@ -111289,6 +111771,7 @@ exports.loadShapeSemicircle = loadShapeSemicircle;
111289
111771
  exports.loadShapeTriangle = loadShapeTriangle;
111290
111772
  exports.loadShapeTriangleLegacy = loadShapeTriangleLegacy;
111291
111773
  exports.loadShapeTriangleRounded = loadShapeTriangleRounded;
111774
+ exports.loadShapeTriangleRoundedLegacy = loadShapeTriangleRoundedLegacy;
111292
111775
  exports.loadThemeDark = loadThemeDark;
111293
111776
  exports.loadThemeDarkBase = loadThemeDarkBase;
111294
111777
  exports.loadThemeDarkBoard = loadThemeDarkBoard;