@wcardinal/wcardinal-ui 0.467.0 → 0.468.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (98) hide show
  1. package/dist/types/wcardinal/ui/shape/e-shape-type.d.ts +1 -0
  2. package/dist/types/wcardinal/ui/shape/load/index.d.ts +1 -0
  3. package/dist/types/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.d.ts +1 -0
  4. package/dist/types/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.d.ts +10 -0
  5. package/dist/types/wcardinal/ui/shape/variant/build-triangle-rounded.d.ts +1 -10
  6. package/dist/types/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.d.ts +12 -0
  7. package/dist/types/wcardinal/ui/shape/variant/builder-triangle-rounded.d.ts +1 -12
  8. package/dist/types/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.d.ts +4 -0
  9. package/dist/types/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.d.ts +1 -4
  10. package/dist/types/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.d.ts +4 -0
  11. package/dist/types/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.d.ts +2 -0
  12. package/dist/types/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.d.ts +2 -2
  13. package/dist/types/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.d.ts +18 -18
  14. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.d.ts +7 -0
  15. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.d.ts +42 -0
  16. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.d.ts +3 -0
  17. package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-rounded.d.ts +4 -0
  18. package/dist/types/wcardinal/ui/shape/variant/hit-test-fill.d.ts +2 -0
  19. package/dist/types/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.d.ts +1 -0
  20. package/dist/types/wcardinal/ui/shape/variant/hit-test-triangle-rounded.d.ts +1 -0
  21. package/dist/types/wcardinal/ui/shape/variant/index.d.ts +7 -0
  22. package/dist/wcardinal/ui/shape/e-shape-type.js +1 -0
  23. package/dist/wcardinal/ui/shape/e-shape-type.js.map +1 -1
  24. package/dist/wcardinal/ui/shape/load/index.js +1 -0
  25. package/dist/wcardinal/ui/shape/load/index.js.map +1 -1
  26. package/dist/wcardinal/ui/shape/load/load-shape-all.js +2 -0
  27. package/dist/wcardinal/ui/shape/load/load-shape-all.js.map +1 -1
  28. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js +17 -0
  29. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded-legacy.js.map +1 -0
  30. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js +2 -2
  31. package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js.map +1 -1
  32. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js +4 -0
  33. package/dist/wcardinal/ui/shape/variant/build-rectangle-legacy.js.map +1 -1
  34. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js +20 -19
  35. package/dist/wcardinal/ui/shape/variant/build-rectangle-rounded-legacy.js.map +1 -1
  36. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js +4 -0
  37. package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js.map +1 -1
  38. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js +538 -0
  39. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded-legacy.js.map +1 -0
  40. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js +5 -536
  41. package/dist/wcardinal/ui/shape/variant/build-triangle-rounded.js.map +1 -1
  42. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js +84 -0
  43. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded-legacy.js.map +1 -0
  44. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js +1 -79
  45. package/dist/wcardinal/ui/shape/variant/builder-triangle-rounded.js.map +1 -1
  46. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js +24 -0
  47. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-legacy-uploaded.js.map +1 -0
  48. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js +1 -19
  49. package/dist/wcardinal/ui/shape/variant/create-triangle-rounded-uploaded.js.map +1 -1
  50. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js +10 -0
  51. package/dist/wcardinal/ui/shape/variant/deserialize-triangle-rounded-legacy.js.map +1 -0
  52. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js +134 -199
  53. package/dist/wcardinal/ui/shape/variant/e-shape-circle-triangulated-impl.js.map +1 -1
  54. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js +2 -2
  55. package/dist/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.js.map +1 -1
  56. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js +2 -2
  57. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js.map +1 -1
  58. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js +62 -64
  59. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-triangulated-impl.js.map +1 -1
  60. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js +27 -0
  61. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-legacy.js.map +1 -0
  62. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js +437 -0
  63. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated-impl.js.map +1 -0
  64. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js +6 -0
  65. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded-triangulated.js.map +1 -0
  66. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js +15 -2
  67. package/dist/wcardinal/ui/shape/variant/e-shape-triangle-rounded.js.map +1 -1
  68. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js +3 -29
  69. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js.map +1 -1
  70. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js +33 -0
  71. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js.map +1 -0
  72. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js +120 -97
  73. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js.map +1 -1
  74. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js +3 -29
  75. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js.map +1 -1
  76. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js +71 -11
  77. package/dist/wcardinal/ui/shape/variant/hit-test-triangle-rounded.js.map +1 -1
  78. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js +3 -29
  79. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js.map +1 -1
  80. package/dist/wcardinal/ui/shape/variant/index.js +7 -0
  81. package/dist/wcardinal/ui/shape/variant/index.js.map +1 -1
  82. package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
  83. package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
  84. package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
  85. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
  86. package/dist/wcardinal-ui-theme-dark.js +1 -1
  87. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  88. package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
  89. package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
  90. package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
  91. package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
  92. package/dist/wcardinal-ui-theme-white.js +1 -1
  93. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  94. package/dist/wcardinal-ui.cjs.js +1050 -567
  95. package/dist/wcardinal-ui.js +1050 -567
  96. package/dist/wcardinal-ui.min.js +2 -2
  97. package/dist/wcardinal-ui.min.js.map +1 -1
  98. package/package.json +1 -1
@@ -5,7 +5,7 @@
5
5
  import { __extends } from "tslib";
6
6
  import { EShapeType } from "../e-shape-type";
7
7
  import { EShapeLineOfAnyPointsImpl } from "./e-shape-line-of-any-points-impl";
8
- import { EShapeTriangleRounded } from "./e-shape-triangle-rounded";
8
+ import { EShapeTriangleRoundedLegacy } from "./e-shape-triangle-rounded-legacy";
9
9
  import { toThresholdDefault } from "./to-threshold-default";
10
10
  var EShapeLineOfTriangleRoundeds = /** @class */ (function (_super) {
11
11
  __extends(EShapeLineOfTriangleRoundeds, _super);
@@ -47,6 +47,6 @@ var EShapeLineOfTriangleRoundeds = /** @class */ (function (_super) {
47
47
  return false;
48
48
  };
49
49
  return EShapeLineOfTriangleRoundeds;
50
- }(EShapeTriangleRounded));
50
+ }(EShapeTriangleRoundedLegacy));
51
51
  export { EShapeLineOfTriangleRoundeds };
52
52
  //# sourceMappingURL=e-shape-line-of-triangle-roundeds.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"e-shape-line-of-triangle-roundeds.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeLineOfAny } from \"./e-shape-line-of-any\";\nimport { EShapeLineOfAnyPoints } from \"./e-shape-line-of-any-points\";\nimport { EShapeLineOfAnyPointsHitTester } from \"./e-shape-line-of-any-points-hit-tester\";\nimport { EShapeLineOfAnyPointsHitTesterToRange } from \"./e-shape-line-of-any-points-hit-tester-to-range\";\nimport { EShapeLineOfAnyPointsHitTesterToThreshold } from \"./e-shape-line-of-any-points-hit-tester-to-threshold\";\nimport { EShapeLineOfAnyPointsImpl } from \"./e-shape-line-of-any-points-impl\";\nimport { EShapeTriangleRounded } from \"./e-shape-triangle-rounded\";\nimport { toThresholdDefault } from \"./to-threshold-default\";\n\nexport class EShapeLineOfTriangleRoundeds extends EShapeTriangleRounded implements EShapeLineOfAny {\n\tprotected declare _points: EShapeLineOfAnyPoints;\n\tprotected _tester: EShapeLineOfAnyPointsHitTester<unknown>;\n\n\tconstructor(type: EShapeType = EShapeType.LINE_OF_TRIANGLE_ROUNDEDS) {\n\t\tsuper(type);\n\t\tthis._points = new EShapeLineOfAnyPointsImpl(this);\n\n\t\tthis._tester = (x, y, ax, ay, ox, oy, px, py, sw, ss, sa): boolean => {\n\t\t\treturn this.containsPointAbs(x, y, ax, ay, ox, oy, px, py, sw, ss, sa);\n\t\t};\n\t}\n\n\tget points(): EShapeLineOfAnyPoints {\n\t\treturn this._points;\n\t}\n\n\tclone(): EShapeLineOfTriangleRoundeds {\n\t\treturn new EShapeLineOfTriangleRoundeds(this.type).copy(this);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\tconst threshold = toThresholdDefault(sw, ss, this._points.size.getLimit());\n\t\tif (this.containsAbsBBox(x, y, ax + threshold, ay + threshold)) {\n\t\t\treturn this._points.calcHitPointAbs(\n\t\t\t\tx,\n\t\t\t\ty,\n\t\t\t\tsw,\n\t\t\t\tss,\n\t\t\t\tsa,\n\t\t\t\tthreshold,\n\t\t\t\tnull,\n\t\t\t\tthis._tester,\n\t\t\t\tnull\n\t\t\t);\n\t\t}\n\t\treturn false;\n\t}\n\n\tcontainsPointAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tox: number,\n\t\toy: number,\n\t\tpx: number,\n\t\tpy: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\treturn super.containsAbs(x - px - ox, y - py - oy, ax, ay, sw, ss, sa);\n\t}\n\n\tcalcHitPoint<RESULT>(\n\t\tx: number,\n\t\ty: number,\n\t\ttoThreshold: EShapeLineOfAnyPointsHitTesterToThreshold | null,\n\t\ttoRange: EShapeLineOfAnyPointsHitTesterToRange | null,\n\t\ttester: EShapeLineOfAnyPointsHitTester<RESULT> | null,\n\t\tresult: RESULT\n\t): boolean {\n\t\tconst data = this.toHitTestData(x, y);\n\t\tconst threshold = (toThreshold || toThresholdDefault)(\n\t\t\tdata.strokeWidth,\n\t\t\tdata.strokeScale,\n\t\t\tthis._points.size.getLimit()\n\t\t);\n\t\tif (this.containsAbsBBox(data.x, data.y, data.width + threshold, data.height + threshold)) {\n\t\t\treturn this._points.calcHitPointAbs(\n\t\t\t\tdata.x,\n\t\t\t\tdata.y,\n\t\t\t\tdata.strokeWidth,\n\t\t\t\tdata.strokeScale,\n\t\t\t\tdata.strokeAlign,\n\t\t\t\tthreshold,\n\t\t\t\ttoRange,\n\t\t\t\ttester || this._tester,\n\t\t\t\tresult\n\t\t\t);\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}
1
+ {"version":3,"file":"e-shape-line-of-triangle-roundeds.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-line-of-triangle-roundeds.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapeLineOfAny } from \"./e-shape-line-of-any\";\nimport { EShapeLineOfAnyPoints } from \"./e-shape-line-of-any-points\";\nimport { EShapeLineOfAnyPointsHitTester } from \"./e-shape-line-of-any-points-hit-tester\";\nimport { EShapeLineOfAnyPointsHitTesterToRange } from \"./e-shape-line-of-any-points-hit-tester-to-range\";\nimport { EShapeLineOfAnyPointsHitTesterToThreshold } from \"./e-shape-line-of-any-points-hit-tester-to-threshold\";\nimport { EShapeLineOfAnyPointsImpl } from \"./e-shape-line-of-any-points-impl\";\nimport { EShapeTriangleRoundedLegacy } from \"./e-shape-triangle-rounded-legacy\";\nimport { toThresholdDefault } from \"./to-threshold-default\";\n\nexport class EShapeLineOfTriangleRoundeds\n\textends EShapeTriangleRoundedLegacy\n\timplements EShapeLineOfAny\n{\n\tprotected declare _points: EShapeLineOfAnyPoints;\n\tprotected _tester: EShapeLineOfAnyPointsHitTester<unknown>;\n\n\tconstructor(type: EShapeType = EShapeType.LINE_OF_TRIANGLE_ROUNDEDS) {\n\t\tsuper(type);\n\t\tthis._points = new EShapeLineOfAnyPointsImpl(this);\n\n\t\tthis._tester = (x, y, ax, ay, ox, oy, px, py, sw, ss, sa): boolean => {\n\t\t\treturn this.containsPointAbs(x, y, ax, ay, ox, oy, px, py, sw, ss, sa);\n\t\t};\n\t}\n\n\tget points(): EShapeLineOfAnyPoints {\n\t\treturn this._points;\n\t}\n\n\tclone(): EShapeLineOfTriangleRoundeds {\n\t\treturn new EShapeLineOfTriangleRoundeds(this.type).copy(this);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\tconst threshold = toThresholdDefault(sw, ss, this._points.size.getLimit());\n\t\tif (this.containsAbsBBox(x, y, ax + threshold, ay + threshold)) {\n\t\t\treturn this._points.calcHitPointAbs(\n\t\t\t\tx,\n\t\t\t\ty,\n\t\t\t\tsw,\n\t\t\t\tss,\n\t\t\t\tsa,\n\t\t\t\tthreshold,\n\t\t\t\tnull,\n\t\t\t\tthis._tester,\n\t\t\t\tnull\n\t\t\t);\n\t\t}\n\t\treturn false;\n\t}\n\n\tcontainsPointAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tox: number,\n\t\toy: number,\n\t\tpx: number,\n\t\tpy: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\treturn super.containsAbs(x - px - ox, y - py - oy, ax, ay, sw, ss, sa);\n\t}\n\n\tcalcHitPoint<RESULT>(\n\t\tx: number,\n\t\ty: number,\n\t\ttoThreshold: EShapeLineOfAnyPointsHitTesterToThreshold | null,\n\t\ttoRange: EShapeLineOfAnyPointsHitTesterToRange | null,\n\t\ttester: EShapeLineOfAnyPointsHitTester<RESULT> | null,\n\t\tresult: RESULT\n\t): boolean {\n\t\tconst data = this.toHitTestData(x, y);\n\t\tconst threshold = (toThreshold || toThresholdDefault)(\n\t\t\tdata.strokeWidth,\n\t\t\tdata.strokeScale,\n\t\t\tthis._points.size.getLimit()\n\t\t);\n\t\tif (this.containsAbsBBox(data.x, data.y, data.width + threshold, data.height + threshold)) {\n\t\t\treturn this._points.calcHitPointAbs(\n\t\t\t\tdata.x,\n\t\t\t\tdata.y,\n\t\t\t\tdata.strokeWidth,\n\t\t\t\tdata.strokeScale,\n\t\t\t\tdata.strokeAlign,\n\t\t\t\tthreshold,\n\t\t\t\ttoRange,\n\t\t\t\ttester || this._tester,\n\t\t\t\tresult\n\t\t\t);\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}
@@ -5,7 +5,7 @@
5
5
  import { __extends } from "tslib";
6
6
  import { EShapeType } from "../e-shape-type";
7
7
  import { EShapePrimitive } from "./e-shape-primitive";
8
- import { hitTestRectangleRounded } from "./hit-test-rectangle-rounded";
8
+ import { hitTestRectangleRoundedLegacy } from "./hit-test-rectangle-rounded";
9
9
  var EShapeRectangleRoundedLegacy = /** @class */ (function (_super) {
10
10
  __extends(EShapeRectangleRoundedLegacy, _super);
11
11
  function EShapeRectangleRoundedLegacy(type) {
@@ -17,7 +17,7 @@ var EShapeRectangleRoundedLegacy = /** @class */ (function (_super) {
17
17
  };
18
18
  EShapeRectangleRoundedLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
19
19
  if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
20
- return hitTestRectangleRounded(this, x, y, ax, ay, sw, ss);
20
+ return hitTestRectangleRoundedLegacy(this, x, y, ax, ay, sw, ss);
21
21
  }
22
22
  return false;
23
23
  };
@@ -1 +1 @@
1
- {"version":3,"file":"e-shape-rectangle-rounded-legacy.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAEvE;IAAkD,gDAAe;IAChE,sCAAY,IAAsD;QAAtD,qBAAA,EAAA,OAAmB,UAAU,CAAC,wBAAwB;QACjE,OAAA,MAAK,YAAC,IAAI,CAAC,SAAC;IACb,CAAC;IAED,4CAAK,GAAL;QACC,OAAO,IAAI,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,kDAAW,GAAX,UACC,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;QAEV,IAAI,gBAAK,CAAC,eAAe,YAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,uBAAuB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACF,mCAAC;AAAD,CAAC,AAvBD,CAAkD,eAAe,GAuBhE","sourcesContent":["/*\n * Copyright (C) 2019-2026 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapePrimitive } from \"./e-shape-primitive\";\nimport { hitTestRectangleRounded } from \"./hit-test-rectangle-rounded\";\n\nexport class EShapeRectangleRoundedLegacy extends EShapePrimitive {\n\tconstructor(type: EShapeType = EShapeType.RECTANGLE_ROUNDED_LEGACY) {\n\t\tsuper(type);\n\t}\n\n\tclone(): EShapeRectangleRoundedLegacy {\n\t\treturn new EShapeRectangleRoundedLegacy(this.type).copy(this);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\tif (super.containsAbsBBox(x, y, ax, ay)) {\n\t\t\treturn hitTestRectangleRounded(this, x, y, ax, ay, sw, ss);\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}
1
+ {"version":3,"file":"e-shape-rectangle-rounded-legacy.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,6BAA6B,EAAE,MAAM,8BAA8B,CAAC;AAE7E;IAAkD,gDAAe;IAChE,sCAAY,IAAsD;QAAtD,qBAAA,EAAA,OAAmB,UAAU,CAAC,wBAAwB;QACjE,OAAA,MAAK,YAAC,IAAI,CAAC,SAAC;IACb,CAAC;IAED,4CAAK,GAAL;QACC,OAAO,IAAI,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IAED,kDAAW,GAAX,UACC,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;QAEV,IAAI,gBAAK,CAAC,eAAe,YAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YACzC,OAAO,6BAA6B,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IACF,mCAAC;AAAD,CAAC,AAvBD,CAAkD,eAAe,GAuBhE","sourcesContent":["/*\n * Copyright (C) 2019-2026 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShapeType } from \"../e-shape-type\";\nimport { EShapePrimitive } from \"./e-shape-primitive\";\nimport { hitTestRectangleRoundedLegacy } from \"./hit-test-rectangle-rounded\";\n\nexport class EShapeRectangleRoundedLegacy extends EShapePrimitive {\n\tconstructor(type: EShapeType = EShapeType.RECTANGLE_ROUNDED_LEGACY) {\n\t\tsuper(type);\n\t}\n\n\tclone(): EShapeRectangleRoundedLegacy {\n\t\treturn new EShapeRectangleRoundedLegacy(this.type).copy(this);\n\t}\n\n\tcontainsAbs(\n\t\tx: number,\n\t\ty: number,\n\t\tax: number,\n\t\tay: number,\n\t\tsw: number,\n\t\tss: number,\n\t\tsa: number\n\t): boolean {\n\t\tif (super.containsAbsBBox(x, y, ax, ay)) {\n\t\t\treturn hitTestRectangleRoundedLegacy(this, x, y, ax, ay, sw, ss);\n\t\t}\n\t\treturn false;\n\t}\n}\n"]}
@@ -159,7 +159,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
159
159
  boundary[3] = +ay;
160
160
  // # of vertices and # of indices
161
161
  var n = this._n >> 2;
162
- var nv = 8 * n + 18;
162
+ var nv = 12 * n + 10;
163
163
  var ni = 4 * n + 10;
164
164
  this._nvertices = nv;
165
165
  this._nindices = ni;
@@ -789,7 +789,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
789
789
  * Preconditions:
790
790
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
791
791
  * * ay <= ax
792
- * * 5 * N + 5 <= nv
792
+ * * 6 * N + 3 <= nv
793
793
  * * 4 * N + 1 <= ni
794
794
  */
795
795
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -800,7 +800,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
800
800
  * Preconditions:
801
801
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_RIGHT
802
802
  * * ax < ay
803
- * * 5 * N + 5 <= nv
803
+ * * 6 * N + 3 <= nv
804
804
  * * 4 * N + 1 <= ni
805
805
  */
806
806
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -932,7 +932,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
932
932
  if (ctr) {
933
933
  var lo = lot + 2 * ax - r;
934
934
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
935
- iv += 2 * n - 1;
935
+ iv += 3 * (n - 1);
936
936
  ii += 3 * (n - 1);
937
937
  }
938
938
  this.pad(iv, ii, nv, ni, fd);
@@ -941,7 +941,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
941
941
  * Preconditions:
942
942
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
943
943
  * * ay <= ax
944
- * * 5 * N + 5 <= nv
944
+ * * 6 * N + 3 <= nv
945
945
  * * 4 * N + 1 <= ni
946
946
  */
947
947
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -952,7 +952,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
952
952
  * Preconditions:
953
953
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_LEFT
954
954
  * * ax < ay
955
- * * 5 * N + 5 <= nv
955
+ * * 6 * N + 3 <= nv
956
956
  * * 4 * N + 1 <= ni
957
957
  */
958
958
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1086,7 +1086,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1086
1086
  if (cbl) {
1087
1087
  var lo = lob + 2 * ax - r;
1088
1088
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1089
- iv += 2 * n - 1;
1089
+ iv += 3 * (n - 1);
1090
1090
  ii += 3 * (n - 1);
1091
1091
  }
1092
1092
  this.pad(iv, ii, nv, ni, fd);
@@ -1103,7 +1103,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1103
1103
  * Preconditions:
1104
1104
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
1105
1105
  * * ay <= ax
1106
- * * 5 * N + 5 <= nv
1106
+ * * 6 * N + 3 <= nv
1107
1107
  * * 4 * N + 1 <= ni
1108
1108
  */
1109
1109
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1114,7 +1114,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1114
1114
  * Preconditions:
1115
1115
  * * shape.stroke.side === EShapeStrokeSide.TOP_OR_LEFT
1116
1116
  * * ax < ay
1117
- * * 5 * N + 5 <= nv
1117
+ * * 6 * N + 3 <= nv
1118
1118
  * * 4 * N + 1 <= ni
1119
1119
  */
1120
1120
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateTopLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1260,7 +1260,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1260
1260
  if (ctl) {
1261
1261
  var lo = lol + 2 * ay - r;
1262
1262
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1263
- iv += 2 * n - 1;
1263
+ iv += 3 * (n - 1);
1264
1264
  ii += 3 * (n - 1);
1265
1265
  }
1266
1266
  this.pad(iv, ii, nv, ni, fd);
@@ -1269,7 +1269,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1269
1269
  * Preconditions:
1270
1270
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
1271
1271
  * * ay <= ax
1272
- * * 5 * N + 5 <= nv
1272
+ * * 6 * N + 3 <= nv
1273
1273
  * * 4 * N + 1 <= ni
1274
1274
  */
1275
1275
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1280,7 +1280,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1280
1280
  * Preconditions:
1281
1281
  * * shape.stroke.side === EShapeStrokeSide.BOTTOM_OR_RIGHT
1282
1282
  * * ax < ay
1283
- * * 5 * N + 5 <= nv
1283
+ * * 6 * N + 3 <= nv
1284
1284
  * * 4 * N + 1 <= ni
1285
1285
  */
1286
1286
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateBottomRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1423,7 +1423,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1423
1423
  if (cbr) {
1424
1424
  var lo = lor + 2 * ay - r;
1425
1425
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1426
- iv += 2 * n - 1;
1426
+ iv += 3 * (n - 1);
1427
1427
  ii += 3 * (n - 1);
1428
1428
  }
1429
1429
  this.pad(iv, ii, nv, ni, fd);
@@ -1432,7 +1432,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1432
1432
  * Preconditions:
1433
1433
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
1434
1434
  * * ay <= ax
1435
- * * 6 * N + 12 <= nv
1435
+ * * 8 * N + 8 <= nv
1436
1436
  * * 4 * N + 6 <= ni
1437
1437
  */
1438
1438
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1475,13 +1475,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1475
1475
  if (cbl) {
1476
1476
  var lo = lob + 2 * ax - r;
1477
1477
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1478
- iv += 2 * n - 1;
1478
+ iv += 3 * (n - 1);
1479
1479
  ii += 3 * (n - 1);
1480
1480
  }
1481
1481
  if (cbr) {
1482
1482
  var lo = lor + 2 * ay - r;
1483
1483
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1484
- iv += 2 * n - 1;
1484
+ iv += 3 * (n - 1);
1485
1485
  ii += 3 * (n - 1);
1486
1486
  }
1487
1487
  this.pad(iv, ii, nv, ni, fd);
@@ -1490,7 +1490,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1490
1490
  * Preconditions:
1491
1491
  * * shape.stroke.side === EShapeStrokeSide.NOT_TOP
1492
1492
  * * ax < ay
1493
- * * 6 * N + 12 <= nv
1493
+ * * 8 * N + 8 <= nv
1494
1494
  * * 4 * N + 6 <= ni
1495
1495
  */
1496
1496
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotTop1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1531,13 +1531,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1531
1531
  if (cbl) {
1532
1532
  var lo = lob + 2 * ax - r;
1533
1533
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1534
- iv += 2 * n - 1;
1534
+ iv += 3 * (n - 1);
1535
1535
  ii += 3 * (n - 1);
1536
1536
  }
1537
1537
  if (cbr) {
1538
1538
  var lo = lor + 2 * ay - r;
1539
1539
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1540
- iv += 2 * n - 1;
1540
+ iv += 3 * (n - 1);
1541
1541
  ii += 3 * (n - 1);
1542
1542
  }
1543
1543
  this.pad(iv, ii, nv, ni, fd);
@@ -1615,7 +1615,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1615
1615
  * Preconditions:
1616
1616
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
1617
1617
  * * ay <= ax
1618
- * * 6 * N + 12 <= nv
1618
+ * * 8 * N + 8 <= nv
1619
1619
  * * 4 * N + 6 <= ni
1620
1620
  */
1621
1621
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1664,13 +1664,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1664
1664
  if (ctl) {
1665
1665
  var lo = lol + 2 * ay - r;
1666
1666
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1667
- iv += 2 * n - 1;
1667
+ iv += 3 * (n - 1);
1668
1668
  ii += 3 * (n - 1);
1669
1669
  }
1670
1670
  if (ctr) {
1671
1671
  var lo = lot + 2 * ax - r;
1672
1672
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1673
- iv += 2 * n - 1;
1673
+ iv += 3 * (n - 1);
1674
1674
  ii += 3 * (n - 1);
1675
1675
  }
1676
1676
  this.pad(iv, ii, nv, ni, fd);
@@ -1679,7 +1679,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1679
1679
  * Preconditions:
1680
1680
  * * shape.stroke.side === EShapeStrokeSide.NOT_BOTTOM
1681
1681
  * * ax < ay
1682
- * * 6 * N + 12 <= nv
1682
+ * * 8 * N + 8 <= nv
1683
1683
  * * 4 * N + 6 <= ni
1684
1684
  */
1685
1685
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotBottom1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1727,13 +1727,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1727
1727
  if (ctl) {
1728
1728
  var lo = lol + 2 * ay - r;
1729
1729
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1730
- iv += 2 * n - 1;
1730
+ iv += 3 * (n - 1);
1731
1731
  ii += 3 * (n - 1);
1732
1732
  }
1733
1733
  if (ctr) {
1734
1734
  var lo = lot + 2 * ax - r;
1735
1735
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1736
- iv += 2 * n - 1;
1736
+ iv += 3 * (n - 1);
1737
1737
  ii += 3 * (n - 1);
1738
1738
  }
1739
1739
  this.pad(iv, ii, nv, ni, fd);
@@ -1808,7 +1808,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1808
1808
  * Preconditions:
1809
1809
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
1810
1810
  * * ay <= ax
1811
- * * 6 * N + 12 <= nv
1811
+ * * 8 * N + 8 <= nv
1812
1812
  * * 4 * N + 6 <= ni
1813
1813
  */
1814
1814
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1855,13 +1855,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1855
1855
  if (ctr) {
1856
1856
  var lo = lot + 2 * ax - r;
1857
1857
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1858
- iv += 2 * n - 1;
1858
+ iv += 3 * (n - 1);
1859
1859
  ii += 3 * (n - 1);
1860
1860
  }
1861
1861
  if (cbr) {
1862
1862
  var lo = lor + 2 * ay - r;
1863
1863
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1864
- iv += 2 * n - 1;
1864
+ iv += 3 * (n - 1);
1865
1865
  ii += 3 * (n - 1);
1866
1866
  }
1867
1867
  this.pad(iv, ii, nv, ni, fd);
@@ -1870,7 +1870,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1870
1870
  * Preconditions:
1871
1871
  * * shape.stroke.side === EShapeStrokeSide.NOT_LEFT
1872
1872
  * * ax < ay
1873
- * * 6 * N + 12 <= nv
1873
+ * * 8 * N + 8 <= nv
1874
1874
  * * 4 * N + 6 <= ni
1875
1875
  */
1876
1876
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotLeft1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -1918,13 +1918,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1918
1918
  if (ctr) {
1919
1919
  var lo = lot + 2 * ax - r;
1920
1920
  this.writeFan(+ax - r, -ay + r, 0, -1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1921
- iv += 2 * n - 1;
1921
+ iv += 3 * (n - 1);
1922
1922
  ii += 3 * (n - 1);
1923
1923
  }
1924
1924
  if (cbr) {
1925
1925
  var lo = lor + 2 * ay - r;
1926
1926
  this.writeFan(+ax - r, +ay - r, 1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
1927
- iv += 2 * n - 1;
1927
+ iv += 3 * (n - 1);
1928
1928
  ii += 3 * (n - 1);
1929
1929
  }
1930
1930
  this.pad(iv, ii, nv, ni, fd);
@@ -1999,7 +1999,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
1999
1999
  * Preconditions:
2000
2000
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
2001
2001
  * * ay <= ax
2002
- * * 6 * N + 12 <= nv
2002
+ * * 8 * N + 8 <= nv
2003
2003
  * * 4 * N + 6 <= ni
2004
2004
  */
2005
2005
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -2040,13 +2040,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2040
2040
  if (ctl) {
2041
2041
  var lo = lol + 2 * ay - r;
2042
2042
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
2043
- iv += 2 * n - 1;
2043
+ iv += 3 * (n - 1);
2044
2044
  ii += 3 * (n - 1);
2045
2045
  }
2046
2046
  if (cbl) {
2047
2047
  var lo = lob + 2 * ax - r;
2048
2048
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
2049
- iv += 2 * n - 1;
2049
+ iv += 3 * (n - 1);
2050
2050
  ii += 3 * (n - 1);
2051
2051
  }
2052
2052
  this.pad(iv, ii, nv, ni, fd);
@@ -2055,7 +2055,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2055
2055
  * Preconditions:
2056
2056
  * * shape.stroke.side === EShapeStrokeSide.NOT_RIGHT
2057
2057
  * * ax < ay
2058
- * * 6 * N + 12 <= nv
2058
+ * * 8 * N + 8 <= nv
2059
2059
  * * 4 * N + 6 <= ni
2060
2060
  */
2061
2061
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateNotRight1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -2097,13 +2097,13 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2097
2097
  if (ctl) {
2098
2098
  var lo = lol + 2 * ay - r;
2099
2099
  this.writeFan(-ax + r, -ay + r, -1, 0, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
2100
- iv += 2 * n - 1;
2100
+ iv += 3 * (n - 1);
2101
2101
  ii += 3 * (n - 1);
2102
2102
  }
2103
2103
  if (cbl) {
2104
2104
  var lo = lob + 2 * ax - r;
2105
2105
  this.writeFan(-ax + r, +ay - r, 0, 1, lo, iv, ii, n, r, rs, fd, scale, fx, fy);
2106
- iv += 2 * n - 1;
2106
+ iv += 3 * (n - 1);
2107
2107
  ii += 3 * (n - 1);
2108
2108
  }
2109
2109
  this.pad(iv, ii, nv, ni, fd);
@@ -2178,7 +2178,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2178
2178
  * Preconditions:
2179
2179
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
2180
2180
  * * ay <= ax
2181
- * * 8 * N + 18 <= nv
2181
+ * * 12 * N + 10 <= nv
2182
2182
  * * 4 * N + 10 <= ni
2183
2183
  */
2184
2184
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll0 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -2223,10 +2223,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2223
2223
  iv += 5;
2224
2224
  ii += 9;
2225
2225
  var rs = r + fs;
2226
- var l = 2 * ax + lot;
2226
+ var l = 2 * ax + lot - r;
2227
2227
  if (ctr) {
2228
2228
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
2229
- iv += 2 * n - 1;
2229
+ iv += 3 * (n - 1);
2230
2230
  ii += 3 * (n - 1);
2231
2231
  l += 2 * ay + lc;
2232
2232
  }
@@ -2235,7 +2235,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2235
2235
  }
2236
2236
  if (cbr) {
2237
2237
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
2238
- iv += 2 * n - 1;
2238
+ iv += 3 * (n - 1);
2239
2239
  ii += 3 * (n - 1);
2240
2240
  l += 2 * ax + lc;
2241
2241
  }
@@ -2244,7 +2244,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2244
2244
  }
2245
2245
  if (cbl) {
2246
2246
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
2247
- iv += 2 * n - 1;
2247
+ iv += 3 * (n - 1);
2248
2248
  ii += 3 * (n - 1);
2249
2249
  l += 2 * ay + lc;
2250
2250
  }
@@ -2253,7 +2253,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2253
2253
  }
2254
2254
  if (ctl) {
2255
2255
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
2256
- iv += 2 * n - 1;
2256
+ iv += 3 * (n - 1);
2257
2257
  ii += 3 * (n - 1);
2258
2258
  }
2259
2259
  this.pad(iv, ii, nv, ni, fd);
@@ -2262,7 +2262,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2262
2262
  * Preconditions:
2263
2263
  * * shape.stroke.side === EShapeStrokeSide.ALL or NONE
2264
2264
  * * ax < ay
2265
- * * 8 * N + 18 <= nv
2265
+ * * 12 * N + 10 <= nv
2266
2266
  * * 4 * N + 10 <= ni
2267
2267
  */
2268
2268
  EShapeRectangleRoundedTriangulatedImpl.prototype.updateAll1 = function (fx, fy, ax, ay, scale, radius, corner, nv, ni) {
@@ -2307,10 +2307,10 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2307
2307
  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);
2308
2308
  iv += 6;
2309
2309
  ii += 12;
2310
- var l = 2 * ax + lot;
2310
+ var l = 2 * ax + lot - r;
2311
2311
  if (ctr) {
2312
2312
  this.writeFan(x4, y1, 0, -1, l, iv, ii, n, r, rs, fd, s, fx, fy);
2313
- iv += 1 + 2 * (n - 1);
2313
+ iv += 3 * (n - 1);
2314
2314
  ii += 3 * (n - 1);
2315
2315
  l += 2 * ay + lc;
2316
2316
  }
@@ -2319,7 +2319,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2319
2319
  }
2320
2320
  if (cbr) {
2321
2321
  this.writeFan(x4, y4, 1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
2322
- iv += 1 + 2 * (n - 1);
2322
+ iv += 3 * (n - 1);
2323
2323
  ii += 3 * (n - 1);
2324
2324
  l += 2 * ax + lc;
2325
2325
  }
@@ -2328,7 +2328,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2328
2328
  }
2329
2329
  if (cbl) {
2330
2330
  this.writeFan(x1, y4, 0, 1, l, iv, ii, n, r, rs, fd, s, fx, fy);
2331
- iv += 1 + 2 * (n - 1);
2331
+ iv += 3 * (n - 1);
2332
2332
  ii += 3 * (n - 1);
2333
2333
  l += 2 * ay + lc;
2334
2334
  }
@@ -2337,7 +2337,7 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2337
2337
  }
2338
2338
  if (ctl) {
2339
2339
  this.writeFan(x1, y1, -1, 0, l, iv, ii, n, r, rs, fd, s, fx, fy);
2340
- iv += 1 + 2 * (n - 1);
2340
+ iv += 3 * (n - 1);
2341
2341
  ii += 3 * (n - 1);
2342
2342
  }
2343
2343
  this.pad(iv, ii, nv, ni, fd);
@@ -2610,29 +2610,27 @@ var EShapeRectangleRoundedTriangulatedImpl = /** @class */ (function () {
2610
2610
  var dangle = (Math.PI * 0.5) / (n - 1);
2611
2611
  var c = Math.cos(dangle);
2612
2612
  var s = Math.sin(dangle);
2613
- var dl = 0.5 * r * dangle;
2613
+ var dl = r * dangle;
2614
+ // Rim vertices at radius rs sit dl / 2 * (rs / r) from the chord midpoint, so the length is exact at radius r.
2615
+ var dlm = 0.5 * dl * (rs / r - 1);
2616
+ var cc = 1 - r * fd;
2617
+ var indices = this._indices;
2614
2618
  var dx = rs * cos0;
2615
2619
  var dy = rs * sin0;
2616
- var iv0 = iv++;
2617
2620
  var l = lo;
2618
- this.writeVertex(iv0, cx + dx, cy + dy, fd, lo, scale, fx, fy);
2619
- var indices = this._indices;
2620
- var cc = 1 - r * fd;
2621
2621
  for (var i = 0; i < n - 1; ++i) {
2622
- var iv1 = iv++;
2623
- l += dl;
2624
- this.writeVertex(iv1, cx, cy, fd, l, cc, fx, fy);
2625
- var iv2 = iv++;
2626
- l += dl;
2627
2622
  var ndx = c * dx - s * dy;
2628
2623
  var ndy = s * dx + c * dy;
2629
- this.writeVertex(iv2, cx + ndx, cy + ndy, fd, l, scale, fx, fy);
2624
+ this.writeVertex(iv + 0, cx + dx, cy + dy, fd, l - dlm, scale, fx, fy);
2625
+ this.writeVertex(iv + 1, cx + ndx, cy + ndy, fd, l + dl + dlm, scale, fx, fy);
2626
+ this.writeVertex(iv + 2, cx, cy, fd, l + 0.5 * dl, cc, fx, fy);
2627
+ indices[ii++] = iv + 2;
2628
+ indices[ii++] = iv + 0;
2629
+ indices[ii++] = iv + 1;
2630
+ iv += 3;
2631
+ l += dl;
2630
2632
  dx = ndx;
2631
2633
  dy = ndy;
2632
- indices[ii++] = iv1;
2633
- indices[ii++] = iv0;
2634
- indices[ii++] = iv2;
2635
- iv0 = iv2;
2636
2634
  }
2637
2635
  };
2638
2636
  EShapeRectangleRoundedTriangulatedImpl.prototype.writeVertexTop = function (vertex, x, y, lengthOffset, fdistance, scale, fx, fy, ax, ay) {