@wcardinal/wcardinal-ui 0.467.1 → 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 (84) 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-triangle-rounded.d.ts +1 -0
  19. package/dist/types/wcardinal/ui/shape/variant/index.d.ts +7 -0
  20. package/dist/wcardinal/ui/shape/e-shape-type.js +1 -0
  21. package/dist/wcardinal/ui/shape/e-shape-type.js.map +1 -1
  22. package/dist/wcardinal/ui/shape/load/index.js +1 -0
  23. package/dist/wcardinal/ui/shape/load/index.js.map +1 -1
  24. package/dist/wcardinal/ui/shape/load/load-shape-all.js +2 -0
  25. package/dist/wcardinal/ui/shape/load/load-shape-all.js.map +1 -1
  26. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js +17 -0
  27. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js.map +1 -0
  28. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js +2 -2
  29. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js.map +1 -1
  30. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js +4 -0
  31. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js.map +1 -1
  32. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js +20 -19
  33. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js.map +1 -1
  34. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js +4 -0
  35. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js.map +1 -1
  36. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js +538 -0
  37. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js.map +1 -0
  38. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js +5 -536
  39. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js.map +1 -1
  40. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js +84 -0
  41. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js.map +1 -0
  42. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js +1 -79
  43. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js.map +1 -1
  44. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js +24 -0
  45. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js.map +1 -0
  46. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js +1 -19
  47. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js.map +1 -1
  48. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js +10 -0
  49. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js.map +1 -0
  50. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js +134 -199
  51. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js.map +1 -1
  52. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js +2 -2
  53. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js.map +1 -1
  54. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js +62 -64
  55. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js.map +1 -1
  56. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js +27 -0
  57. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js.map +1 -0
  58. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js +437 -0
  59. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js.map +1 -0
  60. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js +6 -0
  61. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js.map +1 -0
  62. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js +15 -2
  63. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js.map +1 -1
  64. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js +71 -11
  65. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js.map +1 -1
  66. package/dist/wcardinal/ui/shape/variant/index.js +7 -0
  67. package/dist/wcardinal/ui/shape/variant/index.js.map +1 -1
  68. package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
  69. package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
  70. package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
  71. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
  72. package/dist/wcardinal-ui-theme-dark.js +1 -1
  73. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  74. package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
  75. package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
  76. package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
  77. package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
  78. package/dist/wcardinal-ui-theme-white.js +1 -1
  79. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  80. package/dist/wcardinal-ui.cjs.js +891 -385
  81. package/dist/wcardinal-ui.js +891 -385
  82. package/dist/wcardinal-ui.min.js +2 -2
  83. package/dist/wcardinal-ui.min.js.map +1 -1
  84. package/package.json +1 -1
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.1
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
 
@@ -32549,6 +32550,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32549
32550
  this._nvertices = 0;
32550
32551
  this._distances = [];
32551
32552
  this._lengths = [];
32553
+ this._lengthShifts = [];
32552
32554
  this._clippings = [];
32553
32555
  this._uvs = [];
32554
32556
  this._indices = [];
@@ -32675,7 +32677,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32675
32677
  boundary[2] = +ax;
32676
32678
  boundary[3] = +ay;
32677
32679
  // # of vertices and # of indices
32678
- var nv = 3 * n - 3;
32680
+ var nv = 4 * n - 4;
32679
32681
  var ni = 2 * n - 4;
32680
32682
  this._nvertices = nv;
32681
32683
  this._nindices = ni;
@@ -32740,83 +32742,56 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32740
32742
  var dangle = (2 * Math.PI) / n;
32741
32743
  var c = Math.cos(dangle);
32742
32744
  var s = Math.sin(dangle);
32743
- // First Edge
32744
- var x0 = 0;
32745
- var y0 = sizeY;
32746
- var u = -s;
32747
- var v = c;
32748
- var su = scale * u;
32749
- var sv = scale * v;
32750
- var x1 = u * sizeX;
32751
- var y1 = v * sizeY;
32752
- var dx = 0.5 * (x1 + x0) - 0;
32753
- var dy = 0.5 * (y1 + y0) - 0;
32754
- var fdistance = 1 / Math.sqrt(dx * dx + dy * dy);
32755
- var lx = x1 - x0;
32756
- var ly = y1 - y0;
32757
- var dl = Math.sqrt(lx * lx + ly * ly);
32758
- var l1 = dl;
32759
- var l2 = 0.5 * dl;
32760
- vertices[0] = 0;
32761
- vertices[1] = scale * sizeY;
32762
- vertices[2] = su * sizeX;
32763
- vertices[3] = sv * sizeY;
32764
- vertices[4] = 0;
32765
- vertices[5] = 0;
32766
- distances[0] = fdistance;
32767
- distances[1] = fdistance;
32768
- distances[2] = fdistance;
32769
- clippings[0] = scale;
32770
- clippings[1] = scale;
32771
- clippings[2] = 0;
32772
- lengths[0] = 0;
32773
- lengths[1] = l1;
32774
- lengths[2] = l2;
32775
- uvs[0] = 0.5;
32776
- uvs[1] = 0.5 * (scale + 1);
32777
- uvs[2] = 0.5 * (su + 1);
32778
- uvs[3] = 0.5 * (sv + 1);
32779
- uvs[4] = 0.5;
32780
- uvs[5] = 0.5;
32781
- indices[0] = 0;
32782
- indices[1] = 1;
32783
- indices[2] = 2;
32784
- // The Other Edges
32785
- var iv1 = 3;
32786
- var iv2 = 6;
32787
- var ii = 3;
32788
- for (var i = 2; i <= n; ++i) {
32789
- var un = c * u - s * v;
32790
- var vn = s * u + c * v;
32791
- u = un;
32792
- v = vn;
32793
- su = scale * u;
32794
- sv = scale * v;
32795
- l1 += dl;
32796
- l2 += dl;
32797
- vertices[iv2 + 0] = su * sizeX;
32798
- vertices[iv2 + 1] = sv * sizeY;
32799
- vertices[iv2 + 2] = 0;
32800
- vertices[iv2 + 3] = 0;
32801
- distances[iv1 + 0] = fdistance;
32802
- distances[iv1 + 1] = fdistance;
32803
- clippings[iv1 + 0] = scale;
32804
- clippings[iv1 + 1] = 0;
32805
- lengths[iv1 + 0] = l1;
32806
- lengths[iv1 + 1] = l2;
32807
- uvs[iv2 + 0] = 0.5 * (su + 1);
32808
- uvs[iv2 + 1] = 0.5 * (sv + 1);
32809
- uvs[iv2 + 2] = 0.5;
32810
- uvs[iv2 + 3] = 0.5;
32811
- indices[ii + 0] = iv1 - 2;
32812
- indices[ii + 1] = iv1;
32813
- indices[ii + 2] = iv1 + 1;
32814
- iv1 += 2;
32815
- 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;
32816
32791
  ii += 3;
32817
32792
  }
32818
32793
  // Degenerate triangles keep the buffer sizes consistent with elongated circles.
32819
- this.pad(iv1, ii, nv, ni, fdistance);
32794
+ this.pad(iv, ii, nv, ni, fdistance);
32820
32795
  };
32821
32796
  /**
32822
32797
  * Precondition: sizeX !== 0 && sizeY !== 0 && abs(sizeY) < abs(sizeX)
@@ -32831,8 +32806,10 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32831
32806
  var dangle = (2 * Math.PI) / n;
32832
32807
  var c = Math.cos(dangle);
32833
32808
  var s = Math.sin(dangle);
32834
- var fx = sizeX / sizeY;
32835
- var fy = sizeY / sizeX;
32809
+ var fx = 1 / sizeX;
32810
+ var fy = 1 / sizeY;
32811
+ var fxy = sizeX * fy;
32812
+ var fyx = sizeY * fx;
32836
32813
  var ileft = n >> 2;
32837
32814
  var iright = ileft * 3;
32838
32815
  var ppx = sizeX * s;
@@ -32841,20 +32818,12 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32841
32818
  var py = sizeY;
32842
32819
  var nx = -sizeX * s;
32843
32820
  var ny = sizeY * c;
32844
- var nnx = nx * c - ny * fx * s;
32845
- var nny = nx * fy * s + ny * c;
32821
+ var nnx = nx * c - ny * fxy * s;
32822
+ var nny = nx * fyx * s + ny * c;
32846
32823
  var sx = this.toSkeletonX(ppx, ppy, px, py, nx, ny);
32847
- vertices[0] = 0;
32848
- vertices[1] = sizeY;
32849
- clippings[0] = -1;
32850
- distances[0] = sx;
32851
- lengths[0] = 0;
32852
- uvs[0] = 0.5;
32853
- uvs[1] = 1;
32854
- var iv = 1;
32824
+ var iv = 0;
32855
32825
  var ii = 0;
32856
- var length = 0;
32857
- var current = 0;
32826
+ var l = 0;
32858
32827
  var maxDistance = 0;
32859
32828
  for (var i = 0; i < n; ++i) {
32860
32829
  var inext = (i + 1) % n;
@@ -32870,59 +32839,38 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32870
32839
  var dy = ny - py;
32871
32840
  var dl = Math.sqrt(dx * dx + dy * dy);
32872
32841
  var fl = 1 / dl;
32873
- var nlength = length + dl;
32874
- var iv1 = iv++;
32875
- var iv2 = iv1 << 1;
32876
- var niv1 = iv++;
32877
- var niv2 = niv1 << 1;
32878
- var ndistance = Math.abs(-dx * py - dy * (nsx - px)) * fl;
32879
- maxDistance = Math.max(maxDistance, ndistance);
32880
- vertices[iv2 + 0] = nx;
32881
- vertices[iv2 + 1] = ny;
32882
- clippings[iv1] = -1 - ndistance;
32883
- distances[iv1] = nsx;
32884
- lengths[iv1] = nlength;
32885
- uvs[iv2 + 0] = 0.5 * (nx / sizeX + 1);
32886
- uvs[iv2 + 1] = 0.5 * (ny / sizeY + 1);
32887
- vertices[niv2 + 0] = nsx;
32888
- vertices[niv2 + 1] = 0;
32889
- clippings[niv1] = ndistance;
32890
- distances[niv1] = 0;
32891
- lengths[niv1] = length + ((nsx - px) * dx - py * dy) * fl;
32892
- uvs[niv2] = 0.5 * (nsx / sizeX + 1);
32893
- uvs[niv2 + 1] = 0.5;
32894
- indices[ii++] = current;
32895
- indices[ii++] = iv1;
32896
- indices[ii++] = niv1;
32897
- distances[current] = sx;
32898
- if (sx === nsx) {
32899
- clippings[current] = -1 - ndistance;
32900
- }
32901
- else {
32902
- var mdistance = Math.abs(-dx * py - dy * (sx - px)) * fl;
32903
- maxDistance = Math.max(maxDistance, mdistance);
32904
- clippings[current] = -1 - mdistance;
32905
- var miv1 = iv++;
32906
- var miv2 = miv1 << 1;
32907
- vertices[miv2] = sx;
32908
- vertices[miv2 + 1] = 0;
32909
- clippings[miv1] = mdistance;
32910
- distances[miv1] = 0;
32911
- lengths[miv1] = length + ((sx - px) * dx - py * dy) * fl;
32912
- uvs[miv2] = 0.5 * (sx / sizeX + 1);
32913
- uvs[miv2 + 1] = 0.5;
32914
- indices[ii++] = current;
32915
- indices[ii++] = niv1;
32916
- indices[ii++] = miv1;
32917
- }
32918
- current = iv1;
32919
- 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;
32920
32868
  px = nx;
32921
32869
  py = ny;
32922
32870
  nx = nnx;
32923
32871
  ny = nny;
32924
- nnx = c * nx - s * ny * fx;
32925
- nny = s * nx * fy + c * ny;
32872
+ nnx = c * nx - s * ny * fxy;
32873
+ nny = s * nx * fyx + c * ny;
32926
32874
  sx = nsx;
32927
32875
  }
32928
32876
  var fdistance = 0;
@@ -32930,6 +32878,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32930
32878
  fdistance = 1 / maxDistance;
32931
32879
  }
32932
32880
  var shift = (scale - 1) * maxDistance;
32881
+ var lengthShifts = this._lengthShifts;
32933
32882
  for (var i = 0; i < iv; ++i) {
32934
32883
  var clipping = clippings[i];
32935
32884
  if (0 <= clipping) {
@@ -32942,6 +32891,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32942
32891
  var factor = shift / distance;
32943
32892
  var x = vertices[i2] + (vertices[i2] - distances[i]) * factor;
32944
32893
  var y = vertices[i2 + 1] * (1 + factor);
32894
+ lengths[i] += factor * lengthShifts[i];
32945
32895
  vertices[i2] = x;
32946
32896
  vertices[i2 + 1] = y;
32947
32897
  uvs[i2] = 0.5 * (x / sizeX + 1);
@@ -32978,8 +32928,10 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32978
32928
  var dangle = (2 * Math.PI) / n;
32979
32929
  var c = Math.cos(dangle);
32980
32930
  var s = Math.sin(dangle);
32981
- var fx = sizeX / sizeY;
32982
- var fy = sizeY / sizeX;
32931
+ var fx = 1 / sizeX;
32932
+ var fy = 1 / sizeY;
32933
+ var fxy = sizeX * fy;
32934
+ var fyx = sizeY * fx;
32983
32935
  var itop = 0;
32984
32936
  var ibottom = n >> 1;
32985
32937
  var ppx = sizeX * s;
@@ -32990,20 +32942,12 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
32990
32942
  var py = sizeY;
32991
32943
  var nx = -sizeX * s;
32992
32944
  var ny = sizeY * c;
32993
- var nnx = c * nx - s * ny * fx;
32994
- var nny = s * nx * fy + c * ny;
32945
+ var nnx = c * nx - s * ny * fxy;
32946
+ var nny = s * nx * fyx + c * ny;
32995
32947
  var sy = this.toSkeletonY(pppx, pppy, ppx, ppy, px, py);
32996
- vertices[0] = 0;
32997
- vertices[1] = sizeY;
32998
- clippings[0] = -1;
32999
- distances[0] = sy;
33000
- lengths[0] = 0;
33001
- uvs[0] = 0.5;
33002
- uvs[1] = 1;
33003
- var iv = 1;
32948
+ var iv = 0;
33004
32949
  var ii = 0;
33005
- var length = 0;
33006
- var current = 0;
32950
+ var l = 0;
33007
32951
  var maxDistance = 0;
33008
32952
  for (var i = 0; i < n; ++i) {
33009
32953
  var inext = (i + 1) % n;
@@ -33019,59 +32963,38 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33019
32963
  var dy = ny - py;
33020
32964
  var dl = Math.sqrt(dx * dx + dy * dy);
33021
32965
  var fl = 1 / dl;
33022
- var nlength = length + dl;
33023
- var iv1 = iv++;
33024
- var iv2 = iv1 << 1;
33025
- var niv1 = iv++;
33026
- var niv2 = niv1 << 1;
33027
- var ndistance = Math.abs(dx * (nsy - py) + dy * px) * fl;
33028
- maxDistance = Math.max(maxDistance, ndistance);
33029
- vertices[iv2 + 0] = nx;
33030
- vertices[iv2 + 1] = ny;
33031
- clippings[iv1] = -1 - ndistance;
33032
- distances[iv1] = nsy;
33033
- lengths[iv1] = nlength;
33034
- uvs[iv2 + 0] = 0.5 * (nx / sizeX + 1);
33035
- uvs[iv2 + 1] = 0.5 * (ny / sizeY + 1);
33036
- vertices[niv2] = 0;
33037
- vertices[niv2 + 1] = nsy;
33038
- clippings[niv1] = ndistance;
33039
- distances[niv1] = 0;
33040
- lengths[niv1] = length + (-px * dx + (nsy - py) * dy) * fl;
33041
- uvs[niv2] = 0.5;
33042
- uvs[niv2 + 1] = 0.5 * (nsy / sizeY + 1);
33043
- indices[ii++] = current;
33044
- indices[ii++] = iv1;
33045
- indices[ii++] = niv1;
33046
- distances[current] = sy;
33047
- if (sy === nsy) {
33048
- clippings[current] = -1 - ndistance;
33049
- }
33050
- else {
33051
- var mdistance = Math.abs(dx * (sy - py) + dy * px) * fl;
33052
- maxDistance = Math.max(maxDistance, mdistance);
33053
- clippings[current] = -1 - mdistance;
33054
- var miv1 = iv++;
33055
- var miv2 = miv1 << 1;
33056
- vertices[miv2] = 0;
33057
- vertices[miv2 + 1] = sy;
33058
- clippings[miv1] = mdistance;
33059
- distances[miv1] = 0;
33060
- lengths[miv1] = length + (-px * dx + (sy - py) * dy) * fl;
33061
- uvs[miv2] = 0.5;
33062
- uvs[miv2 + 1] = 0.5 * (sy / sizeY + 1);
33063
- indices[ii++] = current;
33064
- indices[ii++] = niv1;
33065
- indices[ii++] = miv1;
33066
- }
33067
- current = iv1;
33068
- 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;
33069
32992
  px = nx;
33070
32993
  py = ny;
33071
32994
  nx = nnx;
33072
32995
  ny = nny;
33073
- nnx = c * nx - s * ny * fx;
33074
- nny = s * nx * fy + c * ny;
32996
+ nnx = c * nx - s * ny * fxy;
32997
+ nny = s * nx * fyx + c * ny;
33075
32998
  sy = nsy;
33076
32999
  }
33077
33000
  var fdistance = 0;
@@ -33079,6 +33002,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33079
33002
  fdistance = 1 / maxDistance;
33080
33003
  }
33081
33004
  var shift = (scale - 1) * maxDistance;
33005
+ var lengthShifts = this._lengthShifts;
33082
33006
  for (var i = 0; i < iv; ++i) {
33083
33007
  var clipping = clippings[i];
33084
33008
  if (0 <= clipping) {
@@ -33091,6 +33015,7 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33091
33015
  var factor = shift / distance;
33092
33016
  var x = vertices[i2] * (1 + factor);
33093
33017
  var y = vertices[i2 + 1] + (vertices[i2 + 1] - distances[i]) * factor;
33018
+ lengths[i] += factor * lengthShifts[i];
33094
33019
  vertices[i2] = x;
33095
33020
  vertices[i2 + 1] = y;
33096
33021
  uvs[i2] = 0.5 * (x / sizeX + 1);
@@ -33114,6 +33039,17 @@ var EShapeCircleTriangulatedImpl = /** @class */ (function () {
33114
33039
  var by = pdy * fp + ndy * fn;
33115
33040
  return py - (px * by) / bx;
33116
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
+ };
33117
33053
  return EShapeCircleTriangulatedImpl;
33118
33054
  }());
33119
33055
 
@@ -63352,7 +63288,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
63352
63288
  boundary[3] = +ay;
63353
63289
  // # of vertices and # of indices
63354
63290
  var n = this._n >> 2;
63355
- var nv = 8 * n + 18;
63291
+ var nv = 12 * n + 10;
63356
63292
  var ni = 4 * n + 10;
63357
63293
  this._nvertices = nv;
63358
63294
  this._nindices = ni;
@@ -63982,7 +63918,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
63982
63918
  * Preconditions:
63983
63919
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
63984
63920
  * * ay <= ax
63985
- * * 5 * N + 5 <= nv
63921
+ * * 6 * N + 3 <= nv
63986
63922
  * * 4 * N + 1 <= ni
63987
63923
  */
63988
63924
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -63993,7 +63929,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
63993
63929
  * Preconditions:
63994
63930
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
63995
63931
  * * ax < ay
63996
- * * 5 * N + 5 <= nv
63932
+ * * 6 * N + 3 <= nv
63997
63933
  * * 4 * N + 1 <= ni
63998
63934
  */
63999
63935
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64125,7 +64061,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64125
64061
  if (ctr) {
64126
64062
  var lo = lot + 2 * ax - r;
64127
64063
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64128
- iv += 2 * n - 1;
64064
+ iv += 3 * (n - 1);
64129
64065
  ii += 3 * (n - 1);
64130
64066
  }
64131
64067
  this.pad(iv, ii, nv, ni, fd);
@@ -64134,7 +64070,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64134
64070
  * Preconditions:
64135
64071
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
64136
64072
  * * ay <= ax
64137
- * * 5 * N + 5 <= nv
64073
+ * * 6 * N + 3 <= nv
64138
64074
  * * 4 * N + 1 <= ni
64139
64075
  */
64140
64076
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64145,7 +64081,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64145
64081
  * Preconditions:
64146
64082
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
64147
64083
  * * ax < ay
64148
- * * 5 * N + 5 <= nv
64084
+ * * 6 * N + 3 <= nv
64149
64085
  * * 4 * N + 1 <= ni
64150
64086
  */
64151
64087
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64279,7 +64215,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64279
64215
  if (cbl) {
64280
64216
  var lo = lob + 2 * ax - r;
64281
64217
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64282
- iv += 2 * n - 1;
64218
+ iv += 3 * (n - 1);
64283
64219
  ii += 3 * (n - 1);
64284
64220
  }
64285
64221
  this.pad(iv, ii, nv, ni, fd);
@@ -64296,7 +64232,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64296
64232
  * Preconditions:
64297
64233
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
64298
64234
  * * ay <= ax
64299
- * * 5 * N + 5 <= nv
64235
+ * * 6 * N + 3 <= nv
64300
64236
  * * 4 * N + 1 <= ni
64301
64237
  */
64302
64238
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64307,7 +64243,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64307
64243
  * Preconditions:
64308
64244
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
64309
64245
  * * ax < ay
64310
- * * 5 * N + 5 <= nv
64246
+ * * 6 * N + 3 <= nv
64311
64247
  * * 4 * N + 1 <= ni
64312
64248
  */
64313
64249
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64453,7 +64389,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64453
64389
  if (ctl) {
64454
64390
  var lo = lol + 2 * ay - r;
64455
64391
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64456
- iv += 2 * n - 1;
64392
+ iv += 3 * (n - 1);
64457
64393
  ii += 3 * (n - 1);
64458
64394
  }
64459
64395
  this.pad(iv, ii, nv, ni, fd);
@@ -64462,7 +64398,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64462
64398
  * Preconditions:
64463
64399
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
64464
64400
  * * ay <= ax
64465
- * * 5 * N + 5 <= nv
64401
+ * * 6 * N + 3 <= nv
64466
64402
  * * 4 * N + 1 <= ni
64467
64403
  */
64468
64404
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64473,7 +64409,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64473
64409
  * Preconditions:
64474
64410
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
64475
64411
  * * ax < ay
64476
- * * 5 * N + 5 <= nv
64412
+ * * 6 * N + 3 <= nv
64477
64413
  * * 4 * N + 1 <= ni
64478
64414
  */
64479
64415
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64616,7 +64552,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64616
64552
  if (cbr) {
64617
64553
  var lo = lor + 2 * ay - r;
64618
64554
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64619
- iv += 2 * n - 1;
64555
+ iv += 3 * (n - 1);
64620
64556
  ii += 3 * (n - 1);
64621
64557
  }
64622
64558
  this.pad(iv, ii, nv, ni, fd);
@@ -64625,7 +64561,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64625
64561
  * Preconditions:
64626
64562
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
64627
64563
  * * ay <= ax
64628
- * * 6 * N + 12 <= nv
64564
+ * * 8 * N + 8 <= nv
64629
64565
  * * 4 * N + 6 <= ni
64630
64566
  */
64631
64567
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64668,13 +64604,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64668
64604
  if (cbl) {
64669
64605
  var lo = lob + 2 * ax - r;
64670
64606
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64671
- iv += 2 * n - 1;
64607
+ iv += 3 * (n - 1);
64672
64608
  ii += 3 * (n - 1);
64673
64609
  }
64674
64610
  if (cbr) {
64675
64611
  var lo = lor + 2 * ay - r;
64676
64612
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64677
- iv += 2 * n - 1;
64613
+ iv += 3 * (n - 1);
64678
64614
  ii += 3 * (n - 1);
64679
64615
  }
64680
64616
  this.pad(iv, ii, nv, ni, fd);
@@ -64683,7 +64619,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64683
64619
  * Preconditions:
64684
64620
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
64685
64621
  * * ax < ay
64686
- * * 6 * N + 12 <= nv
64622
+ * * 8 * N + 8 <= nv
64687
64623
  * * 4 * N + 6 <= ni
64688
64624
  */
64689
64625
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64724,13 +64660,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64724
64660
  if (cbl) {
64725
64661
  var lo = lob + 2 * ax - r;
64726
64662
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64727
- iv += 2 * n - 1;
64663
+ iv += 3 * (n - 1);
64728
64664
  ii += 3 * (n - 1);
64729
64665
  }
64730
64666
  if (cbr) {
64731
64667
  var lo = lor + 2 * ay - r;
64732
64668
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64733
- iv += 2 * n - 1;
64669
+ iv += 3 * (n - 1);
64734
64670
  ii += 3 * (n - 1);
64735
64671
  }
64736
64672
  this.pad(iv, ii, nv, ni, fd);
@@ -64808,7 +64744,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64808
64744
  * Preconditions:
64809
64745
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
64810
64746
  * * ay <= ax
64811
- * * 6 * N + 12 <= nv
64747
+ * * 8 * N + 8 <= nv
64812
64748
  * * 4 * N + 6 <= ni
64813
64749
  */
64814
64750
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64857,13 +64793,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64857
64793
  if (ctl) {
64858
64794
  var lo = lol + 2 * ay - r;
64859
64795
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64860
- iv += 2 * n - 1;
64796
+ iv += 3 * (n - 1);
64861
64797
  ii += 3 * (n - 1);
64862
64798
  }
64863
64799
  if (ctr) {
64864
64800
  var lo = lot + 2 * ax - r;
64865
64801
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64866
- iv += 2 * n - 1;
64802
+ iv += 3 * (n - 1);
64867
64803
  ii += 3 * (n - 1);
64868
64804
  }
64869
64805
  this.pad(iv, ii, nv, ni, fd);
@@ -64872,7 +64808,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64872
64808
  * Preconditions:
64873
64809
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
64874
64810
  * * ax < ay
64875
- * * 6 * N + 12 <= nv
64811
+ * * 8 * N + 8 <= nv
64876
64812
  * * 4 * N + 6 <= ni
64877
64813
  */
64878
64814
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -64920,13 +64856,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
64920
64856
  if (ctl) {
64921
64857
  var lo = lol + 2 * ay - r;
64922
64858
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64923
- iv += 2 * n - 1;
64859
+ iv += 3 * (n - 1);
64924
64860
  ii += 3 * (n - 1);
64925
64861
  }
64926
64862
  if (ctr) {
64927
64863
  var lo = lot + 2 * ax - r;
64928
64864
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
64929
- iv += 2 * n - 1;
64865
+ iv += 3 * (n - 1);
64930
64866
  ii += 3 * (n - 1);
64931
64867
  }
64932
64868
  this.pad(iv, ii, nv, ni, fd);
@@ -65001,7 +64937,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65001
64937
  * Preconditions:
65002
64938
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
65003
64939
  * * ay <= ax
65004
- * * 6 * N + 12 <= nv
64940
+ * * 8 * N + 8 <= nv
65005
64941
  * * 4 * N + 6 <= ni
65006
64942
  */
65007
64943
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65048,13 +64984,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65048
64984
  if (ctr) {
65049
64985
  var lo = lot + 2 * ax - r;
65050
64986
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65051
- iv += 2 * n - 1;
64987
+ iv += 3 * (n - 1);
65052
64988
  ii += 3 * (n - 1);
65053
64989
  }
65054
64990
  if (cbr) {
65055
64991
  var lo = lor + 2 * ay - r;
65056
64992
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65057
- iv += 2 * n - 1;
64993
+ iv += 3 * (n - 1);
65058
64994
  ii += 3 * (n - 1);
65059
64995
  }
65060
64996
  this.pad(iv, ii, nv, ni, fd);
@@ -65063,7 +64999,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65063
64999
  * Preconditions:
65064
65000
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
65065
65001
  * * ax < ay
65066
- * * 6 * N + 12 <= nv
65002
+ * * 8 * N + 8 <= nv
65067
65003
  * * 4 * N + 6 <= ni
65068
65004
  */
65069
65005
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65111,13 +65047,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65111
65047
  if (ctr) {
65112
65048
  var lo = lot + 2 * ax - r;
65113
65049
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65114
- iv += 2 * n - 1;
65050
+ iv += 3 * (n - 1);
65115
65051
  ii += 3 * (n - 1);
65116
65052
  }
65117
65053
  if (cbr) {
65118
65054
  var lo = lor + 2 * ay - r;
65119
65055
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65120
- iv += 2 * n - 1;
65056
+ iv += 3 * (n - 1);
65121
65057
  ii += 3 * (n - 1);
65122
65058
  }
65123
65059
  this.pad(iv, ii, nv, ni, fd);
@@ -65192,7 +65128,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65192
65128
  * Preconditions:
65193
65129
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
65194
65130
  * * ay <= ax
65195
- * * 6 * N + 12 <= nv
65131
+ * * 8 * N + 8 <= nv
65196
65132
  * * 4 * N + 6 <= ni
65197
65133
  */
65198
65134
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65233,13 +65169,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65233
65169
  if (ctl) {
65234
65170
  var lo = lol + 2 * ay - r;
65235
65171
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65236
- iv += 2 * n - 1;
65172
+ iv += 3 * (n - 1);
65237
65173
  ii += 3 * (n - 1);
65238
65174
  }
65239
65175
  if (cbl) {
65240
65176
  var lo = lob + 2 * ax - r;
65241
65177
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65242
- iv += 2 * n - 1;
65178
+ iv += 3 * (n - 1);
65243
65179
  ii += 3 * (n - 1);
65244
65180
  }
65245
65181
  this.pad(iv, ii, nv, ni, fd);
@@ -65248,7 +65184,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65248
65184
  * Preconditions:
65249
65185
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
65250
65186
  * * ax < ay
65251
- * * 6 * N + 12 <= nv
65187
+ * * 8 * N + 8 <= nv
65252
65188
  * * 4 * N + 6 <= ni
65253
65189
  */
65254
65190
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65290,13 +65226,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65290
65226
  if (ctl) {
65291
65227
  var lo = lol + 2 * ay - r;
65292
65228
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65293
- iv += 2 * n - 1;
65229
+ iv += 3 * (n - 1);
65294
65230
  ii += 3 * (n - 1);
65295
65231
  }
65296
65232
  if (cbl) {
65297
65233
  var lo = lob + 2 * ax - r;
65298
65234
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
65299
- iv += 2 * n - 1;
65235
+ iv += 3 * (n - 1);
65300
65236
  ii += 3 * (n - 1);
65301
65237
  }
65302
65238
  this.pad(iv, ii, nv, ni, fd);
@@ -65371,7 +65307,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65371
65307
  * Preconditions:
65372
65308
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
65373
65309
  * * ay <= ax
65374
- * * 8 * N + 18 <= nv
65310
+ * * 12 * N + 10 <= nv
65375
65311
  * * 4 * N + 10 <= ni
65376
65312
  */
65377
65313
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65416,10 +65352,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65416
65352
  iv += 5;
65417
65353
  ii += 9;
65418
65354
  var rs = r + fs;
65419
- var l = 2 * ax + lot;
65355
+ var l = 2 * ax + lot - r;
65420
65356
  if (ctr) {
65421
65357
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65422
- iv += 2 * n - 1;
65358
+ iv += 3 * (n - 1);
65423
65359
  ii += 3 * (n - 1);
65424
65360
  l += 2 * ay + lc;
65425
65361
  }
@@ -65428,7 +65364,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65428
65364
  }
65429
65365
  if (cbr) {
65430
65366
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65431
- iv += 2 * n - 1;
65367
+ iv += 3 * (n - 1);
65432
65368
  ii += 3 * (n - 1);
65433
65369
  l += 2 * ax + lc;
65434
65370
  }
@@ -65437,7 +65373,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65437
65373
  }
65438
65374
  if (cbl) {
65439
65375
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65440
- iv += 2 * n - 1;
65376
+ iv += 3 * (n - 1);
65441
65377
  ii += 3 * (n - 1);
65442
65378
  l += 2 * ay + lc;
65443
65379
  }
@@ -65446,7 +65382,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65446
65382
  }
65447
65383
  if (ctl) {
65448
65384
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65449
- iv += 2 * n - 1;
65385
+ iv += 3 * (n - 1);
65450
65386
  ii += 3 * (n - 1);
65451
65387
  }
65452
65388
  this.pad(iv, ii, nv, ni, fd);
@@ -65455,7 +65391,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65455
65391
  * Preconditions:
65456
65392
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
65457
65393
  * * ax < ay
65458
- * * 8 * N + 18 <= nv
65394
+ * * 12 * N + 10 <= nv
65459
65395
  * * 4 * N + 10 <= ni
65460
65396
  */
65461
65397
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -65500,10 +65436,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65500
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);
65501
65437
  iv += 6;
65502
65438
  ii += 12;
65503
- var l = 2 * ax + lot;
65439
+ var l = 2 * ax + lot - r;
65504
65440
  if (ctr) {
65505
65441
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65506
- iv += 1 + 2 * (n - 1);
65442
+ iv += 3 * (n - 1);
65507
65443
  ii += 3 * (n - 1);
65508
65444
  l += 2 * ay + lc;
65509
65445
  }
@@ -65512,7 +65448,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65512
65448
  }
65513
65449
  if (cbr) {
65514
65450
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65515
- iv += 1 + 2 * (n - 1);
65451
+ iv += 3 * (n - 1);
65516
65452
  ii += 3 * (n - 1);
65517
65453
  l += 2 * ax + lc;
65518
65454
  }
@@ -65521,7 +65457,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65521
65457
  }
65522
65458
  if (cbl) {
65523
65459
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
65524
- iv += 1 + 2 * (n - 1);
65460
+ iv += 3 * (n - 1);
65525
65461
  ii += 3 * (n - 1);
65526
65462
  l += 2 * ay + lc;
65527
65463
  }
@@ -65530,7 +65466,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65530
65466
  }
65531
65467
  if (ctl) {
65532
65468
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
65533
- iv += 1 + 2 * (n - 1);
65469
+ iv += 3 * (n - 1);
65534
65470
  ii += 3 * (n - 1);
65535
65471
  }
65536
65472
  this.pad(iv, ii, nv, ni, fd);
@@ -65803,29 +65739,27 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
65803
65739
  var dangle = (Math.PI * 0.5) / (n - 1);
65804
65740
  var c = Math.cos(dangle);
65805
65741
  var s = Math.sin(dangle);
65806
- 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;
65807
65747
  var dx = rs * cos0;
65808
65748
  var dy = rs * sin0;
65809
- var iv0 = iv++;
65810
65749
  var l = lo;
65811
- this.writeVertex(iv0, cx + dx, cy + dy, fd, lo, scale, fx, fy);
65812
- var indices = this._indices;
65813
- var cc = 1 - r * fd;
65814
65750
  for (var i = 0; i < n - 1; ++i) {
65815
- var iv1 = iv++;
65816
- l += dl;
65817
- this.writeVertex(iv1, cx, cy, fd, l, cc, fx, fy);
65818
- var iv2 = iv++;
65819
- l += dl;
65820
65751
  var ndx = c * dx - s * dy;
65821
65752
  var ndy = s * dx + c * dy;
65822
- 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;
65823
65761
  dx = ndx;
65824
65762
  dy = ndy;
65825
- indices[ii++] = iv1;
65826
- indices[ii++] = iv0;
65827
- indices[ii++] = iv2;
65828
- iv0 = iv2;
65829
65763
  }
65830
65764
  };
65831
65765
  EShapeRectangleRoundedTriangulatedImpl.prototype.writeVertexTop = function (vertex, x, y, lengthOffset, fdistance, scale, fx, fy, ax, ay) {
@@ -67471,6 +67405,10 @@ var BuilderLine = /** @class */ (function (_super) {
67471
67405
  return BuilderLine;
67472
67406
  }(BuilderBase));
67473
67407
 
67408
+ /*
67409
+ * Copyright (C) 2019 Toshiba Corporation
67410
+ * SPDX-License-Identifier: Apache-2.0
67411
+ */
67474
67412
  var TRIANGLE_LEGACY_VERTEX_COUNT = 7;
67475
67413
  var TRIANGLE_LEGACY_INDEX_COUNT = 3;
67476
67414
  var TRIANGLE_LEGACY_WORLD_SIZE = [0, 0, 0];
@@ -67948,6 +67886,10 @@ var BuilderNull = /** @class */ (function () {
67948
67886
  return BuilderNull;
67949
67887
  }());
67950
67888
 
67889
+ /*
67890
+ * Copyright (C) 2019 Toshiba Corporation
67891
+ * SPDX-License-Identifier: Apache-2.0
67892
+ */
67951
67893
  var RECTANGLE_LEGACY_VERTEX_COUNT = 16;
67952
67894
  var RECTANGLE_LEGACY_INDEX_COUNT = 8;
67953
67895
  var RECTANGLE_LEGACY_WORLD_SIZE = [0, 0];
@@ -72744,12 +72686,15 @@ var loadShapeLineOfCircles = function () {
72744
72686
  EShapeDeserializers[EShapeType.LINE_OF_CIRCLES] = deserializeLineOfCircles;
72745
72687
  };
72746
72688
 
72689
+ /*
72690
+ * Copyright (C) 2019 Toshiba Corporation
72691
+ * SPDX-License-Identifier: Apache-2.0
72692
+ */
72747
72693
  var RECTANGLE_ROUNDED_LEGACY_VERTEX_COUNT = 44;
72748
72694
  var RECTANGLE_ROUNDED_LEGACY_INDEX_COUNT = 24;
72749
72695
  var RECTANGLE_ROUNDED_LEGACY_WORLD_SIZE = [
72750
72696
  0, 0, 0, 0, 0
72751
72697
  ];
72752
- var RECTANGLE_ROUNDED_LEGACY_WORK_POINT = new pixi_js.Point();
72753
72698
  var buildRectangleRoundedLegacyIndex = function (indices, voffset, ioffset) {
72754
72699
  // c0 c1 c4 c5
72755
72700
  // |---| |---|
@@ -72863,22 +72808,21 @@ var buildRectangleRoundedLegacyVertex = function (vertices, voffset, originX, or
72863
72808
  var sy = sizeY * 0.5 + (0 <= sizeY ? +s : -s);
72864
72809
  var ax = Math.abs(sx);
72865
72810
  var ay = Math.abs(sy);
72866
- var a = radius * Math.min(ax, ay);
72867
- var rx = a / ax;
72868
- var ry = a / ay;
72869
- var work = RECTANGLE_ROUNDED_LEGACY_WORK_POINT;
72870
- work.set(originX - sx, originY - sy);
72871
- internalTransform.apply(work, work);
72872
- var b0x = work.x;
72873
- var b0y = work.y;
72874
- work.set(originX, originY - sy);
72875
- internalTransform.apply(work, work);
72876
- var b1x = work.x;
72877
- var b1y = work.y;
72878
- work.set(originX - sx, originY);
72879
- internalTransform.apply(work, work);
72880
- var b3x = work.x;
72881
- 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;
72882
72826
  var d01x = b1x - b0x;
72883
72827
  var d01y = b1y - b0y;
72884
72828
  var d03x = b3x - b0x;
@@ -73104,7 +73048,7 @@ var buildRectangleRoundedLegacyVertex = function (vertices, voffset, originX, or
73104
73048
  // World size
73105
73049
  worldSize[0] = ax;
73106
73050
  worldSize[1] = ay;
73107
- worldSize[2] = a;
73051
+ worldSize[2] = az;
73108
73052
  worldSize[3] = rx;
73109
73053
  worldSize[4] = ry;
73110
73054
  };
@@ -74232,13 +74176,16 @@ var loadShapeLineOfRectangles = function () {
74232
74176
  EShapeCapabilities.set(EShapeType.LINE_OF_RECTANGLES, EShapeCapability.PRIMITIVE | EShapeCapability.STROKE_SIDE);
74233
74177
  };
74234
74178
 
74235
- var TRIANGLE_ROUNDED_VERTEX_COUNT = 22;
74236
- var TRIANGLE_ROUNDED_INDEX_COUNT = 15;
74237
- 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 = [
74238
74186
  0, 0, 0, 0, 0
74239
74187
  ];
74240
- var TRIANGLE_ROUNDED_WORK_POINT = new pixi_js.Point();
74241
- var buildTriangleRoundedIndex = function (indices, voffset, ioffset) {
74188
+ var buildTriangleRoundedLegacyIndex = function (indices, voffset, ioffset) {
74242
74189
  // Top corner
74243
74190
  var ii = ioffset * 3 - 1;
74244
74191
  indices[++ii] = voffset + 0;
@@ -74292,7 +74239,7 @@ var buildTriangleRoundedIndex = function (indices, voffset, ioffset) {
74292
74239
  indices[++ii] = voffset + 21;
74293
74240
  indices[++ii] = voffset + 13;
74294
74241
  };
74295
- 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) {
74296
74243
  // Calculate the transformed positions
74297
74244
  var s = strokeAlign * strokeWidth;
74298
74245
  var sx = sizeX * 0.5 + (0 <= sizeX ? +s : -s);
@@ -74302,23 +74249,24 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74302
74249
  var ry = (sw * radius) / (2 * sy);
74303
74250
  var rz = (0.5 * (sz - sw) * radius) / sz;
74304
74251
  var rx = (ry * sz) / (2 * sx);
74305
- var work = TRIANGLE_ROUNDED_WORK_POINT;
74306
- work.set(originX, originY - sy);
74307
- internalTransform.apply(work, work);
74308
- var x1 = work.x;
74309
- var y1 = work.y;
74310
- work.set(originX, originY);
74311
- internalTransform.apply(work, work);
74312
- var tx = work.x;
74313
- var ty = work.y;
74314
- work.set(originX + sx, originY);
74315
- internalTransform.apply(work, work);
74316
- var dx = tx - x1;
74317
- var dy = ty - y1;
74318
- var x4 = work.x + dx;
74319
- var y4 = work.y + dy;
74320
- var x7 = tx + (tx - work.x) + dx;
74321
- 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;
74322
74270
  var dx14 = x4 - x1;
74323
74271
  var dy14 = y4 - y1;
74324
74272
  var x2 = x1 + rz * dx14;
@@ -74337,10 +74285,8 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74337
74285
  var y8 = y7 + ry * dy71;
74338
74286
  var x9 = x1 - rz * dx71;
74339
74287
  var y9 = y1 - rz * dy71;
74340
- work.set(originX, originY + sy - sw); // Incenter of a triangle
74341
- internalTransform.apply(work, work);
74342
- var x0 = work.x;
74343
- var y0 = work.y;
74288
+ var x0 = a * originX + c * (originY + sy - sw) + tx;
74289
+ var y0 = b * originX + d * (originY + sy - sw) + ty;
74344
74290
  var x10 = x1 + radius * (x0 - x1);
74345
74291
  var y10 = y1 + radius * (y0 - y1);
74346
74292
  var x11 = x4 + radius * (x0 - x4);
@@ -74348,8 +74294,8 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74348
74294
  var x12 = x7 + radius * (x0 - x7);
74349
74295
  var y12 = y7 + radius * (y0 - y7);
74350
74296
  // World size
74351
- var xb = tx + dx;
74352
- var yb = ty + dy;
74297
+ var xb = ox + dx;
74298
+ var yb = oy + dy;
74353
74299
  worldSize[0] = toLength(xb, yb, x0, y0);
74354
74300
  worldSize[1] = rx;
74355
74301
  worldSize[2] = ry;
@@ -74406,7 +74352,7 @@ var buildTriangleRoundedVertex = function (vertices, voffset, originX, originY,
74406
74352
  vertices[++iv] = x9;
74407
74353
  vertices[++iv] = y9;
74408
74354
  };
74409
- var buildTriangleRoundedStep = function (steps, voffset, strokeWidth, strokeStyle, corner, radius, worldSize) {
74355
+ var buildTriangleRoundedLegacyStep = function (steps, voffset, strokeWidth, strokeStyle, corner, radius, worldSize) {
74410
74356
  var scaleInvariant = toScaleInvariant(strokeStyle);
74411
74357
  var s = worldSize[0];
74412
74358
  var sr = radius * s;
@@ -74677,7 +74623,7 @@ var buildTriangleRoundedStep = function (steps, voffset, strokeWidth, strokeStyl
74677
74623
  steps[++is] = c10;
74678
74624
  steps[++is] = 0;
74679
74625
  };
74680
- var buildTriangleRoundedUv = function (uvs, voffset, textureUvs, radius, worldSize) {
74626
+ var buildTriangleRoundedLegacyUv = function (uvs, voffset, textureUvs, radius, worldSize) {
74681
74627
  var x0 = textureUvs.x0;
74682
74628
  var x1 = textureUvs.x1;
74683
74629
  var x2 = textureUvs.x2;
@@ -74783,8 +74729,8 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74783
74729
  var ioffset = this.indexOffset;
74784
74730
  var pointCountReserved = this.pointCountReserved;
74785
74731
  if (0 < pointCountReserved) {
74786
- buildTriangleRoundedIndex(buffer.indices, voffset, ioffset);
74787
- 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);
74788
74734
  }
74789
74735
  this.inited |= BuilderFlag.INDEX;
74790
74736
  };
@@ -74793,7 +74739,7 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74793
74739
  if (points instanceof EShapeLineOfAnyPointsImpl) {
74794
74740
  var buffer = this.buffer;
74795
74741
  this.updateVertexStepAndUv(buffer, shape, points);
74796
- this.updateLineOfAnyColor(buffer, shape, points, TRIANGLE_ROUNDED_VERTEX_COUNT);
74742
+ this.updateLineOfAnyColor(buffer, shape, points, TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT);
74797
74743
  }
74798
74744
  };
74799
74745
  BuilderLineOfTriangleRoundeds.prototype.updateVertexStepAndUv = function (buffer, shape, points) {
@@ -74871,17 +74817,17 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74871
74817
  var pointSizeX = pointSize.getX(0);
74872
74818
  var pointSizeY = pointSize.getY(0);
74873
74819
  // Vertices
74874
- buildTriangleRoundedVertex(vertices, voffset, 0, 0, pointSizeX, pointSizeY, strokeAlign, strokeWidth, radius, internalTransform, TRIANGLE_ROUNDED_WORLD_SIZE);
74875
- 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);
74876
74822
  // Steps
74877
74823
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
74878
- buildTriangleRoundedStep(steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74879
- 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);
74880
74826
  }
74881
74827
  // UVs
74882
74828
  if (isNotInited || isVertexChanged || isTextureChanged) {
74883
- buildTriangleRoundedUv(uvs, voffset, textureUvs, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74884
- 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);
74885
74831
  }
74886
74832
  }
74887
74833
  else {
@@ -74891,23 +74837,23 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74891
74837
  var py = pointsValues[ip + 1] + pointOffset.getY(i);
74892
74838
  var pointSizeX = pointSize.getX(i);
74893
74839
  var pointSizeY = pointSize.getY(i);
74894
- var iv = voffset + i * TRIANGLE_ROUNDED_VERTEX_COUNT;
74840
+ var iv = voffset + i * TRIANGLE_ROUNDED_LEGACY_VERTEX_COUNT;
74895
74841
  // Vertices
74896
- 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);
74897
74843
  // Steps
74898
74844
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
74899
- buildTriangleRoundedStep(steps, iv, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74845
+ buildTriangleRoundedLegacyStep(steps, iv, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74900
74846
  }
74901
74847
  // UVs
74902
74848
  if (isNotInited || isVertexChanged || isTextureChanged) {
74903
- buildTriangleRoundedUv(uvs, iv, textureUvs, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
74849
+ buildTriangleRoundedLegacyUv(uvs, iv, textureUvs, radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
74904
74850
  }
74905
74851
  }
74906
74852
  }
74907
74853
  // Fill the rest
74908
74854
  var pointCountReserved = this.pointCountReserved;
74909
- var voffsetReserved = voffset + pointCount * TRIANGLE_ROUNDED_VERTEX_COUNT;
74910
- 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);
74911
74857
  buildNullVertex(vertices, voffsetReserved, vcountReserved);
74912
74858
  buildNullStep(steps, voffsetReserved, vcountReserved);
74913
74859
  buildNullUv(uvs, voffsetReserved, vcountReserved);
@@ -74921,16 +74867,15 @@ var BuilderLineOfTriangleRoundeds = /** @class */ (function (_super) {
74921
74867
  * SPDX-License-Identifier: Apache-2.0
74922
74868
  */
74923
74869
  var createLineOfTriangleRoundedsUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
74924
- 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);
74925
74871
  };
74926
74872
 
74927
74873
  /*
74928
74874
  * Copyright (C) 2019 Toshiba Corporation
74929
74875
  * SPDX-License-Identifier: Apache-2.0
74930
74876
  */
74931
- var containsCorner_ = function (shape, x, y, r, aw, sw, ss) {
74932
- var fill = shape.fill;
74933
- if (fill.enable) {
74877
+ var containsCorner_ = function (x, y, r, aw, sw, ss, filled) {
74878
+ if (filled) {
74934
74879
  if (x * x + y * y <= r * r) {
74935
74880
  return true;
74936
74881
  }
@@ -74948,7 +74893,7 @@ var containsCorner_ = function (shape, x, y, r, aw, sw, ss) {
74948
74893
  }
74949
74894
  return false;
74950
74895
  };
74951
- 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) {
74952
74897
  var xl = x1 + r12 * (x2 - x1) - x0;
74953
74898
  var yl = y1 + r12 * (y2 - y1) - y0;
74954
74899
  var n = Math.sqrt(xl * xl + yl * yl);
@@ -74968,14 +74913,14 @@ var containsCorner = function (shape, x, y, x0, y0, x1, y1, x2, y2, x3, y3, r12,
74968
74913
  var yc = y - y0;
74969
74914
  var dx = (+nry * xc - nrx * yc) * deti;
74970
74915
  var dy = (-nly * xc + nlx * yc) * deti;
74971
- if (containsCorner_(shape, dx, dy, n, aw * radius, sw, ss)) {
74916
+ if (containsCorner_(dx, dy, n, aw * radius, sw, ss, filled)) {
74972
74917
  return true;
74973
74918
  }
74974
74919
  }
74975
74920
  }
74976
74921
  return false;
74977
74922
  };
74978
- var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
74923
+ var hitTestTriangleRoundedImpl = function (shape, x, y, ax, ay, sw, ss, filled) {
74979
74924
  var a = (2 * ay) / ax;
74980
74925
  if (hitTestTriangleFilled(x, y, a, -ay, +ay)) {
74981
74926
  var az = Math.sqrt(ax * ax + 4 * ay * ay);
@@ -75002,7 +74947,7 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75002
74947
  if (!c0 && !c1 && corner & EShapeCorner.TOP) {
75003
74948
  // Top corner
75004
74949
  var rz = (0.5 * (az - aw) * radius) / az;
75005
- 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)) {
75006
74951
  return true;
75007
74952
  }
75008
74953
  }
@@ -75010,7 +74955,7 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75010
74955
  // Bottom-left corner
75011
74956
  var ry = (aw * radius) / (2 * ay);
75012
74957
  var rx = (ry * az) / (2 * ax);
75013
- 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)) {
75014
74959
  return true;
75015
74960
  }
75016
74961
  }
@@ -75018,14 +74963,13 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75018
74963
  // Bottom-right corner
75019
74964
  var ry = (aw * radius) / (2 * ay);
75020
74965
  var rx = (ry * az) / (2 * ax);
75021
- 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)) {
75022
74967
  return true;
75023
74968
  }
75024
74969
  }
75025
74970
  else {
75026
74971
  // Others
75027
- var fill = shape.fill;
75028
- if (fill.enable) {
74972
+ if (filled) {
75029
74973
  return true;
75030
74974
  }
75031
74975
  else {
@@ -75043,27 +74987,88 @@ var hitTestTriangleRounded = function (shape, x, y, ax, ay, sw, ss) {
75043
74987
  }
75044
74988
  return false;
75045
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
+ };
75046
75051
 
75047
75052
  /*
75048
75053
  * Copyright (C) 2019 Toshiba Corporation
75049
75054
  * SPDX-License-Identifier: Apache-2.0
75050
75055
  */
75051
- var EShapeTriangleRounded = /** @class */ (function (_super) {
75052
- __extends(EShapeTriangleRounded, _super);
75053
- function EShapeTriangleRounded(type) {
75054
- 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; }
75055
75060
  return _super.call(this, type) || this;
75056
75061
  }
75057
- EShapeTriangleRounded.prototype.clone = function () {
75058
- return new EShapeTriangleRounded(this.type).copy(this);
75062
+ EShapeTriangleRoundedLegacy.prototype.clone = function () {
75063
+ return new EShapeTriangleRoundedLegacy(this.type).copy(this);
75059
75064
  };
75060
- EShapeTriangleRounded.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
75065
+ EShapeTriangleRoundedLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
75061
75066
  if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
75062
- return hitTestTriangleRounded(this, x, y, ax, ay, sw, ss);
75067
+ return hitTestTriangleRoundedLegacy(this, x, y, ax, ay, sw, ss);
75063
75068
  }
75064
75069
  return false;
75065
75070
  };
75066
- return EShapeTriangleRounded;
75071
+ return EShapeTriangleRoundedLegacy;
75067
75072
  }(EShapePrimitive));
75068
75073
 
75069
75074
  /*
@@ -75110,7 +75115,7 @@ var EShapeLineOfTriangleRoundeds = /** @class */ (function (_super) {
75110
75115
  return false;
75111
75116
  };
75112
75117
  return EShapeLineOfTriangleRoundeds;
75113
- }(EShapeTriangleRounded));
75118
+ }(EShapeTriangleRoundedLegacy));
75114
75119
 
75115
75120
  /*
75116
75121
  * Copyright (C) 2019 Toshiba Corporation
@@ -78295,30 +78300,516 @@ var loadShapeTriangleLegacy = function () {
78295
78300
  EShapeDeserializers[EShapeType.TRIANGLE_LEGACY] = deserializeTriangleLegacy;
78296
78301
  };
78297
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
+
78298
78771
  /*
78299
78772
  * Copyright (C) 2019 Toshiba Corporation
78300
78773
  * SPDX-License-Identifier: Apache-2.0
78301
78774
  */
78302
- var BuilderTriangleRounded = /** @class */ (function (_super) {
78303
- __extends(BuilderTriangleRounded, _super);
78304
- function BuilderTriangleRounded(buffer, vertexOffset, indexOffset) {
78305
- 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;
78306
78797
  _this.radius = 0;
78307
78798
  _this.corner = 0;
78308
78799
  return _this;
78309
78800
  }
78310
- BuilderTriangleRounded.prototype.init = function () {
78801
+ BuilderTriangleRoundedLegacy.prototype.init = function () {
78311
78802
  var buffer = this.buffer;
78312
78803
  buffer.updateIndices();
78313
- buildTriangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
78804
+ buildTriangleRoundedLegacyIndex(buffer.indices, this.vertexOffset, this.indexOffset);
78314
78805
  this.inited |= BuilderFlag.INDEX;
78315
78806
  };
78316
- BuilderTriangleRounded.prototype.update = function (shape) {
78807
+ BuilderTriangleRoundedLegacy.prototype.update = function (shape) {
78317
78808
  var buffer = this.buffer;
78318
78809
  this.updateVertexStepAndUv(buffer, shape);
78319
78810
  this.updateColor(buffer, shape);
78320
78811
  };
78321
- BuilderTriangleRounded.prototype.updateVertexStepAndUv = function (buffer, shape) {
78812
+ BuilderTriangleRoundedLegacy.prototype.updateVertexStepAndUv = function (buffer, shape) {
78322
78813
  var size = shape.size;
78323
78814
  var sizeX = size.x;
78324
78815
  var sizeY = size.y;
@@ -78359,55 +78850,55 @@ var BuilderTriangleRounded = /** @class */ (function (_super) {
78359
78850
  this.textureTransformId = textureTransformId;
78360
78851
  var voffset = this.vertexOffset;
78361
78852
  buffer.updateVertices();
78362
- 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);
78363
78854
  if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
78364
78855
  buffer.updateSteps();
78365
- 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);
78366
78857
  }
78367
78858
  if (isNotInited || isVertexChanged || isTextureChanged) {
78368
78859
  buffer.updateUvs();
78369
- buildTriangleRoundedUv(buffer.uvs, voffset, toTextureUvs(texture), radius, TRIANGLE_ROUNDED_WORLD_SIZE);
78860
+ buildTriangleRoundedLegacyUv(buffer.uvs, voffset, toTextureUvs(texture), radius, TRIANGLE_ROUNDED_LEGACY_WORLD_SIZE);
78370
78861
  }
78371
78862
  }
78372
78863
  };
78373
- return BuilderTriangleRounded;
78864
+ return BuilderTriangleRoundedLegacy;
78374
78865
  }(BuilderBase));
78375
78866
 
78376
78867
  /*
78377
78868
  * Copyright (C) 2019 Toshiba Corporation
78378
78869
  * SPDX-License-Identifier: Apache-2.0
78379
78870
  */
78380
- var createTriangleRoundedUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
78871
+ var createTriangleRoundedLegacyUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
78381
78872
  var tcount = toTextBufferCount(shape);
78382
78873
  var tvcount = tcount << TEXT_VERTEX_COUNT_SHIFT;
78383
78874
  var ticount = tcount << TEXT_INDEX_COUNT_SHIFT;
78384
- var vcount = TRIANGLE_ROUNDED_VERTEX_COUNT + tvcount;
78385
- 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;
78386
78877
  if (buffer.check(voffset, ioffset, vcount, icount)) {
78387
78878
  return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
78388
- new BuilderTriangleRounded(buffer, voffset, ioffset),
78389
- 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)
78390
78881
  ]).init(shape);
78391
78882
  }
78392
78883
  return null;
78393
78884
  };
78394
78885
 
78395
78886
  /*
78396
- * Copyright (C) 2019 Toshiba Corporation
78887
+ * Copyright (C) 2019-2026 Toshiba Corporation
78397
78888
  * SPDX-License-Identifier: Apache-2.0
78398
78889
  */
78399
- var deserializeTriangleRounded = function (item, manager, shape) {
78400
- return deserializeBase(item, manager, shape || new EShapeTriangleRounded());
78890
+ var deserializeTriangleRoundedLegacy = function (item, manager, shape) {
78891
+ return deserializeBase(item, manager, shape || new EShapeTriangleRoundedLegacy());
78401
78892
  };
78402
78893
 
78403
78894
  /*
78404
78895
  * Copyright (C) 2019 Toshiba Corporation
78405
78896
  * SPDX-License-Identifier: Apache-2.0
78406
78897
  */
78407
- var loadShapeTriangleRounded = function () {
78408
- EShapeUploadeds[EShapeType.TRIANGLE_ROUNDED] = createTriangleRoundedUploaded;
78409
- EShapeDeserializers[EShapeType.TRIANGLE_ROUNDED] = deserializeTriangleRounded;
78410
- 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);
78411
78902
  };
78412
78903
 
78413
78904
  /*
@@ -78437,6 +78928,7 @@ var loadShapeAll = function () {
78437
78928
  loadShapeRectangle();
78438
78929
  loadShapeSemicircle();
78439
78930
  loadShapeTriangleLegacy();
78931
+ loadShapeTriangleRoundedLegacy();
78440
78932
  loadShapeTriangleRounded();
78441
78933
  loadShapeTriangle();
78442
78934
  loadShapeLineOfCircles();
@@ -109577,7 +110069,8 @@ exports.BuilderSemicircle = BuilderSemicircle;
109577
110069
  exports.BuilderText = BuilderText;
109578
110070
  exports.BuilderTriangle = BuilderTriangleLegacy;
109579
110071
  exports.BuilderTriangleLegacy = BuilderTriangleLegacy;
109580
- exports.BuilderTriangleRounded = BuilderTriangleRounded;
110072
+ exports.BuilderTriangleRounded = BuilderTriangleRoundedLegacy;
110073
+ exports.BuilderTriangleRoundedLegacy = BuilderTriangleRoundedLegacy;
109581
110074
  exports.CIRCLE_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
109582
110075
  exports.CIRCLE_LEGACY_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
109583
110076
  exports.CIRCLE_LEGACY_VERTEX_COUNT = CIRCLE_LEGACY_VERTEX_COUNT;
@@ -110933,6 +111426,8 @@ exports.EShapeTransformImpl = EShapeTransformImpl;
110933
111426
  exports.EShapeTriangle = EShapeTriangle;
110934
111427
  exports.EShapeTriangleLegacy = EShapeTriangleLegacy;
110935
111428
  exports.EShapeTriangleRounded = EShapeTriangleRounded;
111429
+ exports.EShapeTriangleRoundedLegacy = EShapeTriangleRoundedLegacy;
111430
+ exports.EShapeTriangleRoundedTriangulatedImpl = EShapeTriangleRoundedTriangulatedImpl;
110936
111431
  exports.EShapeTriangleTriangulatedImpl = EShapeTriangleTriangulatedImpl;
110937
111432
  exports.EShapeType = EShapeType;
110938
111433
  exports.EShapeUploadedImpl = EShapeUploadedImpl;
@@ -111018,9 +111513,12 @@ exports.TRIANGLE_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
111018
111513
  exports.TRIANGLE_LEGACY_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
111019
111514
  exports.TRIANGLE_LEGACY_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
111020
111515
  exports.TRIANGLE_LEGACY_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
111021
- exports.TRIANGLE_ROUNDED_INDEX_COUNT = TRIANGLE_ROUNDED_INDEX_COUNT;
111022
- exports.TRIANGLE_ROUNDED_VERTEX_COUNT = TRIANGLE_ROUNDED_VERTEX_COUNT;
111023
- 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;
111024
111522
  exports.TRIANGLE_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
111025
111523
  exports.TRIANGLE_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
111026
111524
  exports.UtilAlpha = UtilAlpha;
@@ -111127,10 +111625,14 @@ exports.buildTriangleLegacyIndex = buildTriangleLegacyIndex;
111127
111625
  exports.buildTriangleLegacyStep = buildTriangleLegacyStep;
111128
111626
  exports.buildTriangleLegacyUv = buildTriangleLegacyUv;
111129
111627
  exports.buildTriangleLegacyVertex = buildTriangleLegacyVertex;
111130
- exports.buildTriangleRoundedIndex = buildTriangleRoundedIndex;
111131
- exports.buildTriangleRoundedStep = buildTriangleRoundedStep;
111132
- exports.buildTriangleRoundedUv = buildTriangleRoundedUv;
111133
- 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;
111134
111636
  exports.buildTriangleStep = buildTriangleLegacyStep;
111135
111637
  exports.buildTriangleUv = buildTriangleLegacyUv;
111136
111638
  exports.buildTriangleVertex = buildTriangleLegacyVertex;
@@ -111165,7 +111667,8 @@ exports.createRectangleRoundedUploaded = createRectangleRoundedLegacyUploaded;
111165
111667
  exports.createRectangleUploaded = createRectangleLegacyUploaded;
111166
111668
  exports.createSemicircleUploaded = createSemicircleUploaded;
111167
111669
  exports.createTriangleLegacyUploaded = createTriangleLegacyUploaded;
111168
- exports.createTriangleRoundedUploaded = createTriangleRoundedUploaded;
111670
+ exports.createTriangleRoundedLegacyUploaded = createTriangleRoundedLegacyUploaded;
111671
+ exports.createTriangleRoundedUploaded = createTriangleRoundedLegacyUploaded;
111169
111672
  exports.createTriangleUploaded = createTriangleLegacyUploaded;
111170
111673
  exports.dThemeDarkEnUsDialogProcessingMessage = dThemeDarkEnUsDialogProcessingMessage;
111171
111674
  exports.dThemeDarkJaJpDialogProcessingMessage = dThemeDarkJaJpDialogProcessingMessage;
@@ -111207,6 +111710,7 @@ exports.deserializeSemicircle = deserializeSemicircle;
111207
111710
  exports.deserializeTriangle = deserializeTriangle;
111208
111711
  exports.deserializeTriangleLegacy = deserializeTriangleLegacy;
111209
111712
  exports.deserializeTriangleRounded = deserializeTriangleRounded;
111713
+ exports.deserializeTriangleRoundedLegacy = deserializeTriangleRoundedLegacy;
111210
111714
  exports.eShapePointsFormatterCurve = eShapePointsFormatterCurve;
111211
111715
  exports.eShapePointsFormatterCurveBezierQuadratic = eShapePointsFormatterCurveBezierQuadratic;
111212
111716
  exports.hitTestBBox = hitTestBBox;
@@ -111221,6 +111725,7 @@ exports.hitTestTriangle = hitTestTriangle;
111221
111725
  exports.hitTestTriangleFilled = hitTestTriangleFilled;
111222
111726
  exports.hitTestTriangleLegacy = hitTestTriangleLegacy;
111223
111727
  exports.hitTestTriangleRounded = hitTestTriangleRounded;
111728
+ exports.hitTestTriangleRoundedLegacy = hitTestTriangleRoundedLegacy;
111224
111729
  exports.isArray = isArray;
111225
111730
  exports.isFunction = isFunction;
111226
111731
  exports.isNaN = isNaN$1;
@@ -111266,6 +111771,7 @@ exports.loadShapeSemicircle = loadShapeSemicircle;
111266
111771
  exports.loadShapeTriangle = loadShapeTriangle;
111267
111772
  exports.loadShapeTriangleLegacy = loadShapeTriangleLegacy;
111268
111773
  exports.loadShapeTriangleRounded = loadShapeTriangleRounded;
111774
+ exports.loadShapeTriangleRoundedLegacy = loadShapeTriangleRoundedLegacy;
111269
111775
  exports.loadThemeDark = loadThemeDark;
111270
111776
  exports.loadThemeDarkBase = loadThemeDarkBase;
111271
111777
  exports.loadThemeDarkBoard = loadThemeDarkBoard;