@wcardinal/wcardinal-ui 0.467.0 → 0.467.1

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 (31) hide show
  1. package/dist/types/wcardinal/ui/shape/variant/hit-test-fill.d.ts +2 -0
  2. package/dist/types/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.d.ts +1 -0
  3. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js +2 -2
  4. package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-rounded-legacy.js.map +1 -1
  5. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js +3 -29
  6. package/dist/wcardinal/ui/shape/variant/hit-test-circle.js.map +1 -1
  7. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js +33 -0
  8. package/dist/wcardinal/ui/shape/variant/hit-test-fill.js.map +1 -0
  9. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js +120 -97
  10. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.js.map +1 -1
  11. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js +3 -29
  12. package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js.map +1 -1
  13. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js +3 -29
  14. package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js.map +1 -1
  15. package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
  16. package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
  17. package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
  18. package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
  19. package/dist/wcardinal-ui-theme-dark.js +1 -1
  20. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  21. package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
  22. package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
  23. package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
  24. package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
  25. package/dist/wcardinal-ui-theme-white.js +1 -1
  26. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  27. package/dist/wcardinal-ui.cjs.js +160 -183
  28. package/dist/wcardinal-ui.js +160 -183
  29. package/dist/wcardinal-ui.min.js +2 -2
  30. package/dist/wcardinal-ui.min.js.map +1 -1
  31. package/package.json +1 -1
@@ -0,0 +1,2 @@
1
+ import { EShapeFill } from "../e-shape-fill";
2
+ export declare const hitTestFill: (x: number, y: number, ax: number, ay: number, fill: EShapeFill) => boolean;
@@ -1,2 +1,3 @@
1
1
  import { EShape } from "../e-shape";
2
+ export declare const hitTestRectangleRoundedLegacy: (shape: EShape, x: number, y: number, ax: number, ay: number, sw: number, ss: number) => boolean;
2
3
  export declare const hitTestRectangleRounded: (shape: EShape, x: number, y: number, ax: number, ay: number, sw: number, ss: number) => boolean;
@@ -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"]}
@@ -2,7 +2,7 @@
2
2
  * Copyright (C) 2019 Toshiba Corporation
3
3
  * SPDX-License-Identifier: Apache-2.0
4
4
  */
5
- import { EShapeFillDirection } from "../e-shape-fill-direction";
5
+ import { hitTestFill } from "./hit-test-fill";
6
6
  export var hitTestCircleLegacy = function (shape, x, y, ax, ay, sw, ss) {
7
7
  var fill = shape.fill;
8
8
  if (fill.enable) {
@@ -36,34 +36,8 @@ export var hitTestCircle = function (shape, x, y, ax, ay, sw, ss) {
36
36
  if (!hitTestCircleFilled(x, y, ax, ay)) {
37
37
  return false;
38
38
  }
39
- var fill = shape.fill;
40
- if (fill.enable) {
41
- var percent = Math.max(0, Math.min(1, fill.percent));
42
- if (1 <= percent) {
43
- return true;
44
- }
45
- switch (fill.direction) {
46
- case EShapeFillDirection.TOP:
47
- if (y + ay <= percent * (2 * ay)) {
48
- return true;
49
- }
50
- break;
51
- case EShapeFillDirection.RIGHT:
52
- if ((1 - percent) * (2 * ax) <= x + ax) {
53
- return true;
54
- }
55
- break;
56
- case EShapeFillDirection.BOTTOM:
57
- if ((1 - percent) * (2 * ay) <= y + ay) {
58
- return true;
59
- }
60
- break;
61
- case EShapeFillDirection.LEFT:
62
- if (x + ax <= percent * (2 * ax)) {
63
- return true;
64
- }
65
- break;
66
- }
39
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
40
+ return true;
67
41
  }
68
42
  return hitTestCircleStroke(x, y, ax, ay, sw, ss);
69
43
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hit-test-circle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-circle.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeFillDirection } from \"../e-shape-fill-direction\";\n\nexport const hitTestCircleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\treturn hitTestCircleFilled(x, y, ax, ay);\n\t}\n\treturn hitTestCircleStroke(x, y, ax, ay, sw, ss);\n};\n\nconst hitTestCircleFilled = (x: number, y: number, ax: number, ay: number): boolean => {\n\tconst x2 = x * x;\n\tconst y2 = y * y;\n\tconst ax2 = ax * ax;\n\tconst ay2 = ay * ay;\n\treturn x2 * ay2 + y2 * ax2 <= ax2 * ay2;\n};\n\nconst hitTestCircleStroke = (\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (0 < sw) {\n\t\tconst s = sw * ss;\n\t\tconst x2 = x * x;\n\t\tconst y2 = y * y;\n\t\tconst wx = Math.max(0.0, ax - s);\n\t\tconst wy = Math.max(0.0, ay - s);\n\t\tconst wx2 = wx * wx;\n\t\tconst wy2 = wy * wy;\n\t\tif (wx2 * wy2 <= x2 * wy2 + y2 * wx2) {\n\t\t\treturn hitTestCircleFilled(x, y, ax, ay);\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestCircle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (!hitTestCircleFilled(x, y, ax, ay)) {\n\t\treturn false;\n\t}\n\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\tconst percent = Math.max(0, Math.min(1, fill.percent));\n\t\tif (1 <= percent) {\n\t\t\treturn true;\n\t\t}\n\n\t\tswitch (fill.direction) {\n\t\t\tcase EShapeFillDirection.TOP:\n\t\t\t\tif (y + ay <= percent * (2 * ay)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.RIGHT:\n\t\t\t\tif ((1 - percent) * (2 * ax) <= x + ax) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.BOTTOM:\n\t\t\t\tif ((1 - percent) * (2 * ay) <= y + ay) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.LEFT:\n\t\t\t\tif (x + ax <= percent * (2 * ax)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t}\n\t}\n\n\treturn hitTestCircleStroke(x, y, ax, ay, sw, ss);\n};\n"]}
1
+ {"version":3,"file":"hit-test-circle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-circle.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,CAAC,IAAM,mBAAmB,GAAG,UAClC,KAAa,EACb,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;IAEV,IAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IACxB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,OAAO,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,IAAM,mBAAmB,GAAG,UAAC,CAAS,EAAE,CAAS,EAAE,EAAU,EAAE,EAAU;IACxE,IAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACjB,IAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;IACjB,IAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IACpB,IAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IACpB,OAAO,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC;AACzC,CAAC,CAAC;AAEF,IAAM,mBAAmB,GAAG,UAC3B,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;IAEV,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;QACZ,IAAM,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;QAClB,IAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,IAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,IAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QACjC,IAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QACjC,IAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;QACpB,IAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;QACpB,IAAI,GAAG,GAAG,GAAG,IAAI,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;YACtC,OAAO,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1C,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,aAAa,GAAG,UAC5B,KAAa,EACb,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU;IAEV,IAAI,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { hitTestFill } from \"./hit-test-fill\";\n\nexport const hitTestCircleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\treturn hitTestCircleFilled(x, y, ax, ay);\n\t}\n\treturn hitTestCircleStroke(x, y, ax, ay, sw, ss);\n};\n\nconst hitTestCircleFilled = (x: number, y: number, ax: number, ay: number): boolean => {\n\tconst x2 = x * x;\n\tconst y2 = y * y;\n\tconst ax2 = ax * ax;\n\tconst ay2 = ay * ay;\n\treturn x2 * ay2 + y2 * ax2 <= ax2 * ay2;\n};\n\nconst hitTestCircleStroke = (\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (0 < sw) {\n\t\tconst s = sw * ss;\n\t\tconst x2 = x * x;\n\t\tconst y2 = y * y;\n\t\tconst wx = Math.max(0.0, ax - s);\n\t\tconst wy = Math.max(0.0, ay - s);\n\t\tconst wx2 = wx * wx;\n\t\tconst wy2 = wy * wy;\n\t\tif (wx2 * wy2 <= x2 * wy2 + y2 * wx2) {\n\t\t\treturn hitTestCircleFilled(x, y, ax, ay);\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestCircle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (!hitTestCircleFilled(x, y, ax, ay)) {\n\t\treturn false;\n\t}\n\tif (hitTestFill(x, y, ax, ay, shape.fill)) {\n\t\treturn true;\n\t}\n\treturn hitTestCircleStroke(x, y, ax, ay, sw, ss);\n};\n"]}
@@ -0,0 +1,33 @@
1
+ import { EShapeFillDirection } from "../e-shape-fill-direction";
2
+ export var hitTestFill = function (x, y, ax, ay, fill) {
3
+ if (fill.enable) {
4
+ var percent = Math.max(0, Math.min(1, fill.percent));
5
+ if (1 <= percent) {
6
+ return true;
7
+ }
8
+ switch (fill.direction) {
9
+ case EShapeFillDirection.TOP:
10
+ if (y + ay <= percent * (2 * ay)) {
11
+ return true;
12
+ }
13
+ break;
14
+ case EShapeFillDirection.RIGHT:
15
+ if ((1 - percent) * (2 * ax) <= x + ax) {
16
+ return true;
17
+ }
18
+ break;
19
+ case EShapeFillDirection.BOTTOM:
20
+ if ((1 - percent) * (2 * ay) <= y + ay) {
21
+ return true;
22
+ }
23
+ break;
24
+ case EShapeFillDirection.LEFT:
25
+ if (x + ax <= percent * (2 * ax)) {
26
+ return true;
27
+ }
28
+ break;
29
+ }
30
+ }
31
+ return false;
32
+ };
33
+ //# sourceMappingURL=hit-test-fill.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"hit-test-fill.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-fill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,CAAC,IAAM,WAAW,GAAG,UAC1B,CAAS,EACT,CAAS,EACT,EAAU,EACV,EAAU,EACV,IAAgB;IAEhB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QACjB,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,OAAO,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACb,CAAC;QAED,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YACxB,KAAK,mBAAmB,CAAC,GAAG;gBAC3B,IAAI,CAAC,GAAG,EAAE,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC;gBACb,CAAC;gBACD,MAAM;YACP,KAAK,mBAAmB,CAAC,KAAK;gBAC7B,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBACxC,OAAO,IAAI,CAAC;gBACb,CAAC;gBACD,MAAM;YACP,KAAK,mBAAmB,CAAC,MAAM;gBAC9B,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBACxC,OAAO,IAAI,CAAC;gBACb,CAAC;gBACD,MAAM;YACP,KAAK,mBAAmB,CAAC,IAAI;gBAC5B,IAAI,CAAC,GAAG,EAAE,IAAI,OAAO,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC;gBACb,CAAC;gBACD,MAAM;QACR,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC","sourcesContent":["import { EShapeFill } from \"../e-shape-fill\";\nimport { EShapeFillDirection } from \"../e-shape-fill-direction\";\n\nexport const hitTestFill = (\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tfill: EShapeFill\n): boolean => {\n\tif (fill.enable) {\n\t\tconst percent = Math.max(0, Math.min(1, fill.percent));\n\t\tif (1 <= percent) {\n\t\t\treturn true;\n\t\t}\n\n\t\tswitch (fill.direction) {\n\t\t\tcase EShapeFillDirection.TOP:\n\t\t\t\tif (y + ay <= percent * (2 * ay)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.RIGHT:\n\t\t\t\tif ((1 - percent) * (2 * ax) <= x + ax) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.BOTTOM:\n\t\t\t\tif ((1 - percent) * (2 * ay) <= y + ay) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.LEFT:\n\t\t\t\tif (x + ax <= percent * (2 * ax)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t}\n\t}\n\treturn false;\n};\n"]}
@@ -4,7 +4,8 @@
4
4
  */
5
5
  import { EShapeCorner } from "../e-shape-corner";
6
6
  import { EShapeStrokeSide } from "../e-shape-stroke-side";
7
- var hitTestRectangleRounded_ = function (x, y, ax, ay, r, corner) {
7
+ import { hitTestFill } from "./hit-test-fill";
8
+ var hitTestRectangleRoundedFilled = function (x, y, ax, ay, r, corner) {
8
9
  var bx0 = -ax + r;
9
10
  if (x <= bx0) {
10
11
  var by0 = -ay + r;
@@ -57,114 +58,136 @@ var hitTestRectangleRounded_ = function (x, y, ax, ay, r, corner) {
57
58
  }
58
59
  }
59
60
  };
60
- export var hitTestRectangleRounded = function (shape, x, y, ax, ay, sw, ss) {
61
+ var hitTestRectangleRoundedStroke = function (shape, x, y, ax, ay, sw, ss, r, corner) {
62
+ var s = sw * ss;
63
+ var wx = Math.max(0.0, ax - s);
64
+ var wy = Math.max(0.0, ay - s);
65
+ var wr = Math.max(0.0, r - s);
66
+ if (!hitTestRectangleRoundedFilled(x, y, wx, wy, wr, corner)) {
67
+ var strokeSide = shape.stroke.side;
68
+ if (strokeSide === EShapeStrokeSide.ALL) {
69
+ return true;
70
+ }
71
+ else {
72
+ if (x <= -wx + wr) {
73
+ var hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);
74
+ if (y <= -wy + wr) {
75
+ var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
76
+ if (hasTopSide && hasLeftSide) {
77
+ return true;
78
+ }
79
+ else if (hasTopSide) {
80
+ return -wx <= y;
81
+ }
82
+ else if (hasLeftSide) {
83
+ return x <= -wx;
84
+ }
85
+ else {
86
+ return false;
87
+ }
88
+ }
89
+ else if (+wy - wr <= y) {
90
+ var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
91
+ if (hasBottomSide && hasLeftSide) {
92
+ return true;
93
+ }
94
+ else if (hasBottomSide) {
95
+ return +wx <= y;
96
+ }
97
+ else if (hasLeftSide) {
98
+ return x <= -wx;
99
+ }
100
+ else {
101
+ return false;
102
+ }
103
+ }
104
+ else {
105
+ return hasLeftSide;
106
+ }
107
+ }
108
+ else if (+wx - wr <= x) {
109
+ var hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);
110
+ if (y <= -wy + wr) {
111
+ var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
112
+ if (hasTopSide && hasRightSide) {
113
+ return true;
114
+ }
115
+ else if (hasTopSide) {
116
+ return -wx <= y;
117
+ }
118
+ else if (hasRightSide) {
119
+ return +wx <= x;
120
+ }
121
+ else {
122
+ return false;
123
+ }
124
+ }
125
+ else if (+wy - wr <= y) {
126
+ var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
127
+ if (hasBottomSide && hasRightSide) {
128
+ return true;
129
+ }
130
+ else if (hasBottomSide) {
131
+ return +wx <= y;
132
+ }
133
+ else if (hasRightSide) {
134
+ return +wx <= x;
135
+ }
136
+ else {
137
+ return false;
138
+ }
139
+ }
140
+ else {
141
+ return hasRightSide;
142
+ }
143
+ }
144
+ else {
145
+ if (y <= -wy + wr) {
146
+ return !!(strokeSide & EShapeStrokeSide.TOP);
147
+ }
148
+ else if (+wy - wr <= y) {
149
+ return !!(strokeSide & EShapeStrokeSide.BOTTOM);
150
+ }
151
+ else {
152
+ return false;
153
+ }
154
+ }
155
+ }
156
+ }
157
+ return false;
158
+ };
159
+ export var hitTestRectangleRoundedLegacy = function (shape, x, y, ax, ay, sw, ss) {
61
160
  var fill = shape.fill;
62
161
  if (fill.enable || 0 < sw) {
63
162
  var r = shape.radius * Math.min(ax, ay);
64
163
  var corner = shape.corner;
65
- if (hitTestRectangleRounded_(x, y, ax, ay, r, corner)) {
164
+ if (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {
66
165
  if (fill.enable) {
67
166
  return true;
68
167
  }
69
168
  else {
70
- var s = sw * ss;
71
- var wx = Math.max(0.0, ax - s);
72
- var wy = Math.max(0.0, ay - s);
73
- var wr = Math.max(0.0, r - s);
74
- if (!hitTestRectangleRounded_(x, y, wx, wy, wr, corner)) {
75
- var strokeSide = shape.stroke.side;
76
- if (strokeSide === EShapeStrokeSide.ALL) {
77
- return true;
78
- }
79
- else {
80
- if (x <= -wx + wr) {
81
- var hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);
82
- if (y <= -wy + wr) {
83
- var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
84
- if (hasTopSide && hasLeftSide) {
85
- return true;
86
- }
87
- else if (hasTopSide) {
88
- return -wx <= y;
89
- }
90
- else if (hasLeftSide) {
91
- return x <= -wx;
92
- }
93
- else {
94
- return false;
95
- }
96
- }
97
- else if (+wy - wr <= y) {
98
- var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
99
- if (hasBottomSide && hasLeftSide) {
100
- return true;
101
- }
102
- else if (hasBottomSide) {
103
- return +wx <= y;
104
- }
105
- else if (hasLeftSide) {
106
- return x <= -wx;
107
- }
108
- else {
109
- return false;
110
- }
111
- }
112
- else {
113
- return hasLeftSide;
114
- }
115
- }
116
- else if (+wx - wr <= x) {
117
- var hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);
118
- if (y <= -wy + wr) {
119
- var hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);
120
- if (hasTopSide && hasRightSide) {
121
- return true;
122
- }
123
- else if (hasTopSide) {
124
- return -wx <= y;
125
- }
126
- else if (hasRightSide) {
127
- return +wx <= x;
128
- }
129
- else {
130
- return false;
131
- }
132
- }
133
- else if (+wy - wr <= y) {
134
- var hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);
135
- if (hasBottomSide && hasRightSide) {
136
- return true;
137
- }
138
- else if (hasBottomSide) {
139
- return +wx <= y;
140
- }
141
- else if (hasRightSide) {
142
- return +wx <= x;
143
- }
144
- else {
145
- return false;
146
- }
147
- }
148
- else {
149
- return hasRightSide;
150
- }
151
- }
152
- else {
153
- if (y <= -wy + wr) {
154
- return !!(strokeSide & EShapeStrokeSide.TOP);
155
- }
156
- else if (+wy - wr <= y) {
157
- return !!(strokeSide & EShapeStrokeSide.BOTTOM);
158
- }
159
- else {
160
- return false;
161
- }
162
- }
163
- }
169
+ if (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {
170
+ return true;
164
171
  }
165
172
  }
166
173
  }
167
174
  }
168
175
  return false;
169
176
  };
177
+ export var hitTestRectangleRounded = function (shape, x, y, ax, ay, sw, ss) {
178
+ var fill = shape.fill;
179
+ if (fill.enable || 0 < sw) {
180
+ var r = shape.radius * Math.min(ax, ay);
181
+ var corner = shape.corner;
182
+ if (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {
183
+ if (hitTestFill(x, y, ax, ay, fill)) {
184
+ return true;
185
+ }
186
+ if (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {
187
+ return true;
188
+ }
189
+ }
190
+ }
191
+ return false;
192
+ };
170
193
  //# sourceMappingURL=hit-test-rectangle-rounded.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"hit-test-rectangle-rounded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeCorner } from \"../e-shape-corner\";\nimport { EShapeStrokeSide } from \"../e-shape-stroke-side\";\n\nconst hitTestRectangleRounded_ = (\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tr: number,\n\tcorner: EShapeCorner\n): boolean => {\n\tconst bx0 = -ax + r;\n\tif (x <= bx0) {\n\t\tconst by0 = -ay + r;\n\t\tif (y <= by0 && corner & EShapeCorner.TOP_LEFT) {\n\t\t\t// Top-left corner\n\t\t\tconst dx = x - bx0;\n\t\t\tconst dy = y - by0;\n\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t} else {\n\t\t\tconst by1 = +ay - r;\n\t\t\tif (by1 <= y && corner & EShapeCorner.BOTTOM_LEFT) {\n\t\t\t\t// Bottom-left corner\n\t\t\t\tconst dx = x - bx0;\n\t\t\t\tconst dy = y - by1;\n\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t} else {\n\t\t\t\t// Middle-left box\n\t\t\t\treturn -ax <= x;\n\t\t\t}\n\t\t}\n\t} else {\n\t\tconst bx1 = +ax - r;\n\t\tif (bx1 <= x) {\n\t\t\tconst by0 = -ay + r;\n\t\t\tif (y <= by0 && corner & EShapeCorner.TOP_RIGHT) {\n\t\t\t\t// Top-right corner\n\t\t\t\tconst dx = x - bx1;\n\t\t\t\tconst dy = y - by0;\n\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t} else {\n\t\t\t\tconst by1 = +ay - r;\n\t\t\t\tif (by1 <= y && corner & EShapeCorner.BOTTOM_RIGHT) {\n\t\t\t\t\t// Bottom-right corner\n\t\t\t\t\tconst dx = x - bx1;\n\t\t\t\t\tconst dy = y - by1;\n\t\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t\t} else {\n\t\t\t\t\t// Middle-right box\n\t\t\t\t\treturn x <= +ax;\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\treturn -ay <= y && y <= +ay;\n\t\t}\n\t}\n};\n\nexport const hitTestRectangleRounded = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst fill = shape.fill;\n\tif (fill.enable || 0 < sw) {\n\t\tconst r = shape.radius * Math.min(ax, ay);\n\t\tconst corner = shape.corner;\n\t\tif (hitTestRectangleRounded_(x, y, ax, ay, r, corner)) {\n\t\t\tif (fill.enable) {\n\t\t\t\treturn true;\n\t\t\t} else {\n\t\t\t\tconst s = sw * ss;\n\t\t\t\tconst wx = Math.max(0.0, ax - s);\n\t\t\t\tconst wy = Math.max(0.0, ay - s);\n\t\t\t\tconst wr = Math.max(0.0, r - s);\n\t\t\t\tif (!hitTestRectangleRounded_(x, y, wx, wy, wr, corner)) {\n\t\t\t\t\tconst strokeSide = shape.stroke.side;\n\t\t\t\t\tif (strokeSide === EShapeStrokeSide.ALL) {\n\t\t\t\t\t\treturn true;\n\t\t\t\t\t} else {\n\t\t\t\t\t\tif (x <= -wx + wr) {\n\t\t\t\t\t\t\tconst hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);\n\t\t\t\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\t\t\t\tconst hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\t\t\t\tif (hasTopSide && hasLeftSide) {\n\t\t\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t\t\t} else if (hasTopSide) {\n\t\t\t\t\t\t\t\t\treturn -wx <= y;\n\t\t\t\t\t\t\t\t} else if (hasLeftSide) {\n\t\t\t\t\t\t\t\t\treturn x <= -wx;\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\t\t\t\tconst hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\t\t\t\tif (hasBottomSide && hasLeftSide) {\n\t\t\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t\t\t} else if (hasBottomSide) {\n\t\t\t\t\t\t\t\t\treturn +wx <= y;\n\t\t\t\t\t\t\t\t} else if (hasLeftSide) {\n\t\t\t\t\t\t\t\t\treturn x <= -wx;\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\treturn hasLeftSide;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} else if (+wx - wr <= x) {\n\t\t\t\t\t\t\tconst hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);\n\t\t\t\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\t\t\t\tconst hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\t\t\t\tif (hasTopSide && hasRightSide) {\n\t\t\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t\t\t} else if (hasTopSide) {\n\t\t\t\t\t\t\t\t\treturn -wx <= y;\n\t\t\t\t\t\t\t\t} else if (hasRightSide) {\n\t\t\t\t\t\t\t\t\treturn +wx <= x;\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\t\t\t\tconst hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\t\t\t\tif (hasBottomSide && hasRightSide) {\n\t\t\t\t\t\t\t\t\treturn true;\n\t\t\t\t\t\t\t\t} else if (hasBottomSide) {\n\t\t\t\t\t\t\t\t\treturn +wx <= y;\n\t\t\t\t\t\t\t\t} else if (hasRightSide) {\n\t\t\t\t\t\t\t\t\treturn +wx <= x;\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\treturn hasRightSide;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n"]}
1
+ {"version":3,"file":"hit-test-rectangle-rounded.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-rectangle-rounded.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeCorner } from \"../e-shape-corner\";\nimport { EShapeStrokeSide } from \"../e-shape-stroke-side\";\nimport { hitTestFill } from \"./hit-test-fill\";\n\nconst hitTestRectangleRoundedFilled = (\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tr: number,\n\tcorner: EShapeCorner\n): boolean => {\n\tconst bx0 = -ax + r;\n\tif (x <= bx0) {\n\t\tconst by0 = -ay + r;\n\t\tif (y <= by0 && corner & EShapeCorner.TOP_LEFT) {\n\t\t\t// Top-left corner\n\t\t\tconst dx = x - bx0;\n\t\t\tconst dy = y - by0;\n\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t} else {\n\t\t\tconst by1 = +ay - r;\n\t\t\tif (by1 <= y && corner & EShapeCorner.BOTTOM_LEFT) {\n\t\t\t\t// Bottom-left corner\n\t\t\t\tconst dx = x - bx0;\n\t\t\t\tconst dy = y - by1;\n\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t} else {\n\t\t\t\t// Middle-left box\n\t\t\t\treturn -ax <= x;\n\t\t\t}\n\t\t}\n\t} else {\n\t\tconst bx1 = +ax - r;\n\t\tif (bx1 <= x) {\n\t\t\tconst by0 = -ay + r;\n\t\t\tif (y <= by0 && corner & EShapeCorner.TOP_RIGHT) {\n\t\t\t\t// Top-right corner\n\t\t\t\tconst dx = x - bx1;\n\t\t\t\tconst dy = y - by0;\n\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t} else {\n\t\t\t\tconst by1 = +ay - r;\n\t\t\t\tif (by1 <= y && corner & EShapeCorner.BOTTOM_RIGHT) {\n\t\t\t\t\t// Bottom-right corner\n\t\t\t\t\tconst dx = x - bx1;\n\t\t\t\t\tconst dy = y - by1;\n\t\t\t\t\treturn dx * dx + dy * dy <= r * r;\n\t\t\t\t} else {\n\t\t\t\t\t// Middle-right box\n\t\t\t\t\treturn x <= +ax;\n\t\t\t\t}\n\t\t\t}\n\t\t} else {\n\t\t\treturn -ay <= y && y <= +ay;\n\t\t}\n\t}\n};\n\nconst hitTestRectangleRoundedStroke = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number,\n\tr: number,\n\tcorner: EShapeCorner\n): boolean => {\n\tconst s = sw * ss;\n\tconst wx = Math.max(0.0, ax - s);\n\tconst wy = Math.max(0.0, ay - s);\n\tconst wr = Math.max(0.0, r - s);\n\tif (!hitTestRectangleRoundedFilled(x, y, wx, wy, wr, corner)) {\n\t\tconst strokeSide = shape.stroke.side;\n\t\tif (strokeSide === EShapeStrokeSide.ALL) {\n\t\t\treturn true;\n\t\t} else {\n\t\t\tif (x <= -wx + wr) {\n\t\t\t\tconst hasLeftSide = !!(strokeSide & EShapeStrokeSide.LEFT);\n\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\tconst hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\tif (hasTopSide && hasLeftSide) {\n\t\t\t\t\t\treturn true;\n\t\t\t\t\t} else if (hasTopSide) {\n\t\t\t\t\t\treturn -wx <= y;\n\t\t\t\t\t} else if (hasLeftSide) {\n\t\t\t\t\t\treturn x <= -wx;\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\tconst hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\tif (hasBottomSide && hasLeftSide) {\n\t\t\t\t\t\treturn true;\n\t\t\t\t\t} else if (hasBottomSide) {\n\t\t\t\t\t\treturn +wx <= y;\n\t\t\t\t\t} else if (hasLeftSide) {\n\t\t\t\t\t\treturn x <= -wx;\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\treturn hasLeftSide;\n\t\t\t\t}\n\t\t\t} else if (+wx - wr <= x) {\n\t\t\t\tconst hasRightSide = !!(strokeSide & EShapeStrokeSide.RIGHT);\n\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\tconst hasTopSide = !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\tif (hasTopSide && hasRightSide) {\n\t\t\t\t\t\treturn true;\n\t\t\t\t\t} else if (hasTopSide) {\n\t\t\t\t\t\treturn -wx <= y;\n\t\t\t\t\t} else if (hasRightSide) {\n\t\t\t\t\t\treturn +wx <= x;\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\tconst hasBottomSide = !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\tif (hasBottomSide && hasRightSide) {\n\t\t\t\t\t\treturn true;\n\t\t\t\t\t} else if (hasBottomSide) {\n\t\t\t\t\t\treturn +wx <= y;\n\t\t\t\t\t} else if (hasRightSide) {\n\t\t\t\t\t\treturn +wx <= x;\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\treturn hasRightSide;\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tif (y <= -wy + wr) {\n\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t} else if (+wy - wr <= y) {\n\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t} else {\n\t\t\t\t\treturn false;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestRectangleRoundedLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst fill = shape.fill;\n\tif (fill.enable || 0 < sw) {\n\t\tconst r = shape.radius * Math.min(ax, ay);\n\t\tconst corner = shape.corner;\n\t\tif (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {\n\t\t\tif (fill.enable) {\n\t\t\t\treturn true;\n\t\t\t} else {\n\t\t\t\tif (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestRectangleRounded = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst fill = shape.fill;\n\tif (fill.enable || 0 < sw) {\n\t\tconst r = shape.radius * Math.min(ax, ay);\n\t\tconst corner = shape.corner;\n\t\tif (hitTestRectangleRoundedFilled(x, y, ax, ay, r, corner)) {\n\t\t\tif (hitTestFill(x, y, ax, ay, fill)) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t\tif (hitTestRectangleRoundedStroke(shape, x, y, ax, ay, sw, ss, r, corner)) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n"]}
@@ -2,9 +2,9 @@
2
2
  * Copyright (C) 2019 Toshiba Corporation
3
3
  * SPDX-License-Identifier: Apache-2.0
4
4
  */
5
- import { EShapeFillDirection } from "../e-shape-fill-direction";
6
5
  import { EShapeStrokeSide } from "../e-shape-stroke-side";
7
6
  import { hitTestBBox } from "./hit-test-bbox";
7
+ import { hitTestFill } from "./hit-test-fill";
8
8
  export var hitTestRectangleLegacy = function (shape, x, y, ax, ay, sw, ss) {
9
9
  if (hitTestBBox(x, y, ax, ay)) {
10
10
  var fill = shape.fill;
@@ -70,34 +70,8 @@ export var hitTestRectangle = function (shape, x, y, ax, ay, sw, ss) {
70
70
  if (!hitTestBBox(x, y, ax, ay)) {
71
71
  return false;
72
72
  }
73
- var fill = shape.fill;
74
- if (fill.enable) {
75
- var percent = Math.max(0, Math.min(1, fill.percent));
76
- if (1 <= percent) {
77
- return true;
78
- }
79
- switch (fill.direction) {
80
- case EShapeFillDirection.TOP:
81
- if (y + ay <= percent * (2 * ay)) {
82
- return true;
83
- }
84
- break;
85
- case EShapeFillDirection.RIGHT:
86
- if ((1 - percent) * (2 * ax) <= x + ax) {
87
- return true;
88
- }
89
- break;
90
- case EShapeFillDirection.BOTTOM:
91
- if ((1 - percent) * (2 * ay) <= y + ay) {
92
- return true;
93
- }
94
- break;
95
- case EShapeFillDirection.LEFT:
96
- if (x + ax <= percent * (2 * ax)) {
97
- return true;
98
- }
99
- break;
100
- }
73
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
74
+ return true;
101
75
  }
102
76
  return hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);
103
77
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hit-test-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-rectangle.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeFillDirection } from \"../e-shape-fill-direction\";\nimport { EShapeStrokeSide } from \"../e-shape-stroke-side\";\nimport { hitTestBBox } from \"./hit-test-bbox\";\n\nexport const hitTestRectangleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (hitTestBBox(x, y, ax, ay)) {\n\t\tconst fill = shape.fill;\n\t\tif (fill.enable) {\n\t\t\treturn true;\n\t\t} else {\n\t\t\treturn hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);\n\t\t}\n\t}\n\treturn false;\n};\n\nconst hitTestRectangleStroke = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst strokeSide = shape.stroke.side;\n\tif (0 < sw && strokeSide !== EShapeStrokeSide.NONE) {\n\t\tconst s = sw * ss;\n\t\tconst wx = Math.max(0.0, ax - s);\n\t\tconst wy = Math.max(0.0, ay - s);\n\t\tif (!hitTestBBox(x, y, wx, wy)) {\n\t\t\tif (strokeSide === EShapeStrokeSide.ALL) {\n\t\t\t\treturn true;\n\t\t\t} else {\n\t\t\t\tif (x <= -wx) {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP_OR_LEFT);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_LEFT);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.LEFT);\n\t\t\t\t\t}\n\t\t\t\t} else if (+wx <= x) {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP_OR_RIGHT);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_RIGHT);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.RIGHT);\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestRectangle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (!hitTestBBox(x, y, ax, ay)) {\n\t\treturn false;\n\t}\n\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\tconst percent = Math.max(0, Math.min(1, fill.percent));\n\t\tif (1 <= percent) {\n\t\t\treturn true;\n\t\t}\n\n\t\tswitch (fill.direction) {\n\t\t\tcase EShapeFillDirection.TOP:\n\t\t\t\tif (y + ay <= percent * (2 * ay)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.RIGHT:\n\t\t\t\tif ((1 - percent) * (2 * ax) <= x + ax) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.BOTTOM:\n\t\t\t\tif ((1 - percent) * (2 * ay) <= y + ay) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.LEFT:\n\t\t\t\tif (x + ax <= percent * (2 * ax)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t}\n\t}\n\n\treturn hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);\n};\n"]}
1
+ {"version":3,"file":"hit-test-rectangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-rectangle.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeStrokeSide } from \"../e-shape-stroke-side\";\nimport { hitTestBBox } from \"./hit-test-bbox\";\nimport { hitTestFill } from \"./hit-test-fill\";\n\nexport const hitTestRectangleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (hitTestBBox(x, y, ax, ay)) {\n\t\tconst fill = shape.fill;\n\t\tif (fill.enable) {\n\t\t\treturn true;\n\t\t} else {\n\t\t\treturn hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);\n\t\t}\n\t}\n\treturn false;\n};\n\nconst hitTestRectangleStroke = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst strokeSide = shape.stroke.side;\n\tif (0 < sw && strokeSide !== EShapeStrokeSide.NONE) {\n\t\tconst s = sw * ss;\n\t\tconst wx = Math.max(0.0, ax - s);\n\t\tconst wy = Math.max(0.0, ay - s);\n\t\tif (!hitTestBBox(x, y, wx, wy)) {\n\t\t\tif (strokeSide === EShapeStrokeSide.ALL) {\n\t\t\t\treturn true;\n\t\t\t} else {\n\t\t\t\tif (x <= -wx) {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP_OR_LEFT);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_LEFT);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.LEFT);\n\t\t\t\t\t}\n\t\t\t\t} else if (+wx <= x) {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP_OR_RIGHT);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_RIGHT);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.RIGHT);\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tif (y <= -wy) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.TOP);\n\t\t\t\t\t} else if (+wy <= y) {\n\t\t\t\t\t\treturn !!(strokeSide & EShapeStrokeSide.BOTTOM);\n\t\t\t\t\t} else {\n\t\t\t\t\t\treturn false;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestRectangle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (!hitTestBBox(x, y, ax, ay)) {\n\t\treturn false;\n\t}\n\tif (hitTestFill(x, y, ax, ay, shape.fill)) {\n\t\treturn true;\n\t}\n\treturn hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);\n};\n"]}
@@ -2,7 +2,7 @@
2
2
  * Copyright (C) 2019 Toshiba Corporation
3
3
  * SPDX-License-Identifier: Apache-2.0
4
4
  */
5
- import { EShapeFillDirection } from "../e-shape-fill-direction";
5
+ import { hitTestFill } from "./hit-test-fill";
6
6
  export var hitTestTriangleFilled = function (x, y, a, ay1, ay2) {
7
7
  // a = 2 * ay / ax
8
8
  // y = + a * x + ay1
@@ -44,34 +44,8 @@ export var hitTestTriangle = function (shape, x, y, ax, ay, sw, ss) {
44
44
  if (!hitTestTriangleFilled(x, y, a, -ay, +ay)) {
45
45
  return false;
46
46
  }
47
- var fill = shape.fill;
48
- if (fill.enable) {
49
- var percent = Math.max(0, Math.min(1, fill.percent));
50
- if (1 <= percent) {
51
- return true;
52
- }
53
- switch (fill.direction) {
54
- case EShapeFillDirection.TOP:
55
- if (y + ay <= percent * (2 * ay)) {
56
- return true;
57
- }
58
- break;
59
- case EShapeFillDirection.RIGHT:
60
- if ((1 - percent) * (2 * ax) <= x + ax) {
61
- return true;
62
- }
63
- break;
64
- case EShapeFillDirection.BOTTOM:
65
- if ((1 - percent) * (2 * ay) <= y + ay) {
66
- return true;
67
- }
68
- break;
69
- case EShapeFillDirection.LEFT:
70
- if (x + ax <= percent * (2 * ax)) {
71
- return true;
72
- }
73
- break;
74
- }
47
+ if (hitTestFill(x, y, ax, ay, shape.fill)) {
48
+ return true;
75
49
  }
76
50
  return hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);
77
51
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hit-test-triangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-triangle.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { EShapeFillDirection } from \"../e-shape-fill-direction\";\n\nexport const hitTestTriangleFilled = (\n\tx: number,\n\ty: number,\n\ta: number,\n\tay1: number,\n\tay2: number\n): boolean => {\n\t// a = 2 * ay / ax\n\t// y = + a * x + ay1\n\t// y = - a * x + ay1\n\t// y = ay2;\n\treturn +a * x + ay1 - y <= 0 && -a * x + ay1 - y <= 0 && y <= ay2;\n};\n\nexport const hitTestTriangleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst a = (2 * ay) / ax;\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\tif (hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\t\treturn true;\n\t\t}\n\t} else {\n\t\treturn hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);\n\t}\n\treturn false;\n};\n\nconst hitTestTriangleStroke = (\n\tx: number,\n\ty: number,\n\ta: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (0 < sw) {\n\t\tconst s = sw * ss;\n\t\tif (hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\t\tconst az = Math.sqrt(ax * ax + 4 * ay * ay);\n\t\t\tconst aw = (2 * ax * ay) / (ax + az);\n\n\t\t\tconst cy = ay - aw;\n\t\t\tconst ay1 = cy + ((-ay - cy) * Math.max(0.0, aw - s)) / aw;\n\t\t\tconst ay2 = ay - s;\n\t\t\tif (!hitTestTriangleFilled(x, y, a, ay1, ay2)) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestTriangle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst a = (2 * ay) / ax;\n\tif (!hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\treturn false;\n\t}\n\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\tconst percent = Math.max(0, Math.min(1, fill.percent));\n\t\tif (1 <= percent) {\n\t\t\treturn true;\n\t\t}\n\n\t\tswitch (fill.direction) {\n\t\t\tcase EShapeFillDirection.TOP:\n\t\t\t\tif (y + ay <= percent * (2 * ay)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.RIGHT:\n\t\t\t\tif ((1 - percent) * (2 * ax) <= x + ax) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.BOTTOM:\n\t\t\t\tif ((1 - percent) * (2 * ay) <= y + ay) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\tcase EShapeFillDirection.LEFT:\n\t\t\t\tif (x + ax <= percent * (2 * ax)) {\n\t\t\t\t\treturn true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t}\n\t}\n\n\treturn hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);\n};\n"]}
1
+ {"version":3,"file":"hit-test-triangle.js","sourceRoot":"","sources":["../../../../../src/main/typescript/wcardinal/ui/shape/variant/hit-test-triangle.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { EShape } from \"../e-shape\";\nimport { hitTestFill } from \"./hit-test-fill\";\n\nexport const hitTestTriangleFilled = (\n\tx: number,\n\ty: number,\n\ta: number,\n\tay1: number,\n\tay2: number\n): boolean => {\n\t// a = 2 * ay / ax\n\t// y = + a * x + ay1\n\t// y = - a * x + ay1\n\t// y = ay2;\n\treturn +a * x + ay1 - y <= 0 && -a * x + ay1 - y <= 0 && y <= ay2;\n};\n\nexport const hitTestTriangleLegacy = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst a = (2 * ay) / ax;\n\tconst fill = shape.fill;\n\tif (fill.enable) {\n\t\tif (hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\t\treturn true;\n\t\t}\n\t} else {\n\t\treturn hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);\n\t}\n\treturn false;\n};\n\nconst hitTestTriangleStroke = (\n\tx: number,\n\ty: number,\n\ta: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tif (0 < sw) {\n\t\tconst s = sw * ss;\n\t\tif (hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\t\tconst az = Math.sqrt(ax * ax + 4 * ay * ay);\n\t\t\tconst aw = (2 * ax * ay) / (ax + az);\n\n\t\t\tconst cy = ay - aw;\n\t\t\tconst ay1 = cy + ((-ay - cy) * Math.max(0.0, aw - s)) / aw;\n\t\t\tconst ay2 = ay - s;\n\t\t\tif (!hitTestTriangleFilled(x, y, a, ay1, ay2)) {\n\t\t\t\treturn true;\n\t\t\t}\n\t\t}\n\t}\n\treturn false;\n};\n\nexport const hitTestTriangle = (\n\tshape: EShape,\n\tx: number,\n\ty: number,\n\tax: number,\n\tay: number,\n\tsw: number,\n\tss: number\n): boolean => {\n\tconst a = (2 * ay) / ax;\n\tif (!hitTestTriangleFilled(x, y, a, -ay, +ay)) {\n\t\treturn false;\n\t}\n\tif (hitTestFill(x, y, ax, ay, shape.fill)) {\n\t\treturn true;\n\t}\n\treturn hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);\n};\n"]}
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.0
2
+ Winter Cardinal UI v0.467.1
3
3
  Copyright (C) 2019-2026 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.0
2
+ Winter Cardinal UI v0.467.1
3
3
  Copyright (C) 2019-2026 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.0
2
+ Winter Cardinal UI v0.467.1
3
3
  Copyright (C) 2019-2026 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*!
2
- Winter Cardinal UI v0.467.0
2
+ Winter Cardinal UI v0.467.1
3
3
  Copyright (C) 2019-2026 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5