@wcardinal/wcardinal-ui 0.466.0 → 0.466.2-beta.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.
- package/dist/types/wcardinal/ui/shape/e-shape-transform.d.ts +8 -0
- package/dist/types/wcardinal/ui/shape/e-shape-type.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/load/index.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/load/load-shape-triangle-legacy.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/variant/build-triangle-legacy.d.ts +9 -0
- package/dist/types/wcardinal/ui/shape/variant/build-triangle.d.ts +1 -9
- package/dist/types/wcardinal/ui/shape/variant/builder-triangle-legacy.d.ts +9 -0
- package/dist/types/wcardinal/ui/shape/variant/builder-triangle.d.ts +1 -9
- package/dist/types/wcardinal/ui/shape/variant/create-triangle-legacy-uploaded.d.ts +4 -0
- package/dist/types/wcardinal/ui/shape/variant/create-triangle-uploaded.d.ts +1 -4
- package/dist/types/wcardinal/ui/shape/variant/deserialize-triangle-legacy.d.ts +4 -0
- package/dist/types/wcardinal/ui/shape/variant/e-shape-rectangle-triangulated-impl.d.ts +2 -2
- package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-legacy.d.ts +7 -0
- package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-triangulated-impl.d.ts +42 -0
- package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle-triangulated.d.ts +3 -0
- package/dist/types/wcardinal/ui/shape/variant/e-shape-triangle.d.ts +4 -0
- package/dist/types/wcardinal/ui/shape/variant/hit-test-circle.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/variant/hit-test-rectangle.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/variant/hit-test-triangle.d.ts +1 -0
- package/dist/types/wcardinal/ui/shape/variant/index.d.ts +7 -0
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-move-forward-or-backward.js +1 -3
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-move-forward-or-backward.js.map +1 -1
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-move-left-or-right.js +1 -3
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-move-left-or-right.js.map +1 -1
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-resize.js +1 -3
- package/dist/wcardinal/ui/shape/action/e-shape-action-runtime-transform-resize.js.map +1 -1
- package/dist/wcardinal/ui/shape/e-shape-renderer.js +1 -1
- package/dist/wcardinal/ui/shape/e-shape-renderer.js.map +1 -1
- package/dist/wcardinal/ui/shape/e-shape-transform.js +28 -0
- package/dist/wcardinal/ui/shape/e-shape-transform.js.map +1 -1
- package/dist/wcardinal/ui/shape/e-shape-type.js +1 -0
- package/dist/wcardinal/ui/shape/e-shape-type.js.map +1 -1
- package/dist/wcardinal/ui/shape/load/index.js +1 -0
- package/dist/wcardinal/ui/shape/load/index.js.map +1 -1
- package/dist/wcardinal/ui/shape/load/load-shape-all.js +2 -0
- package/dist/wcardinal/ui/shape/load/load-shape-all.js.map +1 -1
- package/dist/wcardinal/ui/shape/load/load-shape-triangle-legacy.js +14 -0
- package/dist/wcardinal/ui/shape/load/load-shape-triangle-legacy.js.map +1 -0
- package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js +1 -1
- package/dist/wcardinal/ui/shape/load/load-shape-triangle-rounded.js.map +1 -1
- package/dist/wcardinal/ui/shape/load/load-shape-triangle.js +2 -2
- package/dist/wcardinal/ui/shape/load/load-shape-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js +160 -0
- package/dist/wcardinal/ui/shape/variant/build-triangle-legacy.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/build-triangle.js +5 -159
- package/dist/wcardinal/ui/shape/variant/build-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/builder-line-of-triangles.js +16 -16
- package/dist/wcardinal/ui/shape/variant/builder-line-of-triangles.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/builder-marker-triangle.js +6 -6
- package/dist/wcardinal/ui/shape/variant/builder-marker-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/builder-triangle-legacy.js +71 -0
- package/dist/wcardinal/ui/shape/variant/builder-triangle-legacy.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/builder-triangle.js +1 -66
- package/dist/wcardinal/ui/shape/variant/builder-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/create-line-of-triangles-uploaded.js +2 -2
- package/dist/wcardinal/ui/shape/variant/create-line-of-triangles-uploaded.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/create-line-uploaded.js +3 -3
- package/dist/wcardinal/ui/shape/variant/create-line-uploaded.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/create-triangle-legacy-uploaded.js +24 -0
- package/dist/wcardinal/ui/shape/variant/create-triangle-legacy-uploaded.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/create-triangle-uploaded.js +1 -19
- package/dist/wcardinal/ui/shape/variant/create-triangle-uploaded.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/deserialize-triangle-legacy.js +10 -0
- package/dist/wcardinal/ui/shape/variant/deserialize-triangle-legacy.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-circle-legacy.js +2 -2
- package/dist/wcardinal/ui/shape/variant/e-shape-circle-legacy.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-line-base.js +6 -6
- package/dist/wcardinal/ui/shape/variant/e-shape-line-base.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-line-of-circles.js +2 -2
- package/dist/wcardinal/ui/shape/variant/e-shape-line-of-circles.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-legacy.js +2 -2
- package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-legacy.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-rectangle-triangulated-impl.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-legacy.js +27 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-legacy.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-triangulated-impl.js +264 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-triangulated-impl.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-triangulated.js +6 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle-triangulated.js.map +1 -0
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle.js +14 -1
- package/dist/wcardinal/ui/shape/variant/e-shape-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/hit-test-circle.js +54 -20
- package/dist/wcardinal/ui/shape/variant/hit-test-circle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js +82 -42
- package/dist/wcardinal/ui/shape/variant/hit-test-rectangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/hit-test-semicircle.js +2 -2
- package/dist/wcardinal/ui/shape/variant/hit-test-semicircle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js +53 -12
- package/dist/wcardinal/ui/shape/variant/hit-test-triangle.js.map +1 -1
- package/dist/wcardinal/ui/shape/variant/index.js +7 -0
- package/dist/wcardinal/ui/shape/variant/index.js.map +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark.js +1 -1
- package/dist/wcardinal-ui-theme-dark.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-white.js +1 -1
- package/dist/wcardinal-ui-theme-white.min.js +1 -1
- package/dist/wcardinal-ui.cjs.js +803 -336
- package/dist/wcardinal-ui.js +803 -336
- package/dist/wcardinal-ui.min.js +2 -2
- package/dist/wcardinal-ui.min.js.map +1 -1
- package/package.json +1 -1
package/dist/wcardinal-ui.cjs.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
Winter Cardinal UI v0.466.0
|
|
2
|
+
Winter Cardinal UI v0.466.2-beta.0
|
|
3
3
|
Copyright (C) 2019-2026 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -59,6 +59,7 @@ var EShapeType = {
|
|
|
59
59
|
POLYGON: 26,
|
|
60
60
|
CIRCLE_LEGACY: 27,
|
|
61
61
|
RECTANGLE_LEGACY: 28,
|
|
62
|
+
TRIANGLE_LEGACY: 29,
|
|
62
63
|
EXTENSION: 1000
|
|
63
64
|
};
|
|
64
65
|
|
|
@@ -4580,6 +4581,34 @@ var EShapeTransformImpl = /** @class */ (function (_super) {
|
|
|
4580
4581
|
EShapeTransformImpl.prototype.getWorldId = function () {
|
|
4581
4582
|
return this._worldID;
|
|
4582
4583
|
};
|
|
4584
|
+
Object.defineProperty(EShapeTransformImpl.prototype, "cx", {
|
|
4585
|
+
get: function () {
|
|
4586
|
+
return this._cx;
|
|
4587
|
+
},
|
|
4588
|
+
enumerable: false,
|
|
4589
|
+
configurable: true
|
|
4590
|
+
});
|
|
4591
|
+
Object.defineProperty(EShapeTransformImpl.prototype, "sx", {
|
|
4592
|
+
get: function () {
|
|
4593
|
+
return this._sx;
|
|
4594
|
+
},
|
|
4595
|
+
enumerable: false,
|
|
4596
|
+
configurable: true
|
|
4597
|
+
});
|
|
4598
|
+
Object.defineProperty(EShapeTransformImpl.prototype, "cy", {
|
|
4599
|
+
get: function () {
|
|
4600
|
+
return this._cy;
|
|
4601
|
+
},
|
|
4602
|
+
enumerable: false,
|
|
4603
|
+
configurable: true
|
|
4604
|
+
});
|
|
4605
|
+
Object.defineProperty(EShapeTransformImpl.prototype, "sy", {
|
|
4606
|
+
get: function () {
|
|
4607
|
+
return this._sy;
|
|
4608
|
+
},
|
|
4609
|
+
enumerable: false,
|
|
4610
|
+
configurable: true
|
|
4611
|
+
});
|
|
4583
4612
|
EShapeTransformImpl.prototype.updateTransform = function (parentTransform) {
|
|
4584
4613
|
var oldLocalId = this._currentLocalID;
|
|
4585
4614
|
var oldWorldId = this._worldID;
|
|
@@ -8447,92 +8476,129 @@ var EShapePrimitive = /** @class */ (function (_super) {
|
|
|
8447
8476
|
* Copyright (C) 2019 Toshiba Corporation
|
|
8448
8477
|
* SPDX-License-Identifier: Apache-2.0
|
|
8449
8478
|
*/
|
|
8450
|
-
var
|
|
8479
|
+
var hitTestCircleLegacy = function (shape, x, y, ax, ay, sw, ss) {
|
|
8451
8480
|
var fill = shape.fill;
|
|
8452
8481
|
if (fill.enable) {
|
|
8482
|
+
return hitTestCircleFilled(x, y, ax, ay);
|
|
8483
|
+
}
|
|
8484
|
+
return hitTestCircleStroke(x, y, ax, ay, sw, ss);
|
|
8485
|
+
};
|
|
8486
|
+
var hitTestCircleFilled = function (x, y, ax, ay) {
|
|
8487
|
+
var x2 = x * x;
|
|
8488
|
+
var y2 = y * y;
|
|
8489
|
+
var ax2 = ax * ax;
|
|
8490
|
+
var ay2 = ay * ay;
|
|
8491
|
+
return x2 * ay2 + y2 * ax2 <= ax2 * ay2;
|
|
8492
|
+
};
|
|
8493
|
+
var hitTestCircleStroke = function (x, y, ax, ay, sw, ss) {
|
|
8494
|
+
if (0 < sw) {
|
|
8495
|
+
var s = sw * ss;
|
|
8453
8496
|
var x2 = x * x;
|
|
8454
8497
|
var y2 = y * y;
|
|
8455
|
-
var
|
|
8456
|
-
var
|
|
8457
|
-
|
|
8458
|
-
|
|
8498
|
+
var wx = Math.max(0.0, ax - s);
|
|
8499
|
+
var wy = Math.max(0.0, ay - s);
|
|
8500
|
+
var wx2 = wx * wx;
|
|
8501
|
+
var wy2 = wy * wy;
|
|
8502
|
+
if (wx2 * wy2 <= x2 * wy2 + y2 * wx2) {
|
|
8503
|
+
return hitTestCircleFilled(x, y, ax, ay);
|
|
8459
8504
|
}
|
|
8460
8505
|
}
|
|
8461
|
-
|
|
8462
|
-
|
|
8463
|
-
|
|
8464
|
-
|
|
8465
|
-
|
|
8466
|
-
|
|
8467
|
-
|
|
8468
|
-
|
|
8469
|
-
|
|
8470
|
-
|
|
8471
|
-
|
|
8472
|
-
|
|
8473
|
-
|
|
8506
|
+
return false;
|
|
8507
|
+
};
|
|
8508
|
+
var hitTestCircle = function (shape, x, y, ax, ay, sw, ss) {
|
|
8509
|
+
if (!hitTestCircleFilled(x, y, ax, ay)) {
|
|
8510
|
+
return false;
|
|
8511
|
+
}
|
|
8512
|
+
var fill = shape.fill;
|
|
8513
|
+
if (fill.enable) {
|
|
8514
|
+
var percent = Math.max(0, Math.min(1, fill.percent));
|
|
8515
|
+
if (1 <= percent) {
|
|
8516
|
+
return true;
|
|
8517
|
+
}
|
|
8518
|
+
switch (fill.direction) {
|
|
8519
|
+
case EShapeFillDirection.TOP:
|
|
8520
|
+
if (y + ay <= percent * (2 * ay)) {
|
|
8474
8521
|
return true;
|
|
8475
8522
|
}
|
|
8476
|
-
|
|
8523
|
+
break;
|
|
8524
|
+
case EShapeFillDirection.RIGHT:
|
|
8525
|
+
if ((1 - percent) * (2 * ax) <= x + ax) {
|
|
8526
|
+
return true;
|
|
8527
|
+
}
|
|
8528
|
+
break;
|
|
8529
|
+
case EShapeFillDirection.BOTTOM:
|
|
8530
|
+
if ((1 - percent) * (2 * ay) <= y + ay) {
|
|
8531
|
+
return true;
|
|
8532
|
+
}
|
|
8533
|
+
break;
|
|
8534
|
+
case EShapeFillDirection.LEFT:
|
|
8535
|
+
if (x + ax <= percent * (2 * ax)) {
|
|
8536
|
+
return true;
|
|
8537
|
+
}
|
|
8538
|
+
break;
|
|
8477
8539
|
}
|
|
8478
8540
|
}
|
|
8479
|
-
return
|
|
8541
|
+
return hitTestCircleStroke(x, y, ax, ay, sw, ss);
|
|
8480
8542
|
};
|
|
8481
8543
|
|
|
8482
8544
|
/*
|
|
8483
8545
|
* Copyright (C) 2019 Toshiba Corporation
|
|
8484
8546
|
* SPDX-License-Identifier: Apache-2.0
|
|
8485
8547
|
*/
|
|
8486
|
-
var
|
|
8548
|
+
var hitTestRectangleLegacy = function (shape, x, y, ax, ay, sw, ss) {
|
|
8487
8549
|
if (hitTestBBox(x, y, ax, ay)) {
|
|
8488
8550
|
var fill = shape.fill;
|
|
8489
8551
|
if (fill.enable) {
|
|
8490
8552
|
return true;
|
|
8491
8553
|
}
|
|
8492
8554
|
else {
|
|
8493
|
-
|
|
8494
|
-
|
|
8495
|
-
|
|
8496
|
-
|
|
8497
|
-
|
|
8498
|
-
|
|
8499
|
-
|
|
8500
|
-
|
|
8555
|
+
return hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);
|
|
8556
|
+
}
|
|
8557
|
+
}
|
|
8558
|
+
return false;
|
|
8559
|
+
};
|
|
8560
|
+
var hitTestRectangleStroke = function (shape, x, y, ax, ay, sw, ss) {
|
|
8561
|
+
var strokeSide = shape.stroke.side;
|
|
8562
|
+
if (0 < sw && strokeSide !== EShapeStrokeSide.NONE) {
|
|
8563
|
+
var s = sw * ss;
|
|
8564
|
+
var wx = Math.max(0.0, ax - s);
|
|
8565
|
+
var wy = Math.max(0.0, ay - s);
|
|
8566
|
+
if (!hitTestBBox(x, y, wx, wy)) {
|
|
8567
|
+
if (strokeSide === EShapeStrokeSide.ALL) {
|
|
8568
|
+
return true;
|
|
8569
|
+
}
|
|
8570
|
+
else {
|
|
8571
|
+
if (x <= -wx) {
|
|
8572
|
+
if (y <= -wy) {
|
|
8573
|
+
return !!(strokeSide & EShapeStrokeSide.TOP_OR_LEFT);
|
|
8574
|
+
}
|
|
8575
|
+
else if (+wy <= y) {
|
|
8576
|
+
return !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_LEFT);
|
|
8501
8577
|
}
|
|
8502
8578
|
else {
|
|
8503
|
-
|
|
8504
|
-
|
|
8505
|
-
|
|
8506
|
-
|
|
8507
|
-
|
|
8508
|
-
|
|
8509
|
-
|
|
8510
|
-
|
|
8511
|
-
|
|
8512
|
-
|
|
8513
|
-
|
|
8514
|
-
|
|
8515
|
-
|
|
8516
|
-
|
|
8517
|
-
|
|
8518
|
-
|
|
8519
|
-
|
|
8520
|
-
|
|
8521
|
-
|
|
8522
|
-
|
|
8523
|
-
|
|
8524
|
-
|
|
8525
|
-
|
|
8526
|
-
if (y <= -wy) {
|
|
8527
|
-
return !!(strokeSide & EShapeStrokeSide.TOP);
|
|
8528
|
-
}
|
|
8529
|
-
else if (+wy <= y) {
|
|
8530
|
-
return !!(strokeSide & EShapeStrokeSide.BOTTOM);
|
|
8531
|
-
}
|
|
8532
|
-
else {
|
|
8533
|
-
return false;
|
|
8534
|
-
}
|
|
8535
|
-
}
|
|
8579
|
+
return !!(strokeSide & EShapeStrokeSide.LEFT);
|
|
8580
|
+
}
|
|
8581
|
+
}
|
|
8582
|
+
else if (+wx <= x) {
|
|
8583
|
+
if (y <= -wy) {
|
|
8584
|
+
return !!(strokeSide & EShapeStrokeSide.TOP_OR_RIGHT);
|
|
8585
|
+
}
|
|
8586
|
+
else if (+wy <= y) {
|
|
8587
|
+
return !!(strokeSide & EShapeStrokeSide.BOTTOM_OR_RIGHT);
|
|
8588
|
+
}
|
|
8589
|
+
else {
|
|
8590
|
+
return !!(strokeSide & EShapeStrokeSide.RIGHT);
|
|
8591
|
+
}
|
|
8592
|
+
}
|
|
8593
|
+
else {
|
|
8594
|
+
if (y <= -wy) {
|
|
8595
|
+
return !!(strokeSide & EShapeStrokeSide.TOP);
|
|
8596
|
+
}
|
|
8597
|
+
else if (+wy <= y) {
|
|
8598
|
+
return !!(strokeSide & EShapeStrokeSide.BOTTOM);
|
|
8599
|
+
}
|
|
8600
|
+
else {
|
|
8601
|
+
return false;
|
|
8536
8602
|
}
|
|
8537
8603
|
}
|
|
8538
8604
|
}
|
|
@@ -8540,6 +8606,41 @@ var hitTestRectangle = function (shape, x, y, ax, ay, sw, ss) {
|
|
|
8540
8606
|
}
|
|
8541
8607
|
return false;
|
|
8542
8608
|
};
|
|
8609
|
+
var hitTestRectangle = function (shape, x, y, ax, ay, sw, ss) {
|
|
8610
|
+
if (!hitTestBBox(x, y, ax, ay)) {
|
|
8611
|
+
return false;
|
|
8612
|
+
}
|
|
8613
|
+
var fill = shape.fill;
|
|
8614
|
+
if (fill.enable) {
|
|
8615
|
+
var percent = Math.max(0, Math.min(1, fill.percent));
|
|
8616
|
+
if (1 <= percent) {
|
|
8617
|
+
return true;
|
|
8618
|
+
}
|
|
8619
|
+
switch (fill.direction) {
|
|
8620
|
+
case EShapeFillDirection.TOP:
|
|
8621
|
+
if (y + ay <= percent * (2 * ay)) {
|
|
8622
|
+
return true;
|
|
8623
|
+
}
|
|
8624
|
+
break;
|
|
8625
|
+
case EShapeFillDirection.RIGHT:
|
|
8626
|
+
if ((1 - percent) * (2 * ax) <= x + ax) {
|
|
8627
|
+
return true;
|
|
8628
|
+
}
|
|
8629
|
+
break;
|
|
8630
|
+
case EShapeFillDirection.BOTTOM:
|
|
8631
|
+
if ((1 - percent) * (2 * ay) <= y + ay) {
|
|
8632
|
+
return true;
|
|
8633
|
+
}
|
|
8634
|
+
break;
|
|
8635
|
+
case EShapeFillDirection.LEFT:
|
|
8636
|
+
if (x + ax <= percent * (2 * ax)) {
|
|
8637
|
+
return true;
|
|
8638
|
+
}
|
|
8639
|
+
break;
|
|
8640
|
+
}
|
|
8641
|
+
}
|
|
8642
|
+
return hitTestRectangleStroke(shape, x, y, ax, ay, sw, ss);
|
|
8643
|
+
};
|
|
8543
8644
|
|
|
8544
8645
|
/*
|
|
8545
8646
|
* Copyright (C) 2019 Toshiba Corporation
|
|
@@ -8552,7 +8653,7 @@ var hitTestTriangleFilled = function (x, y, a, ay1, ay2) {
|
|
|
8552
8653
|
// y = ay2;
|
|
8553
8654
|
return +a * x + ay1 - y <= 0 && -a * x + ay1 - y <= 0 && y <= ay2;
|
|
8554
8655
|
};
|
|
8555
|
-
var
|
|
8656
|
+
var hitTestTriangleLegacy = function (shape, x, y, ax, ay, sw, ss) {
|
|
8556
8657
|
var a = (2 * ay) / ax;
|
|
8557
8658
|
var fill = shape.fill;
|
|
8558
8659
|
if (fill.enable) {
|
|
@@ -8561,22 +8662,62 @@ var hitTestTriangle = function (shape, x, y, ax, ay, sw, ss) {
|
|
|
8561
8662
|
}
|
|
8562
8663
|
}
|
|
8563
8664
|
else {
|
|
8564
|
-
|
|
8565
|
-
|
|
8566
|
-
|
|
8567
|
-
|
|
8568
|
-
|
|
8569
|
-
|
|
8570
|
-
|
|
8571
|
-
|
|
8572
|
-
|
|
8573
|
-
|
|
8574
|
-
|
|
8665
|
+
return hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);
|
|
8666
|
+
}
|
|
8667
|
+
return false;
|
|
8668
|
+
};
|
|
8669
|
+
var hitTestTriangleStroke = function (x, y, a, ax, ay, sw, ss) {
|
|
8670
|
+
if (0 < sw) {
|
|
8671
|
+
var s = sw * ss;
|
|
8672
|
+
if (hitTestTriangleFilled(x, y, a, -ay, +ay)) {
|
|
8673
|
+
var az = Math.sqrt(ax * ax + 4 * ay * ay);
|
|
8674
|
+
var aw = (2 * ax * ay) / (ax + az);
|
|
8675
|
+
var cy = ay - aw;
|
|
8676
|
+
var ay1 = cy + ((-ay - cy) * Math.max(0.0, aw - s)) / aw;
|
|
8677
|
+
var ay2 = ay - s;
|
|
8678
|
+
if (!hitTestTriangleFilled(x, y, a, ay1, ay2)) {
|
|
8679
|
+
return true;
|
|
8575
8680
|
}
|
|
8576
8681
|
}
|
|
8577
8682
|
}
|
|
8578
8683
|
return false;
|
|
8579
8684
|
};
|
|
8685
|
+
var hitTestTriangle = function (shape, x, y, ax, ay, sw, ss) {
|
|
8686
|
+
var a = (2 * ay) / ax;
|
|
8687
|
+
if (!hitTestTriangleFilled(x, y, a, -ay, +ay)) {
|
|
8688
|
+
return false;
|
|
8689
|
+
}
|
|
8690
|
+
var fill = shape.fill;
|
|
8691
|
+
if (fill.enable) {
|
|
8692
|
+
var percent = Math.max(0, Math.min(1, fill.percent));
|
|
8693
|
+
if (1 <= percent) {
|
|
8694
|
+
return true;
|
|
8695
|
+
}
|
|
8696
|
+
switch (fill.direction) {
|
|
8697
|
+
case EShapeFillDirection.TOP:
|
|
8698
|
+
if (y + ay <= percent * (2 * ay)) {
|
|
8699
|
+
return true;
|
|
8700
|
+
}
|
|
8701
|
+
break;
|
|
8702
|
+
case EShapeFillDirection.RIGHT:
|
|
8703
|
+
if ((1 - percent) * (2 * ax) <= x + ax) {
|
|
8704
|
+
return true;
|
|
8705
|
+
}
|
|
8706
|
+
break;
|
|
8707
|
+
case EShapeFillDirection.BOTTOM:
|
|
8708
|
+
if ((1 - percent) * (2 * ay) <= y + ay) {
|
|
8709
|
+
return true;
|
|
8710
|
+
}
|
|
8711
|
+
break;
|
|
8712
|
+
case EShapeFillDirection.LEFT:
|
|
8713
|
+
if (x + ax <= percent * (2 * ax)) {
|
|
8714
|
+
return true;
|
|
8715
|
+
}
|
|
8716
|
+
break;
|
|
8717
|
+
}
|
|
8718
|
+
}
|
|
8719
|
+
return hitTestTriangleStroke(x, y, a, ax, ay, sw, ss);
|
|
8720
|
+
};
|
|
8580
8721
|
|
|
8581
8722
|
/*
|
|
8582
8723
|
* Copyright (C) 2019 Toshiba Corporation
|
|
@@ -8653,11 +8794,11 @@ var EShapeLineBase = /** @class */ (function (_super) {
|
|
|
8653
8794
|
sy += s;
|
|
8654
8795
|
switch (type) {
|
|
8655
8796
|
case EShapePointsMarkerType.CIRCLE:
|
|
8656
|
-
return
|
|
8797
|
+
return hitTestCircleLegacy(this, lx, ly, sx, sy, sw, ss);
|
|
8657
8798
|
case EShapePointsMarkerType.TRIANGLE:
|
|
8658
|
-
return
|
|
8799
|
+
return hitTestTriangleLegacy(this, lx, ly, sx, sy, sw, ss);
|
|
8659
8800
|
case EShapePointsMarkerType.RECTANGLE:
|
|
8660
|
-
return
|
|
8801
|
+
return hitTestRectangleLegacy(this, lx, ly, sx, sy, sw, ss);
|
|
8661
8802
|
}
|
|
8662
8803
|
}
|
|
8663
8804
|
return false;
|
|
@@ -11530,7 +11671,7 @@ var EShapeCircleLegacy = /** @class */ (function (_super) {
|
|
|
11530
11671
|
};
|
|
11531
11672
|
EShapeCircleLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
|
|
11532
11673
|
if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
|
|
11533
|
-
return
|
|
11674
|
+
return hitTestCircleLegacy(this, x, y, ax, ay, sw, ss);
|
|
11534
11675
|
}
|
|
11535
11676
|
return false;
|
|
11536
11677
|
};
|
|
@@ -16713,7 +16854,7 @@ var EShapeRendererIterator = /** @class */ (function () {
|
|
|
16713
16854
|
* SPDX-License-Identifier: Apache-2.0
|
|
16714
16855
|
*/
|
|
16715
16856
|
var VERTEX_SHADER$1 = "\nattribute highp vec2 aPosition;\nattribute highp vec2 aStepA;\nattribute highp vec4 aStepB;\nattribute highp vec3 aColor;\nattribute highp vec2 aUv;\n\nuniform mat3 projectionMatrix;\nuniform mat3 translationMatrix;\nuniform mediump float shapeScale;\nuniform mediump float antialiasWeight;\n\nvarying mediump float vType;\nvarying mediump vec2 vStepA;\nvarying mediump vec4 vStepB;\nvarying mediump vec4 vLength;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nvec2 toInverse(in vec2 v) {\n\treturn vec2(-v.y, v.x);\n}\n\nvec4 toGeneral(in float v) {\n\tvec4 c = vec4(1.0, 1.0/64.0, 1.0/64.0/64.0, 1.0/64.0/64.0/64.0) * v;\n\tc -= fract(c);\n\tc -= c.yzwx * vec4(64.0, 64.0, 64.0, 0.0);\n\treturn c;\n}\n\nfloat toStrokeWidthScale(in float scale) {\n\treturn (\n\t\tscale == 3.0 || scale == 7.0 ?\n\t\tshapeScale : (\n\t\t\tscale == 1.0 || scale == 5.0 ?\n\t\t\tmin(1.0, shapeScale) : (\n\t\t\t\tscale == 2.0 || scale == 6.0 ?\n\t\t\t\tmax(1.0, shapeScale) : 1.0\n\t\t\t)\n\t\t)\n\t);\n}\n\nvec2 toUnpackedClippings(in float v) {\n\tvec2 c = vec2(1.0, 1.0/1024.0) * v;\n\tc -= fract(c);\n\tc -= c.yx * vec2(1024.0, 0.0);\n\tc /= vec2(930.0, 930.0);\n\treturn c;\n}\n\nvec2 toUnpackedAlphas(in float v) {\n\tvec2 c = vec2(1.0, 1.0/1024.0) * v;\n\tc -= fract(c);\n\tc -= c.yx * vec2(1024.0, 0.0);\n\tc /= vec2(1023.0, 1023.0);\n\treturn c;\n}\n\nvec3 toUnpackedF3x256(in float v) {\n\tvec3 c = vec3(1.0, 1.0/256.0, 1.0/256.0/256.0) * v;\n\tc -= fract(c);\n\tc -= c.yzx * vec3(256.0, 256.0, 0.0);\n\tc /= 255.0;\n\treturn c;\n}\n\nvec2 toPosition012(in vec2 v) {\n\treturn (projectionMatrix * translationMatrix * vec3(v, 1.0)).xy;\n}\n\nvec4 toStepB01(in vec4 sb) {\n\treturn vec4(sb.xy, toUnpackedClippings(sb.z));\n}\n\nvec4 toStepB2(in vec4 sb, in float strokeWidth) {\n\tfloat x = min(0.4, 0.4 / 12.0 * sb.x * antialiasWeight);\n\tfloat w = clamp(strokeWidth, 0.0, 1.0) * 0.4;\n\tfloat p = w * sb.y + sb.z;\n\tfloat y = 0.5 - p;\n\tfloat z = 0.5 - p - w;\n\treturn vec4(y, z, y - max(0.01, y - x), z - max(0.01, z - x));\n}\n\nvec2 toPosition3(in float type, in vec2 p, in float npacked, in float length, in float strokeWidth, out float shift) {\n\tvec3 t = vec3(1.0, 1.0/1024.0, 1.0/1024.0/1024.0) * npacked;\n\tt -= fract(t);\n\tt -= t.yzx * vec3(1024.0, 1024.0, 0.0);\n\tt *= vec3(1.0/511.5, 1.0/511.5, 1.0);\n\tt -= vec3(1.0, 1.0, 0.0);\n\tvec2 n0 = vec2(t.x, ((0.5 < t.z && t.z < 1.5) || 2.5 < t.z ? +1.0 : -1.0) * sqrt(max(0.0, 1.0 - t.x * t.x)));\n\tvec2 n1 = vec2(t.y, (1.5 < t.z ? +1.0 : -1.0) * sqrt(max(0.0, 1.0 - t.y * t.y)));\n\n\tvec2 n0i = toInverse(n0);\n\tvec2 n1i = toInverse(n1);\n\tfloat direction = sign(4.5 - type);\n\n\t// Offset\n\tfloat cross = dot(n0i, n1);\n\tbool bcross = 0.00001 < abs(cross);\n\tfloat crossi = (bcross ? 1.0 / cross : 0.0);\n\tfloat b = dot(n1 - n0, n0) * crossi;\n\tfloat offsetSize = direction * strokeWidth * 0.5;\n\tvec2 offset = n1 + n1i * b;\n\n\t// Miter\n\tvec2 pmiter = p + offsetSize * offset;\n\tfloat miterAngle0 = dot( n0i, offsetSize * offset - length * n0i );\n\tfloat miterAngle1 = dot( n1i, offsetSize * offset + length * n1i );\n\tfloat miterLength = dot( offset, offset );\n\tfloat miterSide = direction * cross;\n\n\t// Bevel\n\tvec2 n = (type == 4.0 || type == 6.0 ? n1 : n0);\n\tvec2 pbevel = p + offsetSize * n;\n\n\t//\n\tvec2 presult = (\n\t\t0.0 <= miterSide ?\n\t\t(miterAngle0 < 0.0 && 0.0 <= miterAngle1 && bcross ? pmiter : pbevel) :\n\t\t(miterLength < 6.0 && bcross ? pmiter : pbevel)\n\t);\n\tvec2 ni = (type == 4.0 || type == 6.0 ? n1i : n0i);\n\tshift = dot(ni, p - presult);\n\treturn toPosition012(presult);\n}\n\nvec2 toStepA3(in float type, in float strokeWidth) {\n\treturn vec2(type < 4.5 ? 1.0 : 0.0, strokeWidth);\n}\n\nfloat toDotWidth(in float strokeScaling, in float strokeWidthScale) {\n\treturn aStepA.x * (\n\t\tstrokeScaling == 4.0 || strokeScaling == 5.0 ||\n\t\tstrokeScaling == 6.0 || strokeScaling == 7.0 ?\n\t\tstrokeWidthScale : 1.0\n\t);\n}\n\nvec2 toDotPattern(in float dash) {\n\treturn (dash < 0.5 ?\n\t\tvec2(1.0, 0.0) :\n\t\t(dash < 3.5 ?\n\t\t\t(dash < 1.5 ?\n\t\t\t\tvec2(1.0, 1.0) :\n\t\t\t\t(2.5 < dash ?\n\t\t\t\t\tvec2(1.0, 2.0) :\n\t\t\t\t\tvec2(1.0, 0.5)\n\t\t\t\t)\n\t\t\t) :\n\t\t\t(dash < 4.5 ?\n\t\t\t\tvec2(2.0, 1.0) :\n\t\t\t\t(5.5 < dash ?\n\t\t\t\t\tvec2(2.0, 2.0) :\n\t\t\t\t\tvec2(2.0, 0.5)\n\t\t\t\t)\n\t\t\t)\n\t\t)\n\t);\n}\n\nvec4 toLength3(in float shift, in float dash, in float strokeScaling, in float strokeWidthScale) {\n\tfloat width = toDotWidth(strokeScaling, strokeWidthScale);\n\tvec2 pattern = toDotPattern(dash);\n\treturn vec4(aStepB.y + shift, pattern.x * width, pattern.y * width, aStepB.z);\n}\n\nvec4 toLength7(in float type, in float strokeScaling, in float strokeWidthScale) {\n\tfloat width = toDotWidth(strokeScaling, strokeWidthScale);\n\tvec2 pattern = toDotPattern(type - 7.0);\n\treturn vec4(aStepB.w, pattern.x * width, pattern.y * width, -1.0);\n}\n\nvoid toColors(in vec3 source, out vec4 fillColor, out vec4 strokeColor) {\n\tvec2 a = toUnpackedAlphas(source.z);\n\tfillColor.xyz = toUnpackedF3x256(source.x).zyx * a.x;\n\tfillColor.w = a.x;\n\tstrokeColor.xyz = toUnpackedF3x256(source.y).zyx * a.y;\n\tstrokeColor.w = a.y;\n}\n\nvoid main(void) {\n\tvec4 general = toGeneral(aStepA.y);\n\tfloat type = general.x;\n\tfloat strokeScaling = general.y;\n\tfloat strokeWidthScale = toStrokeWidthScale(strokeScaling);\n\tfloat strokeWidth = strokeWidthScale * aStepA.x;\n\n\tvType = type;\n\tif (type < 2.5 || 6.5 < type) {\n\t\tgl_Position = vec4(toPosition012(aPosition), 0.0, 1.0);\n\t\tvStepA = strokeWidth * general.zw;\n\t\tif (type < 1.5) {\n\t\t\tvStepB = toStepB01(aStepB);\n\t\t\tvLength = vec4(-1.0, 0.0, 0.0, -1.0);\n\t\t} else if (type < 2.5) {\n\t\t\tvStepB = toStepB2(aStepB, strokeWidth);\n\t\t\tvLength = vec4(-1.0, 0.0, 0.0, -1.0);\n\t\t} else {\n\t\t\tvStepB = toStepB01(aStepB);\n\t\t\tvLength = toLength7(type, strokeScaling, strokeWidthScale);\n\t\t}\n\t} else {\n\t\tfloat shift3 = 0.0;\n\t\tgl_Position = vec4(toPosition3(type, aPosition, aStepB.x, aStepB.w, strokeWidth, shift3), 0.0, 1.0);\n\t\tvStepA = toStepA3(type, strokeWidth);\n\t\tvStepB = vec4(0.0);\n\t\tvLength = toLength3(shift3, general.z, strokeScaling, strokeWidthScale);\n\t}\n\ttoColors(aColor, vColorFill, vColorStroke);\n\tvUv = aUv;\n}";
|
|
16716
|
-
var FRAGMENT_SHADER$1 = "\nvarying mediump float vType;\nvarying mediump vec2 vStepA;\nvarying mediump vec4 vStepB;\nvarying mediump vec4 vLength;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float antialiasWeight;\n\nvec4 toColor0(in vec4 texture) {\n\tvec2 f = vec2(1.0) / vStepB.xy;\n\tvec2 c = vStepB.zw;\n\tvec2 awd = 0.5 * antialiasWeight * f;\n\tvec2 swd = vStepA * f;\n\tvec2 one = vec2(1.0);\n\tvec2 s0 = smoothstep(one - awd, one + awd, c);\n\tvec2 s1 = smoothstep(one - swd - awd, one - swd + awd, c);\n\tfloat s2 = max(s0.x, s0.y);\n\tfloat s3 = max(s1.x, s1.y);\n\n\treturn texture * (\n\t\tvColorStroke * (s3 - s2) +\n\t\tvColorFill * (1.0 - s3)\n\t);\n}\n\nvec4 toColor1(in vec4 texture) {\n\tvec2 d = vStepB.xy;\n\tvec2 c = vStepB.zw;\n\tvec2 awd = 0.5 * antialiasWeight / d;\n\tvec2 swd = vStepA / d;\n\tvec2 one = vec2(1.0);\n\tfloat s0 = smoothstep(length(c/(one + awd)), length(c/(one - awd)), 1.0);\n\tfloat s1 = smoothstep(length(c/(one - swd + awd)), length(c/(one - swd - awd)), 1.0);\n\treturn texture * (\n\t\tvColorStroke * (s0 - s1) +\n\t\tvColorFill * s1\n\t);\n}\n\nvec4 toColor2(in vec4 texture) {\n\tvec2 p0 = vStepB.xy;\n\tvec2 p1 = vStepB.zw;\n\tvec2 d = vec2(dot(texture, vec4(1.0, 1.0/255.0, 1.0/255.0/255.0, 0.0)));\n\tvec2 s = smoothstep(p0 - p1, p0 + p1, d);\n\treturn vColorStroke * (s.y - s.x) + vColorFill * s.x;\n}\n\nfloat toLineStep(in vec4 parameters) {\n\tfloat l = parameters.x;\n\tfloat lp0 = parameters.y;\n\tfloat lp1 = parameters.z;\n\tfloat lt = parameters.w;\n\tfloat ld = 0.5 * antialiasWeight;\n\tfloat lm = mod(l, lp0 + lp1);\n\tfloat s0 = (0.0 < lp1 ? smoothstep(-ld, ld, lm) - smoothstep(lp0 - ld, lp0 + ld, lm) : 1.0);\n\tfloat s1 = (0.0 <= lt ? smoothstep(-ld, ld, l) - smoothstep(lt - ld, lt + ld, l) : 1.0);\n\treturn s0 * s1;\n}\n\nvec4 toColor3(in vec4 texture) {\n\tfloat c = vStepA.x;\n\tfloat awd = 0.5 * antialiasWeight / vStepA.y;\n\tfloat s0 = smoothstep(-awd, awd, c);\n\tfloat s1 = smoothstep(1.0 - awd, 1.0 + awd, c);\n\treturn texture * vColorStroke * (s0 - s1) * toLineStep(vLength);\n}\n\nvec4 toColor7(in vec4 texture) {\n\tfloat aw = 0.5 * antialiasWeight;\n\tfloat awd = aw * vStepB.x;\n\tfloat swd = vStepA.x * vStepB.x;\n\tfloat s0 = smoothstep(1.0 - awd, 1.0 + awd, vStepB.z);\n\tfloat s1 = smoothstep(1.0 - swd - awd, 1.0 - swd + awd, vStepB.z) * toLineStep(vLength);\n\tfloat s2 = smoothstep(-aw, +aw, vStepB.y);\n\treturn texture * (\n\t\tvColorStroke * (s1 - s0) +\n\t\tvColorFill * (1.0 - s1) * s2\n\t);\n}\n\nvoid main(void) {\n\tvec4 texture = texture2D(sampler, vUv);\n\tif (vType < 0.5) {\n\t\tgl_FragColor = toColor0(texture);\n\t} else if (vType < 1.5) {\n\t\tgl_FragColor = toColor1(texture);\n\t} else if (vType < 2.5) {\n\t\tgl_FragColor = toColor2(texture);\n\t} else if (vType < 6.5) {\n\t\tgl_FragColor = toColor3(texture);\n\t} else {\n\t\tgl_FragColor = toColor7(texture);\n\t}\n}";
|
|
16857
|
+
var FRAGMENT_SHADER$1 = "\nvarying mediump float vType;\nvarying mediump vec2 vStepA;\nvarying mediump vec4 vStepB;\nvarying mediump vec4 vLength;\nvarying mediump vec4 vColorFill;\nvarying mediump vec4 vColorStroke;\nvarying mediump vec2 vUv;\n\nuniform sampler2D sampler;\nuniform mediump float antialiasWeight;\n\nvec4 toColor0(in vec4 texture) {\n\tvec2 f = vec2(1.0) / vStepB.xy;\n\tvec2 c = vStepB.zw;\n\tvec2 awd = 0.5 * antialiasWeight * f;\n\tvec2 swd = vStepA * f;\n\tvec2 one = vec2(1.0);\n\tvec2 s0 = smoothstep(one - awd, one + awd, c);\n\tvec2 s1 = smoothstep(one - swd - awd, one - swd + awd, c);\n\tfloat s2 = max(s0.x, s0.y);\n\tfloat s3 = max(s1.x, s1.y);\n\n\treturn texture * (\n\t\tvColorStroke * (s3 - s2) +\n\t\tvColorFill * (1.0 - s3)\n\t);\n}\n\nvec4 toColor1(in vec4 texture) {\n\tvec2 d = vStepB.xy;\n\tvec2 c = vStepB.zw;\n\tvec2 awd = 0.5 * antialiasWeight / d;\n\tvec2 swd = vStepA / d;\n\tvec2 one = vec2(1.0);\n\tvec2 zero = vec2(0.0);\n\tfloat s0 = smoothstep(length(c/clamp(one + awd, zero, one)), length(c/clamp(one - awd, zero, one)), 1.0);\n\tfloat s1 = smoothstep(length(c/clamp(one - swd + awd, zero, one)), length(c/clamp(one - swd - awd, zero, one)), 1.0);\n\treturn texture * (\n\t\tvColorStroke * (s0 - s1) +\n\t\tvColorFill * s1\n\t);\n}\n\nvec4 toColor2(in vec4 texture) {\n\tvec2 p0 = vStepB.xy;\n\tvec2 p1 = vStepB.zw;\n\tvec2 d = vec2(dot(texture, vec4(1.0, 1.0/255.0, 1.0/255.0/255.0, 0.0)));\n\tvec2 s = smoothstep(p0 - p1, p0 + p1, d);\n\treturn vColorStroke * (s.y - s.x) + vColorFill * s.x;\n}\n\nfloat toLineStep(in vec4 parameters) {\n\tfloat l = parameters.x;\n\tfloat lp0 = parameters.y;\n\tfloat lp1 = parameters.z;\n\tfloat lt = parameters.w;\n\tfloat ld = 0.5 * antialiasWeight;\n\tfloat lm = mod(l, lp0 + lp1);\n\tfloat s0 = (0.0 < lp1 ? smoothstep(-ld, ld, lm) - smoothstep(lp0 - ld, lp0 + ld, lm) : 1.0);\n\tfloat s1 = (0.0 <= lt ? smoothstep(-ld, ld, l) - smoothstep(lt - ld, lt + ld, l) : 1.0);\n\treturn s0 * s1;\n}\n\nvec4 toColor3(in vec4 texture) {\n\tfloat c = vStepA.x;\n\tfloat awd = 0.5 * antialiasWeight / vStepA.y;\n\tfloat s0 = smoothstep(-awd, awd, c);\n\tfloat s1 = smoothstep(1.0 - awd, 1.0 + awd, c);\n\treturn texture * vColorStroke * (s0 - s1) * toLineStep(vLength);\n}\n\nvec4 toColor7(in vec4 texture) {\n\tfloat aw = 0.5 * antialiasWeight;\n\tfloat awd = aw * vStepB.x;\n\tfloat swd = vStepA.x * vStepB.x;\n\tfloat s0 = smoothstep(1.0 - awd, 1.0 + awd, vStepB.z);\n\tfloat s1 = smoothstep(1.0 - swd - awd, 1.0 - swd + awd, vStepB.z) * toLineStep(vLength);\n\tfloat s2 = smoothstep(-aw, +aw, vStepB.y);\n\treturn texture * (\n\t\tvColorStroke * (s1 - s0) +\n\t\tvColorFill * (1.0 - s1) * s2\n\t);\n}\n\nvoid main(void) {\n\tvec4 texture = texture2D(sampler, vUv);\n\tif (vType < 0.5) {\n\t\tgl_FragColor = toColor0(texture);\n\t} else if (vType < 1.5) {\n\t\tgl_FragColor = toColor1(texture);\n\t} else if (vType < 2.5) {\n\t\tgl_FragColor = toColor2(texture);\n\t} else if (vType < 6.5) {\n\t\tgl_FragColor = toColor3(texture);\n\t} else {\n\t\tgl_FragColor = toColor7(texture);\n\t}\n}";
|
|
16717
16858
|
var EShapeRenderer = /** @class */ (function (_super) {
|
|
16718
16859
|
__extends(EShapeRenderer, _super);
|
|
16719
16860
|
function EShapeRenderer(renderer) {
|
|
@@ -25488,7 +25629,7 @@ var EShapeRectangleLegacy = /** @class */ (function (_super) {
|
|
|
25488
25629
|
};
|
|
25489
25630
|
EShapeRectangleLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
|
|
25490
25631
|
if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
|
|
25491
|
-
return
|
|
25632
|
+
return hitTestRectangleLegacy(this, x, y, ax, ay, sw, ss);
|
|
25492
25633
|
}
|
|
25493
25634
|
return false;
|
|
25494
25635
|
};
|
|
@@ -61985,9 +62126,7 @@ var EShapeActionRuntimeTransformMoveForwardOrBackward = /** @class */ (function
|
|
|
61985
62126
|
var writtenPositionY = !!(runtime.written & EShapeRuntimeReset.POSITION_Y);
|
|
61986
62127
|
var oldPositionX = writtenPositionX ? position.x : runtime.x;
|
|
61987
62128
|
var oldPositionY = writtenPositionY ? position.y : runtime.y;
|
|
61988
|
-
|
|
61989
|
-
var localTransform = transform.localTransform;
|
|
61990
|
-
position.set(oldPositionX - localTransform.c * amount, oldPositionY - localTransform.d * amount);
|
|
62129
|
+
position.set(oldPositionX - transform.cy * amount, oldPositionY - transform.sy * amount);
|
|
61991
62130
|
runtime.written |= this.reset;
|
|
61992
62131
|
}
|
|
61993
62132
|
};
|
|
@@ -62012,9 +62151,7 @@ var EShapeActionRuntimeTransformMoveLeftOrRight = /** @class */ (function (_supe
|
|
|
62012
62151
|
var writtenPositionY = !!(runtime.written & EShapeRuntimeReset.POSITION_Y);
|
|
62013
62152
|
var oldPositionX = writtenPositionX ? position.x : runtime.x;
|
|
62014
62153
|
var oldPositionY = writtenPositionY ? position.y : runtime.y;
|
|
62015
|
-
|
|
62016
|
-
var localTransform = transform.localTransform;
|
|
62017
|
-
position.set(oldPositionX + localTransform.a * amount, oldPositionY + localTransform.b * amount);
|
|
62154
|
+
position.set(oldPositionX + transform.cx * amount, oldPositionY + transform.sx * amount);
|
|
62018
62155
|
runtime.written |= this.reset;
|
|
62019
62156
|
}
|
|
62020
62157
|
};
|
|
@@ -62145,16 +62282,14 @@ var EShapeActionRuntimeTransformResize = /** @class */ (function (_super) {
|
|
|
62145
62282
|
EShapeActionRuntimeTransformResize.prototype.adjustPosition = function (shape, runtime, dsx, dsy, originX, originY) {
|
|
62146
62283
|
var dx = (-0.5 + originX) * dsx;
|
|
62147
62284
|
var dy = (-0.5 + originY) * dsy;
|
|
62148
|
-
shape.updateTransform();
|
|
62149
62285
|
var transform = shape.transform;
|
|
62150
62286
|
var position = transform.position;
|
|
62151
|
-
var localTransform = transform.localTransform;
|
|
62152
62287
|
var writtenPositionX = !!(runtime.written & EShapeRuntimeReset.POSITION_X);
|
|
62153
62288
|
var writtenPositionY = !!(runtime.written & EShapeRuntimeReset.POSITION_Y);
|
|
62154
62289
|
var oldPositionX = writtenPositionX ? position.x : runtime.x;
|
|
62155
62290
|
var oldPositionY = writtenPositionY ? position.y : runtime.y;
|
|
62156
62291
|
runtime.written |= EShapeRuntimeReset.POSITION;
|
|
62157
|
-
position.set(oldPositionX + dx *
|
|
62292
|
+
position.set(oldPositionX + dx * transform.cx + dy * transform.cy, oldPositionY + dx * transform.sx + dy * transform.sy);
|
|
62158
62293
|
};
|
|
62159
62294
|
return EShapeActionRuntimeTransformResize;
|
|
62160
62295
|
}(EShapeActionRuntimeConditional));
|
|
@@ -66555,6 +66690,163 @@ var buildSemicircleUv = function (uvs, voffset, textureUvs) {
|
|
|
66555
66690
|
uvs[++iuv] = 0.5 * (y1 + y2);
|
|
66556
66691
|
};
|
|
66557
66692
|
|
|
66693
|
+
var TRIANGLE_LEGACY_VERTEX_COUNT = 7;
|
|
66694
|
+
var TRIANGLE_LEGACY_INDEX_COUNT = 3;
|
|
66695
|
+
var TRIANGLE_LEGACY_WORLD_SIZE = [0, 0, 0];
|
|
66696
|
+
var buildTriangleLegacyIndex = function (indices, voffset, ioffset) {
|
|
66697
|
+
// Indices
|
|
66698
|
+
var ii = ioffset * 3 - 1;
|
|
66699
|
+
indices[++ii] = voffset + 0;
|
|
66700
|
+
indices[++ii] = voffset + 1;
|
|
66701
|
+
indices[++ii] = voffset + 2;
|
|
66702
|
+
indices[++ii] = voffset + 0;
|
|
66703
|
+
indices[++ii] = voffset + 3;
|
|
66704
|
+
indices[++ii] = voffset + 4;
|
|
66705
|
+
indices[++ii] = voffset + 0;
|
|
66706
|
+
indices[++ii] = voffset + 5;
|
|
66707
|
+
indices[++ii] = voffset + 6;
|
|
66708
|
+
};
|
|
66709
|
+
var buildTriangleLegacyVertex = function (vertices, voffset, originX, originY, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, worldSize) {
|
|
66710
|
+
var s = strokeAlign * strokeWidth;
|
|
66711
|
+
var sx = sizeX * 0.5 + (0 <= sizeX ? +s : -s);
|
|
66712
|
+
var sy = sizeY * 0.5 + (0 <= sizeY ? +s : -s);
|
|
66713
|
+
var ax = Math.abs(sx);
|
|
66714
|
+
var ay = Math.abs(sy);
|
|
66715
|
+
var az = Math.sqrt(ax * ax + 4 * ay * ay);
|
|
66716
|
+
var aw = (2 * ax * ay) / (ax + az);
|
|
66717
|
+
var sz = sy - (0 <= sy ? +aw : -aw);
|
|
66718
|
+
var a = internalTransform.a;
|
|
66719
|
+
var b = internalTransform.b;
|
|
66720
|
+
var c = internalTransform.c;
|
|
66721
|
+
var d = internalTransform.d;
|
|
66722
|
+
var tx = internalTransform.tx;
|
|
66723
|
+
var ty = internalTransform.ty;
|
|
66724
|
+
var x0 = a * originX + c * (originY - sy) + tx;
|
|
66725
|
+
var y0 = b * originX + d * (originY - sy) + ty;
|
|
66726
|
+
var ox = a * originX + c * originY + tx;
|
|
66727
|
+
var oy = b * originX + d * originY + ty;
|
|
66728
|
+
var rx = a * (originX + sx) + c * originY + tx;
|
|
66729
|
+
var ry = b * (originX + sx) + d * originY + ty;
|
|
66730
|
+
var dx = ox - x0;
|
|
66731
|
+
var dy = oy - y0;
|
|
66732
|
+
var x1 = rx + dx;
|
|
66733
|
+
var y1 = ry + dy;
|
|
66734
|
+
var x2 = ox + (ox - rx) + dx;
|
|
66735
|
+
var y2 = oy + (oy - ry) + dy;
|
|
66736
|
+
var x3 = a * originX + c * (originY + sz) + tx;
|
|
66737
|
+
var y3 = b * originX + d * (originY + sz) + ty;
|
|
66738
|
+
// World size
|
|
66739
|
+
var xb = ox + dx;
|
|
66740
|
+
var yb = oy + dy;
|
|
66741
|
+
worldSize[0] = toLength(xb, yb, x3, y3);
|
|
66742
|
+
worldSize[1] = toLength(x1, y1, xb, yb);
|
|
66743
|
+
worldSize[2] = toLength(x0, y0, ox, oy);
|
|
66744
|
+
// Vertices
|
|
66745
|
+
var iv = (voffset << 1) - 1;
|
|
66746
|
+
vertices[++iv] = x3;
|
|
66747
|
+
vertices[++iv] = y3;
|
|
66748
|
+
vertices[++iv] = x0;
|
|
66749
|
+
vertices[++iv] = y0;
|
|
66750
|
+
vertices[++iv] = x1;
|
|
66751
|
+
vertices[++iv] = y1;
|
|
66752
|
+
vertices[++iv] = x1;
|
|
66753
|
+
vertices[++iv] = y1;
|
|
66754
|
+
vertices[++iv] = x2;
|
|
66755
|
+
vertices[++iv] = y2;
|
|
66756
|
+
vertices[++iv] = x2;
|
|
66757
|
+
vertices[++iv] = y2;
|
|
66758
|
+
vertices[++iv] = x0;
|
|
66759
|
+
vertices[++iv] = y0;
|
|
66760
|
+
};
|
|
66761
|
+
var buildTriangleLegacyStep = function (steps, voffset, strokeWidth, strokeStyle, worldSize) {
|
|
66762
|
+
var scaleInvariant = toScaleInvariant(strokeStyle);
|
|
66763
|
+
var s = worldSize[0];
|
|
66764
|
+
var e = toPackedI4x64(0, scaleInvariant, 1, 1);
|
|
66765
|
+
var c00 = toPackedClippings(0, 0);
|
|
66766
|
+
var c10 = toPackedClippings(1, 0);
|
|
66767
|
+
var c01 = toPackedClippings(0, 1);
|
|
66768
|
+
// 000
|
|
66769
|
+
var is = voffset * 6 - 1;
|
|
66770
|
+
steps[++is] = strokeWidth;
|
|
66771
|
+
steps[++is] = e;
|
|
66772
|
+
steps[++is] = s;
|
|
66773
|
+
steps[++is] = s;
|
|
66774
|
+
steps[++is] = c00;
|
|
66775
|
+
steps[++is] = 0;
|
|
66776
|
+
// 100
|
|
66777
|
+
steps[++is] = strokeWidth;
|
|
66778
|
+
steps[++is] = e;
|
|
66779
|
+
steps[++is] = s;
|
|
66780
|
+
steps[++is] = s;
|
|
66781
|
+
steps[++is] = c10;
|
|
66782
|
+
steps[++is] = 0;
|
|
66783
|
+
// 100
|
|
66784
|
+
steps[++is] = strokeWidth;
|
|
66785
|
+
steps[++is] = e;
|
|
66786
|
+
steps[++is] = s;
|
|
66787
|
+
steps[++is] = s;
|
|
66788
|
+
steps[++is] = c10;
|
|
66789
|
+
steps[++is] = 0;
|
|
66790
|
+
// 010
|
|
66791
|
+
steps[++is] = strokeWidth;
|
|
66792
|
+
steps[++is] = e;
|
|
66793
|
+
steps[++is] = s;
|
|
66794
|
+
steps[++is] = s;
|
|
66795
|
+
steps[++is] = c01;
|
|
66796
|
+
steps[++is] = 0;
|
|
66797
|
+
// 010
|
|
66798
|
+
steps[++is] = strokeWidth;
|
|
66799
|
+
steps[++is] = e;
|
|
66800
|
+
steps[++is] = s;
|
|
66801
|
+
steps[++is] = s;
|
|
66802
|
+
steps[++is] = c01;
|
|
66803
|
+
steps[++is] = 0;
|
|
66804
|
+
// 100
|
|
66805
|
+
steps[++is] = strokeWidth;
|
|
66806
|
+
steps[++is] = e;
|
|
66807
|
+
steps[++is] = s;
|
|
66808
|
+
steps[++is] = s;
|
|
66809
|
+
steps[++is] = c10;
|
|
66810
|
+
steps[++is] = 0;
|
|
66811
|
+
// 100
|
|
66812
|
+
steps[++is] = strokeWidth;
|
|
66813
|
+
steps[++is] = e;
|
|
66814
|
+
steps[++is] = s;
|
|
66815
|
+
steps[++is] = s;
|
|
66816
|
+
steps[++is] = c10;
|
|
66817
|
+
steps[++is] = 0;
|
|
66818
|
+
};
|
|
66819
|
+
var buildTriangleLegacyUv = function (uvs, textureUvs, voffset, worldSize) {
|
|
66820
|
+
var x0 = textureUvs.x0;
|
|
66821
|
+
var x1 = textureUvs.x1;
|
|
66822
|
+
var x2 = textureUvs.x2;
|
|
66823
|
+
var x3 = textureUvs.x3;
|
|
66824
|
+
var y0 = textureUvs.y0;
|
|
66825
|
+
var y1 = textureUvs.y1;
|
|
66826
|
+
var y2 = textureUvs.y2;
|
|
66827
|
+
var y3 = textureUvs.y3;
|
|
66828
|
+
var x4 = 0.5 * (x0 + x1);
|
|
66829
|
+
var y4 = 0.5 * (y0 + y1);
|
|
66830
|
+
var c = 1 - (0.5 * worldSize[0]) / worldSize[2];
|
|
66831
|
+
var x5 = x4 + c * (x3 - x0);
|
|
66832
|
+
var y5 = y4 + c * (y3 - y0);
|
|
66833
|
+
var iuv = (voffset << 1) - 1;
|
|
66834
|
+
uvs[++iuv] = x5;
|
|
66835
|
+
uvs[++iuv] = y5;
|
|
66836
|
+
uvs[++iuv] = x4;
|
|
66837
|
+
uvs[++iuv] = y4;
|
|
66838
|
+
uvs[++iuv] = x2;
|
|
66839
|
+
uvs[++iuv] = y2;
|
|
66840
|
+
uvs[++iuv] = x2;
|
|
66841
|
+
uvs[++iuv] = y2;
|
|
66842
|
+
uvs[++iuv] = x3;
|
|
66843
|
+
uvs[++iuv] = y3;
|
|
66844
|
+
uvs[++iuv] = x3;
|
|
66845
|
+
uvs[++iuv] = y3;
|
|
66846
|
+
uvs[++iuv] = x4;
|
|
66847
|
+
uvs[++iuv] = y4;
|
|
66848
|
+
};
|
|
66849
|
+
|
|
66558
66850
|
var TRIANGLE_ROUNDED_VERTEX_COUNT = 22;
|
|
66559
66851
|
var TRIANGLE_ROUNDED_INDEX_COUNT = 15;
|
|
66560
66852
|
var TRIANGLE_ROUNDED_WORLD_SIZE = [
|
|
@@ -67087,162 +67379,6 @@ var buildTriangleRoundedUv = function (uvs, voffset, textureUvs, radius, worldSi
|
|
|
67087
67379
|
uvs[++iuv] = y6;
|
|
67088
67380
|
};
|
|
67089
67381
|
|
|
67090
|
-
var TRIANGLE_VERTEX_COUNT = 7;
|
|
67091
|
-
var TRIANGLE_INDEX_COUNT = 3;
|
|
67092
|
-
var TRIANGLE_WORLD_SIZE = [0, 0, 0];
|
|
67093
|
-
var TRIANGLE_WORK_POINT = new pixi_js.Point();
|
|
67094
|
-
var buildTriangleIndex = function (indices, voffset, ioffset) {
|
|
67095
|
-
// Indices
|
|
67096
|
-
var ii = ioffset * 3 - 1;
|
|
67097
|
-
indices[++ii] = voffset + 0;
|
|
67098
|
-
indices[++ii] = voffset + 1;
|
|
67099
|
-
indices[++ii] = voffset + 2;
|
|
67100
|
-
indices[++ii] = voffset + 0;
|
|
67101
|
-
indices[++ii] = voffset + 3;
|
|
67102
|
-
indices[++ii] = voffset + 4;
|
|
67103
|
-
indices[++ii] = voffset + 0;
|
|
67104
|
-
indices[++ii] = voffset + 5;
|
|
67105
|
-
indices[++ii] = voffset + 6;
|
|
67106
|
-
};
|
|
67107
|
-
var buildTriangleVertex = function (vertices, voffset, originX, originY, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, worldSize) {
|
|
67108
|
-
var s = strokeAlign * strokeWidth;
|
|
67109
|
-
var sx = sizeX * 0.5 + (0 <= sizeX ? +s : -s);
|
|
67110
|
-
var sy = sizeY * 0.5 + (0 <= sizeY ? +s : -s);
|
|
67111
|
-
var sz = Math.sqrt(sx * sx + 4 * sy * sy);
|
|
67112
|
-
var sw = (2 * sx * sy) / (sx + sz);
|
|
67113
|
-
var work = TRIANGLE_WORK_POINT;
|
|
67114
|
-
work.set(originX, originY - sy);
|
|
67115
|
-
internalTransform.apply(work, work);
|
|
67116
|
-
var x0 = work.x;
|
|
67117
|
-
var y0 = work.y;
|
|
67118
|
-
work.set(originX, originY);
|
|
67119
|
-
internalTransform.apply(work, work);
|
|
67120
|
-
var tx = work.x;
|
|
67121
|
-
var ty = work.y;
|
|
67122
|
-
work.set(originX + sx, originY);
|
|
67123
|
-
internalTransform.apply(work, work);
|
|
67124
|
-
var dx = tx - x0;
|
|
67125
|
-
var dy = ty - y0;
|
|
67126
|
-
var x1 = work.x + dx;
|
|
67127
|
-
var y1 = work.y + dy;
|
|
67128
|
-
var x2 = tx + (tx - work.x) + dx;
|
|
67129
|
-
var y2 = ty + (ty - work.y) + dy;
|
|
67130
|
-
work.set(originX, originY + sy - sw); // Incenter of a triangle
|
|
67131
|
-
internalTransform.apply(work, work);
|
|
67132
|
-
var x3 = work.x;
|
|
67133
|
-
var y3 = work.y;
|
|
67134
|
-
// World size
|
|
67135
|
-
var xb = tx + dx;
|
|
67136
|
-
var yb = ty + dy;
|
|
67137
|
-
worldSize[0] = toLength(xb, yb, x3, y3);
|
|
67138
|
-
worldSize[1] = toLength(x1, y1, xb, yb);
|
|
67139
|
-
worldSize[2] = toLength(x0, y0, tx, ty);
|
|
67140
|
-
// Vertices
|
|
67141
|
-
var iv = (voffset << 1) - 1;
|
|
67142
|
-
vertices[++iv] = x3;
|
|
67143
|
-
vertices[++iv] = y3;
|
|
67144
|
-
vertices[++iv] = x0;
|
|
67145
|
-
vertices[++iv] = y0;
|
|
67146
|
-
vertices[++iv] = x1;
|
|
67147
|
-
vertices[++iv] = y1;
|
|
67148
|
-
vertices[++iv] = x1;
|
|
67149
|
-
vertices[++iv] = y1;
|
|
67150
|
-
vertices[++iv] = x2;
|
|
67151
|
-
vertices[++iv] = y2;
|
|
67152
|
-
vertices[++iv] = x2;
|
|
67153
|
-
vertices[++iv] = y2;
|
|
67154
|
-
vertices[++iv] = x0;
|
|
67155
|
-
vertices[++iv] = y0;
|
|
67156
|
-
};
|
|
67157
|
-
var buildTriangleStep = function (steps, voffset, strokeWidth, strokeStyle, worldSize) {
|
|
67158
|
-
var scaleInvariant = toScaleInvariant(strokeStyle);
|
|
67159
|
-
var s = worldSize[0];
|
|
67160
|
-
var e = toPackedI4x64(0, scaleInvariant, 1, 1);
|
|
67161
|
-
var c00 = toPackedClippings(0, 0);
|
|
67162
|
-
var c10 = toPackedClippings(1, 0);
|
|
67163
|
-
var c01 = toPackedClippings(0, 1);
|
|
67164
|
-
// 000
|
|
67165
|
-
var is = voffset * 6 - 1;
|
|
67166
|
-
steps[++is] = strokeWidth;
|
|
67167
|
-
steps[++is] = e;
|
|
67168
|
-
steps[++is] = s;
|
|
67169
|
-
steps[++is] = s;
|
|
67170
|
-
steps[++is] = c00;
|
|
67171
|
-
steps[++is] = 0;
|
|
67172
|
-
// 100
|
|
67173
|
-
steps[++is] = strokeWidth;
|
|
67174
|
-
steps[++is] = e;
|
|
67175
|
-
steps[++is] = s;
|
|
67176
|
-
steps[++is] = s;
|
|
67177
|
-
steps[++is] = c10;
|
|
67178
|
-
steps[++is] = 0;
|
|
67179
|
-
// 100
|
|
67180
|
-
steps[++is] = strokeWidth;
|
|
67181
|
-
steps[++is] = e;
|
|
67182
|
-
steps[++is] = s;
|
|
67183
|
-
steps[++is] = s;
|
|
67184
|
-
steps[++is] = c10;
|
|
67185
|
-
steps[++is] = 0;
|
|
67186
|
-
// 010
|
|
67187
|
-
steps[++is] = strokeWidth;
|
|
67188
|
-
steps[++is] = e;
|
|
67189
|
-
steps[++is] = s;
|
|
67190
|
-
steps[++is] = s;
|
|
67191
|
-
steps[++is] = c01;
|
|
67192
|
-
steps[++is] = 0;
|
|
67193
|
-
// 010
|
|
67194
|
-
steps[++is] = strokeWidth;
|
|
67195
|
-
steps[++is] = e;
|
|
67196
|
-
steps[++is] = s;
|
|
67197
|
-
steps[++is] = s;
|
|
67198
|
-
steps[++is] = c01;
|
|
67199
|
-
steps[++is] = 0;
|
|
67200
|
-
// 100
|
|
67201
|
-
steps[++is] = strokeWidth;
|
|
67202
|
-
steps[++is] = e;
|
|
67203
|
-
steps[++is] = s;
|
|
67204
|
-
steps[++is] = s;
|
|
67205
|
-
steps[++is] = c10;
|
|
67206
|
-
steps[++is] = 0;
|
|
67207
|
-
// 100
|
|
67208
|
-
steps[++is] = strokeWidth;
|
|
67209
|
-
steps[++is] = e;
|
|
67210
|
-
steps[++is] = s;
|
|
67211
|
-
steps[++is] = s;
|
|
67212
|
-
steps[++is] = c10;
|
|
67213
|
-
steps[++is] = 0;
|
|
67214
|
-
};
|
|
67215
|
-
var buildTriangleUv = function (uvs, textureUvs, voffset, worldSize) {
|
|
67216
|
-
var x0 = textureUvs.x0;
|
|
67217
|
-
var x1 = textureUvs.x1;
|
|
67218
|
-
var x2 = textureUvs.x2;
|
|
67219
|
-
var x3 = textureUvs.x3;
|
|
67220
|
-
var y0 = textureUvs.y0;
|
|
67221
|
-
var y1 = textureUvs.y1;
|
|
67222
|
-
var y2 = textureUvs.y2;
|
|
67223
|
-
var y3 = textureUvs.y3;
|
|
67224
|
-
var x4 = 0.5 * (x0 + x1);
|
|
67225
|
-
var y4 = 0.5 * (y0 + y1);
|
|
67226
|
-
var c = 1 - (0.5 * worldSize[0]) / worldSize[2];
|
|
67227
|
-
var x5 = x4 + c * (x3 - x0);
|
|
67228
|
-
var y5 = y4 + c * (y3 - y0);
|
|
67229
|
-
var iuv = (voffset << 1) - 1;
|
|
67230
|
-
uvs[++iuv] = x5;
|
|
67231
|
-
uvs[++iuv] = y5;
|
|
67232
|
-
uvs[++iuv] = x4;
|
|
67233
|
-
uvs[++iuv] = y4;
|
|
67234
|
-
uvs[++iuv] = x2;
|
|
67235
|
-
uvs[++iuv] = y2;
|
|
67236
|
-
uvs[++iuv] = x2;
|
|
67237
|
-
uvs[++iuv] = y2;
|
|
67238
|
-
uvs[++iuv] = x3;
|
|
67239
|
-
uvs[++iuv] = y3;
|
|
67240
|
-
uvs[++iuv] = x3;
|
|
67241
|
-
uvs[++iuv] = y3;
|
|
67242
|
-
uvs[++iuv] = x4;
|
|
67243
|
-
uvs[++iuv] = y4;
|
|
67244
|
-
};
|
|
67245
|
-
|
|
67246
67382
|
/*
|
|
67247
67383
|
* Copyright (C) 2019 Toshiba Corporation
|
|
67248
67384
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -68780,8 +68916,8 @@ var BuilderLineOfTriangles = /** @class */ (function (_super) {
|
|
|
68780
68916
|
var ioffset = this.indexOffset;
|
|
68781
68917
|
var pointCountReserved = this.pointCountReserved;
|
|
68782
68918
|
if (0 < pointCountReserved) {
|
|
68783
|
-
|
|
68784
|
-
copyIndex(indices,
|
|
68919
|
+
buildTriangleLegacyIndex(indices, voffset, ioffset);
|
|
68920
|
+
copyIndex(indices, TRIANGLE_LEGACY_VERTEX_COUNT, ioffset, TRIANGLE_LEGACY_INDEX_COUNT, pointCountReserved);
|
|
68785
68921
|
}
|
|
68786
68922
|
this.inited |= BuilderFlag.INDEX;
|
|
68787
68923
|
};
|
|
@@ -68790,7 +68926,7 @@ var BuilderLineOfTriangles = /** @class */ (function (_super) {
|
|
|
68790
68926
|
if (points instanceof EShapeLineOfAnyPointsImpl) {
|
|
68791
68927
|
var buffer = this.buffer;
|
|
68792
68928
|
this.updateVertexStepAndUvs(buffer, shape, points);
|
|
68793
|
-
this.updateLineOfAnyColor(buffer, shape, points,
|
|
68929
|
+
this.updateLineOfAnyColor(buffer, shape, points, TRIANGLE_LEGACY_VERTEX_COUNT);
|
|
68794
68930
|
}
|
|
68795
68931
|
};
|
|
68796
68932
|
BuilderLineOfTriangles.prototype.updateVertexStepAndUvs = function (buffer, shape, points) {
|
|
@@ -68853,15 +68989,15 @@ var BuilderLineOfTriangles = /** @class */ (function (_super) {
|
|
|
68853
68989
|
if (0 < pointCount && pointSize.isStaticX() && pointSize.isStaticY()) {
|
|
68854
68990
|
var pointSizeX = pointSize.getX(0);
|
|
68855
68991
|
var pointSizeY = pointSize.getY(0);
|
|
68856
|
-
|
|
68857
|
-
copyVertex(vertices, internalTransform, voffset,
|
|
68992
|
+
buildTriangleLegacyVertex(vertices, voffset, 0, 0, pointSizeX, pointSizeY, strokeAlign, strokeWidth, internalTransform, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
68993
|
+
copyVertex(vertices, internalTransform, voffset, TRIANGLE_LEGACY_VERTEX_COUNT, pointCount, pointsValues, pointOffset);
|
|
68858
68994
|
if (isNotInited || isVertexChanged || isTransformChanged) {
|
|
68859
|
-
|
|
68860
|
-
copyStep(steps, voffset,
|
|
68995
|
+
buildTriangleLegacyStep(steps, voffset, strokeWidth, strokeStyle, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
68996
|
+
copyStep(steps, voffset, TRIANGLE_LEGACY_VERTEX_COUNT, pointCount);
|
|
68861
68997
|
}
|
|
68862
68998
|
if (isNotInited || isVertexChanged || isTextureChanged) {
|
|
68863
|
-
|
|
68864
|
-
copyUvs(uvs, voffset,
|
|
68999
|
+
buildTriangleLegacyUv(uvs, textureUvs, voffset, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69000
|
+
copyUvs(uvs, voffset, TRIANGLE_LEGACY_VERTEX_COUNT, pointCount);
|
|
68865
69001
|
}
|
|
68866
69002
|
}
|
|
68867
69003
|
else {
|
|
@@ -68871,20 +69007,20 @@ var BuilderLineOfTriangles = /** @class */ (function (_super) {
|
|
|
68871
69007
|
var py = pointsValues[ip + 1] + pointOffset.getY(i);
|
|
68872
69008
|
var pointSizeX = pointSize.getX(i);
|
|
68873
69009
|
var pointSizeY = pointSize.getY(i);
|
|
68874
|
-
var iv = voffset + i *
|
|
68875
|
-
|
|
69010
|
+
var iv = voffset + i * TRIANGLE_LEGACY_VERTEX_COUNT;
|
|
69011
|
+
buildTriangleLegacyVertex(vertices, iv, px, py, pointSizeX, pointSizeY, strokeAlign, strokeWidth, internalTransform, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
68876
69012
|
if (isNotInited || isVertexChanged || isTransformChanged) {
|
|
68877
|
-
|
|
69013
|
+
buildTriangleLegacyStep(steps, iv, strokeWidth, strokeStyle, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
68878
69014
|
}
|
|
68879
69015
|
if (isNotInited || isVertexChanged || isTextureChanged) {
|
|
68880
|
-
|
|
69016
|
+
buildTriangleLegacyUv(uvs, textureUvs, iv, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
68881
69017
|
}
|
|
68882
69018
|
}
|
|
68883
69019
|
}
|
|
68884
69020
|
// Fill the rest
|
|
68885
69021
|
var pointCountReserved = this.pointCountReserved;
|
|
68886
|
-
var voffsetReserved = voffset + pointCount *
|
|
68887
|
-
var vcountReserved =
|
|
69022
|
+
var voffsetReserved = voffset + pointCount * TRIANGLE_LEGACY_VERTEX_COUNT;
|
|
69023
|
+
var vcountReserved = TRIANGLE_LEGACY_VERTEX_COUNT * (pointCountReserved - pointCount);
|
|
68888
69024
|
buildNullVertex(vertices, voffsetReserved, vcountReserved);
|
|
68889
69025
|
buildNullStep(steps, voffsetReserved, vcountReserved);
|
|
68890
69026
|
buildNullUv(uvs, voffsetReserved, vcountReserved);
|
|
@@ -69290,14 +69426,14 @@ var BuilderMarkerRectangleTail = /** @class */ (function (_super) {
|
|
|
69290
69426
|
var BuilderMarkerTriangle = /** @class */ (function (_super) {
|
|
69291
69427
|
__extends(BuilderMarkerTriangle, _super);
|
|
69292
69428
|
function BuilderMarkerTriangle(buffer, vertexOffset, indexOffset) {
|
|
69293
|
-
var _this = _super.call(this, buffer, vertexOffset, indexOffset,
|
|
69429
|
+
var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_LEGACY_VERTEX_COUNT, TRIANGLE_LEGACY_INDEX_COUNT) || this;
|
|
69294
69430
|
_this.pointId = -1;
|
|
69295
69431
|
return _this;
|
|
69296
69432
|
}
|
|
69297
69433
|
BuilderMarkerTriangle.prototype.init = function () {
|
|
69298
69434
|
var buffer = this.buffer;
|
|
69299
69435
|
buffer.updateIndices();
|
|
69300
|
-
|
|
69436
|
+
buildTriangleLegacyIndex(buffer.indices, this.vertexOffset, this.indexOffset);
|
|
69301
69437
|
this.inited |= BuilderFlag.INDEX;
|
|
69302
69438
|
};
|
|
69303
69439
|
BuilderMarkerTriangle.prototype.update = function (shape) {
|
|
@@ -69355,14 +69491,14 @@ var BuilderMarkerTriangle = /** @class */ (function (_super) {
|
|
|
69355
69491
|
var internalTransform = ((_a = BuilderMarkerTriangle.WORK) !== null && _a !== void 0 ? _a : (BuilderMarkerTriangle.WORK = new pixi_js.Matrix()));
|
|
69356
69492
|
internalTransform.copyFrom(marker.transform).prepend(shape.transform.internalTransform);
|
|
69357
69493
|
buffer.updateVertices();
|
|
69358
|
-
|
|
69494
|
+
buildTriangleLegacyVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, internalTransform, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69359
69495
|
if (isNotInited || isVertexChanged || isTransformChanged) {
|
|
69360
69496
|
buffer.updateSteps();
|
|
69361
|
-
|
|
69497
|
+
buildTriangleLegacyStep(buffer.steps, voffset, strokeWidth, strokeStyle, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69362
69498
|
}
|
|
69363
69499
|
if (isNotInited || isVertexChanged || isTextureChanged) {
|
|
69364
69500
|
buffer.updateUvs();
|
|
69365
|
-
|
|
69501
|
+
buildTriangleLegacyUv(buffer.uvs, toTextureUvs(texture), voffset, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69366
69502
|
}
|
|
69367
69503
|
}
|
|
69368
69504
|
};
|
|
@@ -69655,32 +69791,27 @@ var BuilderSemicircle = /** @class */ (function (_super) {
|
|
|
69655
69791
|
* Copyright (C) 2019 Toshiba Corporation
|
|
69656
69792
|
* SPDX-License-Identifier: Apache-2.0
|
|
69657
69793
|
*/
|
|
69658
|
-
var
|
|
69659
|
-
__extends(
|
|
69660
|
-
function
|
|
69661
|
-
|
|
69662
|
-
_this.radius = 0;
|
|
69663
|
-
_this.corner = 0;
|
|
69664
|
-
return _this;
|
|
69794
|
+
var BuilderTriangleLegacy = /** @class */ (function (_super) {
|
|
69795
|
+
__extends(BuilderTriangleLegacy, _super);
|
|
69796
|
+
function BuilderTriangleLegacy(buffer, vertexOffset, indexOffset) {
|
|
69797
|
+
return _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_LEGACY_VERTEX_COUNT, TRIANGLE_LEGACY_INDEX_COUNT) || this;
|
|
69665
69798
|
}
|
|
69666
|
-
|
|
69799
|
+
BuilderTriangleLegacy.prototype.init = function () {
|
|
69667
69800
|
var buffer = this.buffer;
|
|
69668
69801
|
buffer.updateIndices();
|
|
69669
|
-
|
|
69802
|
+
buildTriangleLegacyIndex(buffer.indices, this.vertexOffset, this.indexOffset);
|
|
69670
69803
|
this.inited |= BuilderFlag.INDEX;
|
|
69671
69804
|
};
|
|
69672
|
-
|
|
69805
|
+
BuilderTriangleLegacy.prototype.update = function (shape) {
|
|
69673
69806
|
var buffer = this.buffer;
|
|
69674
69807
|
this.updateVertexStepAndUv(buffer, shape);
|
|
69675
69808
|
this.updateColor(buffer, shape);
|
|
69676
69809
|
};
|
|
69677
|
-
|
|
69810
|
+
BuilderTriangleLegacy.prototype.updateVertexStepAndUv = function (buffer, shape) {
|
|
69678
69811
|
var size = shape.size;
|
|
69679
69812
|
var sizeX = size.x;
|
|
69680
69813
|
var sizeY = size.y;
|
|
69681
69814
|
var isSizeChanged = sizeX !== this.sizeX || sizeY !== this.sizeY;
|
|
69682
|
-
var radius = shape.radius;
|
|
69683
|
-
var isRadiusChanged = radius !== this.radius;
|
|
69684
69815
|
var transformLocalId = toTransformLocalId(shape);
|
|
69685
69816
|
var isTransformChanged = this.transformLocalId !== transformLocalId;
|
|
69686
69817
|
var stroke = shape.stroke;
|
|
@@ -69690,70 +69821,67 @@ var BuilderTriangleRounded = /** @class */ (function (_super) {
|
|
|
69690
69821
|
var isStrokeChanged = this.strokeAlign !== strokeAlign ||
|
|
69691
69822
|
this.strokeWidth !== strokeWidth ||
|
|
69692
69823
|
this.strokeStyle !== strokeStyle;
|
|
69693
|
-
var corner = shape.corner;
|
|
69694
|
-
var isCornerChanged = corner !== this.corner;
|
|
69695
69824
|
var texture = toTexture(shape);
|
|
69696
69825
|
var textureTransformId = toTextureTransformId(texture);
|
|
69697
69826
|
var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
|
|
69698
|
-
var isVertexChanged = isSizeChanged ||
|
|
69827
|
+
var isVertexChanged = isSizeChanged || isStrokeChanged;
|
|
69699
69828
|
var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
|
|
69700
|
-
if (isNotInited ||
|
|
69701
|
-
isVertexChanged ||
|
|
69702
|
-
isTransformChanged ||
|
|
69703
|
-
isCornerChanged ||
|
|
69704
|
-
isTextureChanged) {
|
|
69829
|
+
if (isNotInited || isVertexChanged || isTransformChanged || isTextureChanged) {
|
|
69705
69830
|
this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
|
|
69706
69831
|
this.sizeX = sizeX;
|
|
69707
69832
|
this.sizeY = sizeY;
|
|
69708
|
-
this.radius = radius;
|
|
69709
69833
|
this.transformLocalId = transformLocalId;
|
|
69710
69834
|
this.strokeAlign = strokeAlign;
|
|
69711
69835
|
this.strokeWidth = strokeWidth;
|
|
69712
69836
|
this.strokeStyle = strokeStyle;
|
|
69713
|
-
this.corner = corner;
|
|
69714
69837
|
this.texture = texture;
|
|
69715
69838
|
this.textureTransformId = textureTransformId;
|
|
69716
69839
|
var voffset = this.vertexOffset;
|
|
69717
69840
|
buffer.updateVertices();
|
|
69718
|
-
|
|
69719
|
-
if (isNotInited || isVertexChanged || isTransformChanged
|
|
69841
|
+
buildTriangleLegacyVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, shape.transform.internalTransform, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69842
|
+
if (isNotInited || isVertexChanged || isTransformChanged) {
|
|
69720
69843
|
buffer.updateSteps();
|
|
69721
|
-
|
|
69844
|
+
buildTriangleLegacyStep(buffer.steps, voffset, strokeWidth, strokeStyle, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69722
69845
|
}
|
|
69723
69846
|
if (isNotInited || isVertexChanged || isTextureChanged) {
|
|
69724
69847
|
buffer.updateUvs();
|
|
69725
|
-
|
|
69848
|
+
buildTriangleLegacyUv(buffer.uvs, toTextureUvs(texture), voffset, TRIANGLE_LEGACY_WORLD_SIZE);
|
|
69726
69849
|
}
|
|
69727
69850
|
}
|
|
69728
69851
|
};
|
|
69729
|
-
return
|
|
69852
|
+
return BuilderTriangleLegacy;
|
|
69730
69853
|
}(BuilderBase));
|
|
69731
69854
|
|
|
69732
69855
|
/*
|
|
69733
69856
|
* Copyright (C) 2019 Toshiba Corporation
|
|
69734
69857
|
* SPDX-License-Identifier: Apache-2.0
|
|
69735
69858
|
*/
|
|
69736
|
-
var
|
|
69737
|
-
__extends(
|
|
69738
|
-
function
|
|
69739
|
-
|
|
69859
|
+
var BuilderTriangleRounded = /** @class */ (function (_super) {
|
|
69860
|
+
__extends(BuilderTriangleRounded, _super);
|
|
69861
|
+
function BuilderTriangleRounded(buffer, vertexOffset, indexOffset) {
|
|
69862
|
+
var _this = _super.call(this, buffer, vertexOffset, indexOffset, TRIANGLE_ROUNDED_VERTEX_COUNT, TRIANGLE_ROUNDED_INDEX_COUNT) || this;
|
|
69863
|
+
_this.radius = 0;
|
|
69864
|
+
_this.corner = 0;
|
|
69865
|
+
return _this;
|
|
69740
69866
|
}
|
|
69741
|
-
|
|
69867
|
+
BuilderTriangleRounded.prototype.init = function () {
|
|
69742
69868
|
var buffer = this.buffer;
|
|
69743
69869
|
buffer.updateIndices();
|
|
69744
|
-
|
|
69870
|
+
buildTriangleRoundedIndex(buffer.indices, this.vertexOffset, this.indexOffset);
|
|
69745
69871
|
this.inited |= BuilderFlag.INDEX;
|
|
69746
69872
|
};
|
|
69747
|
-
|
|
69873
|
+
BuilderTriangleRounded.prototype.update = function (shape) {
|
|
69748
69874
|
var buffer = this.buffer;
|
|
69749
69875
|
this.updateVertexStepAndUv(buffer, shape);
|
|
69750
69876
|
this.updateColor(buffer, shape);
|
|
69751
69877
|
};
|
|
69752
|
-
|
|
69878
|
+
BuilderTriangleRounded.prototype.updateVertexStepAndUv = function (buffer, shape) {
|
|
69753
69879
|
var size = shape.size;
|
|
69754
69880
|
var sizeX = size.x;
|
|
69755
69881
|
var sizeY = size.y;
|
|
69756
69882
|
var isSizeChanged = sizeX !== this.sizeX || sizeY !== this.sizeY;
|
|
69883
|
+
var radius = shape.radius;
|
|
69884
|
+
var isRadiusChanged = radius !== this.radius;
|
|
69757
69885
|
var transformLocalId = toTransformLocalId(shape);
|
|
69758
69886
|
var isTransformChanged = this.transformLocalId !== transformLocalId;
|
|
69759
69887
|
var stroke = shape.stroke;
|
|
@@ -69763,35 +69891,43 @@ var BuilderTriangle = /** @class */ (function (_super) {
|
|
|
69763
69891
|
var isStrokeChanged = this.strokeAlign !== strokeAlign ||
|
|
69764
69892
|
this.strokeWidth !== strokeWidth ||
|
|
69765
69893
|
this.strokeStyle !== strokeStyle;
|
|
69894
|
+
var corner = shape.corner;
|
|
69895
|
+
var isCornerChanged = corner !== this.corner;
|
|
69766
69896
|
var texture = toTexture(shape);
|
|
69767
69897
|
var textureTransformId = toTextureTransformId(texture);
|
|
69768
69898
|
var isTextureChanged = texture !== this.texture || textureTransformId !== this.textureTransformId;
|
|
69769
|
-
var isVertexChanged = isSizeChanged || isStrokeChanged;
|
|
69899
|
+
var isVertexChanged = isSizeChanged || isRadiusChanged || isStrokeChanged;
|
|
69770
69900
|
var isNotInited = !(this.inited & BuilderFlag.VERTEX_STEP_AND_UV);
|
|
69771
|
-
if (isNotInited ||
|
|
69901
|
+
if (isNotInited ||
|
|
69902
|
+
isVertexChanged ||
|
|
69903
|
+
isTransformChanged ||
|
|
69904
|
+
isCornerChanged ||
|
|
69905
|
+
isTextureChanged) {
|
|
69772
69906
|
this.inited |= BuilderFlag.VERTEX_STEP_AND_UV;
|
|
69773
69907
|
this.sizeX = sizeX;
|
|
69774
69908
|
this.sizeY = sizeY;
|
|
69909
|
+
this.radius = radius;
|
|
69775
69910
|
this.transformLocalId = transformLocalId;
|
|
69776
69911
|
this.strokeAlign = strokeAlign;
|
|
69777
69912
|
this.strokeWidth = strokeWidth;
|
|
69778
69913
|
this.strokeStyle = strokeStyle;
|
|
69914
|
+
this.corner = corner;
|
|
69779
69915
|
this.texture = texture;
|
|
69780
69916
|
this.textureTransformId = textureTransformId;
|
|
69781
69917
|
var voffset = this.vertexOffset;
|
|
69782
69918
|
buffer.updateVertices();
|
|
69783
|
-
|
|
69784
|
-
if (isNotInited || isVertexChanged || isTransformChanged) {
|
|
69919
|
+
buildTriangleRoundedVertex(buffer.vertices, voffset, 0, 0, sizeX, sizeY, strokeAlign, strokeWidth, radius, shape.transform.internalTransform, TRIANGLE_ROUNDED_WORLD_SIZE);
|
|
69920
|
+
if (isNotInited || isVertexChanged || isTransformChanged || isCornerChanged) {
|
|
69785
69921
|
buffer.updateSteps();
|
|
69786
|
-
|
|
69922
|
+
buildTriangleRoundedStep(buffer.steps, voffset, strokeWidth, strokeStyle, corner, radius, TRIANGLE_ROUNDED_WORLD_SIZE);
|
|
69787
69923
|
}
|
|
69788
69924
|
if (isNotInited || isVertexChanged || isTextureChanged) {
|
|
69789
69925
|
buffer.updateUvs();
|
|
69790
|
-
|
|
69926
|
+
buildTriangleRoundedUv(buffer.uvs, voffset, toTextureUvs(texture), radius, TRIANGLE_ROUNDED_WORLD_SIZE);
|
|
69791
69927
|
}
|
|
69792
69928
|
}
|
|
69793
69929
|
};
|
|
69794
|
-
return
|
|
69930
|
+
return BuilderTriangleRounded;
|
|
69795
69931
|
}(BuilderBase));
|
|
69796
69932
|
|
|
69797
69933
|
/*
|
|
@@ -70827,7 +70963,7 @@ var createLineOfTriangleRoundedsUploaded = function (buffer, shape, voffset, iof
|
|
|
70827
70963
|
* SPDX-License-Identifier: Apache-2.0
|
|
70828
70964
|
*/
|
|
70829
70965
|
var createLineOfTrianglesUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
|
|
70830
|
-
return createLineOfAnyUploaded(buffer, shape, voffset,
|
|
70966
|
+
return createLineOfAnyUploaded(buffer, shape, voffset, TRIANGLE_LEGACY_VERTEX_COUNT, ioffset, TRIANGLE_LEGACY_INDEX_COUNT, antialiasWeight, BuilderLineOfTriangles);
|
|
70831
70967
|
};
|
|
70832
70968
|
|
|
70833
70969
|
/*
|
|
@@ -70841,7 +70977,7 @@ var toMarkerVertexCount = function (type) {
|
|
|
70841
70977
|
case EShapePointsMarkerType.CIRCLE:
|
|
70842
70978
|
return CIRCLE_LEGACY_VERTEX_COUNT;
|
|
70843
70979
|
case EShapePointsMarkerType.TRIANGLE:
|
|
70844
|
-
return
|
|
70980
|
+
return TRIANGLE_LEGACY_VERTEX_COUNT;
|
|
70845
70981
|
case EShapePointsMarkerType.RECTANGLE:
|
|
70846
70982
|
return RECTANGLE_LEGACY_VERTEX_COUNT;
|
|
70847
70983
|
}
|
|
@@ -70854,7 +70990,7 @@ var toMarkerIndexCount = function (type) {
|
|
|
70854
70990
|
case EShapePointsMarkerType.CIRCLE:
|
|
70855
70991
|
return CIRCLE_LEGACY_INDEX_COUNT;
|
|
70856
70992
|
case EShapePointsMarkerType.TRIANGLE:
|
|
70857
|
-
return
|
|
70993
|
+
return TRIANGLE_LEGACY_INDEX_COUNT;
|
|
70858
70994
|
case EShapePointsMarkerType.RECTANGLE:
|
|
70859
70995
|
return RECTANGLE_LEGACY_INDEX_COUNT;
|
|
70860
70996
|
}
|
|
@@ -72988,16 +73124,16 @@ var createSemicircleUploaded = function (buffer, shape, voffset, ioffset, antial
|
|
|
72988
73124
|
* Copyright (C) 2019 Toshiba Corporation
|
|
72989
73125
|
* SPDX-License-Identifier: Apache-2.0
|
|
72990
73126
|
*/
|
|
72991
|
-
var
|
|
73127
|
+
var createTriangleLegacyUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
|
|
72992
73128
|
var tcount = toTextBufferCount(shape);
|
|
72993
73129
|
var tvcount = tcount << TEXT_VERTEX_COUNT_SHIFT;
|
|
72994
73130
|
var ticount = tcount << TEXT_INDEX_COUNT_SHIFT;
|
|
72995
|
-
var vcount =
|
|
72996
|
-
var icount =
|
|
73131
|
+
var vcount = TRIANGLE_LEGACY_VERTEX_COUNT + tvcount;
|
|
73132
|
+
var icount = TRIANGLE_LEGACY_INDEX_COUNT + ticount;
|
|
72997
73133
|
if (buffer.check(voffset, ioffset, vcount, icount)) {
|
|
72998
73134
|
return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
|
|
72999
|
-
new
|
|
73000
|
-
new BuilderText(buffer, voffset +
|
|
73135
|
+
new BuilderTriangleLegacy(buffer, voffset, ioffset),
|
|
73136
|
+
new BuilderText(buffer, voffset + TRIANGLE_LEGACY_VERTEX_COUNT, ioffset + TRIANGLE_LEGACY_INDEX_COUNT, tvcount, ticount)
|
|
73001
73137
|
]).init(shape);
|
|
73002
73138
|
}
|
|
73003
73139
|
return null;
|
|
@@ -73007,16 +73143,16 @@ var createTriangleRoundedUploaded = function (buffer, shape, voffset, ioffset, a
|
|
|
73007
73143
|
* Copyright (C) 2019 Toshiba Corporation
|
|
73008
73144
|
* SPDX-License-Identifier: Apache-2.0
|
|
73009
73145
|
*/
|
|
73010
|
-
var
|
|
73146
|
+
var createTriangleRoundedUploaded = function (buffer, shape, voffset, ioffset, antialiasWeight) {
|
|
73011
73147
|
var tcount = toTextBufferCount(shape);
|
|
73012
73148
|
var tvcount = tcount << TEXT_VERTEX_COUNT_SHIFT;
|
|
73013
73149
|
var ticount = tcount << TEXT_INDEX_COUNT_SHIFT;
|
|
73014
|
-
var vcount =
|
|
73015
|
-
var icount =
|
|
73150
|
+
var vcount = TRIANGLE_ROUNDED_VERTEX_COUNT + tvcount;
|
|
73151
|
+
var icount = TRIANGLE_ROUNDED_INDEX_COUNT + ticount;
|
|
73016
73152
|
if (buffer.check(voffset, ioffset, vcount, icount)) {
|
|
73017
73153
|
return new EShapeUploadedImpl(buffer, voffset, ioffset, vcount, icount, [
|
|
73018
|
-
new
|
|
73019
|
-
new BuilderText(buffer, voffset +
|
|
73154
|
+
new BuilderTriangleRounded(buffer, voffset, ioffset),
|
|
73155
|
+
new BuilderText(buffer, voffset + TRIANGLE_ROUNDED_VERTEX_COUNT, ioffset + TRIANGLE_ROUNDED_INDEX_COUNT, tvcount, ticount)
|
|
73020
73156
|
]).init(shape);
|
|
73021
73157
|
}
|
|
73022
73158
|
return null;
|
|
@@ -74567,7 +74703,7 @@ var EShapeLineOfCircles = /** @class */ (function (_super) {
|
|
|
74567
74703
|
var ex = x - px - ox;
|
|
74568
74704
|
var ey = y - py - oy;
|
|
74569
74705
|
if (this.containsAbsBBox(ex, ey, ax, ay)) {
|
|
74570
|
-
return
|
|
74706
|
+
return hitTestCircleLegacy(this, ex, ey, ax, ay, sw, ss);
|
|
74571
74707
|
}
|
|
74572
74708
|
return false;
|
|
74573
74709
|
};
|
|
@@ -74894,6 +75030,269 @@ var deserializeLineOfTriangleRoundeds = function (item, manager, shape) {
|
|
|
74894
75030
|
return deserializeBase(item, manager, shape || new EShapeLineOfTriangleRoundeds());
|
|
74895
75031
|
};
|
|
74896
75032
|
|
|
75033
|
+
/*
|
|
75034
|
+
* Copyright (C) 2019-2026 Toshiba Corporation
|
|
75035
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
75036
|
+
*/
|
|
75037
|
+
var EShapeTriangleTriangulatedImpl = /** @class */ (function () {
|
|
75038
|
+
function EShapeTriangleTriangulatedImpl(parent) {
|
|
75039
|
+
this._id = 0;
|
|
75040
|
+
this._parent = parent;
|
|
75041
|
+
this._width = 0;
|
|
75042
|
+
this._height = 0;
|
|
75043
|
+
this._strokeAlign = 0;
|
|
75044
|
+
this._strokeWidth = 0;
|
|
75045
|
+
this._sizeX = 0;
|
|
75046
|
+
this._sizeY = 0;
|
|
75047
|
+
this._vertices = [];
|
|
75048
|
+
this._nvertices = 0;
|
|
75049
|
+
this._distances = [];
|
|
75050
|
+
this._lengths = [];
|
|
75051
|
+
this._clippings = [];
|
|
75052
|
+
this._uvs = [];
|
|
75053
|
+
this._indices = [];
|
|
75054
|
+
this._nindices = 0;
|
|
75055
|
+
this._boundary = [0, 0, 0, 0];
|
|
75056
|
+
}
|
|
75057
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "id", {
|
|
75058
|
+
get: function () {
|
|
75059
|
+
this.triangulate();
|
|
75060
|
+
return this._id;
|
|
75061
|
+
},
|
|
75062
|
+
enumerable: false,
|
|
75063
|
+
configurable: true
|
|
75064
|
+
});
|
|
75065
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "vertices", {
|
|
75066
|
+
get: function () {
|
|
75067
|
+
this.triangulate();
|
|
75068
|
+
return this._vertices;
|
|
75069
|
+
},
|
|
75070
|
+
enumerable: false,
|
|
75071
|
+
configurable: true
|
|
75072
|
+
});
|
|
75073
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "nvertices", {
|
|
75074
|
+
get: function () {
|
|
75075
|
+
this.triangulate();
|
|
75076
|
+
return this._nvertices;
|
|
75077
|
+
},
|
|
75078
|
+
enumerable: false,
|
|
75079
|
+
configurable: true
|
|
75080
|
+
});
|
|
75081
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "distances", {
|
|
75082
|
+
get: function () {
|
|
75083
|
+
this.triangulate();
|
|
75084
|
+
return this._distances;
|
|
75085
|
+
},
|
|
75086
|
+
enumerable: false,
|
|
75087
|
+
configurable: true
|
|
75088
|
+
});
|
|
75089
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "lengths", {
|
|
75090
|
+
get: function () {
|
|
75091
|
+
this.triangulate();
|
|
75092
|
+
return this._lengths;
|
|
75093
|
+
},
|
|
75094
|
+
enumerable: false,
|
|
75095
|
+
configurable: true
|
|
75096
|
+
});
|
|
75097
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "clippings", {
|
|
75098
|
+
get: function () {
|
|
75099
|
+
this.triangulate();
|
|
75100
|
+
return this._clippings;
|
|
75101
|
+
},
|
|
75102
|
+
enumerable: false,
|
|
75103
|
+
configurable: true
|
|
75104
|
+
});
|
|
75105
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "uvs", {
|
|
75106
|
+
get: function () {
|
|
75107
|
+
this.triangulate();
|
|
75108
|
+
return this._uvs;
|
|
75109
|
+
},
|
|
75110
|
+
enumerable: false,
|
|
75111
|
+
configurable: true
|
|
75112
|
+
});
|
|
75113
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "indices", {
|
|
75114
|
+
get: function () {
|
|
75115
|
+
this.triangulate();
|
|
75116
|
+
return this._indices;
|
|
75117
|
+
},
|
|
75118
|
+
enumerable: false,
|
|
75119
|
+
configurable: true
|
|
75120
|
+
});
|
|
75121
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "nindices", {
|
|
75122
|
+
get: function () {
|
|
75123
|
+
this.triangulate();
|
|
75124
|
+
return this._nindices;
|
|
75125
|
+
},
|
|
75126
|
+
enumerable: false,
|
|
75127
|
+
configurable: true
|
|
75128
|
+
});
|
|
75129
|
+
Object.defineProperty(EShapeTriangleTriangulatedImpl.prototype, "boundary", {
|
|
75130
|
+
get: function () {
|
|
75131
|
+
this.triangulate();
|
|
75132
|
+
return this._boundary;
|
|
75133
|
+
},
|
|
75134
|
+
enumerable: false,
|
|
75135
|
+
configurable: true
|
|
75136
|
+
});
|
|
75137
|
+
EShapeTriangleTriangulatedImpl.prototype.triangulate = function () {
|
|
75138
|
+
var isNotInitialized = this._id === 0;
|
|
75139
|
+
var parent = this._parent;
|
|
75140
|
+
var size = parent.size;
|
|
75141
|
+
var width = size.x;
|
|
75142
|
+
var height = size.y;
|
|
75143
|
+
var isRectChanged = this._width !== width || this._height !== height;
|
|
75144
|
+
var stroke = parent.stroke;
|
|
75145
|
+
var strokeAlign = stroke.align;
|
|
75146
|
+
var strokeWidth = stroke.enable ? stroke.width : 0;
|
|
75147
|
+
var isStrokeChanged = this._strokeAlign !== strokeAlign || this._strokeWidth !== strokeWidth;
|
|
75148
|
+
var isSizeChanged = false;
|
|
75149
|
+
var sizeX = this._sizeX;
|
|
75150
|
+
var sizeY = this._sizeY;
|
|
75151
|
+
if (isRectChanged || isStrokeChanged) {
|
|
75152
|
+
this._width = width;
|
|
75153
|
+
this._height = height;
|
|
75154
|
+
this._strokeAlign = strokeAlign;
|
|
75155
|
+
this._strokeWidth = strokeWidth;
|
|
75156
|
+
var s = strokeAlign * strokeWidth;
|
|
75157
|
+
sizeX = width * 0.5 + (0 <= width ? +s : -s);
|
|
75158
|
+
sizeY = height * 0.5 + (0 <= height ? +s : -s);
|
|
75159
|
+
isSizeChanged = this._sizeX !== sizeX || this._sizeY !== sizeY;
|
|
75160
|
+
}
|
|
75161
|
+
if (isNotInitialized || isSizeChanged || isStrokeChanged) {
|
|
75162
|
+
this._sizeX = sizeX;
|
|
75163
|
+
this._sizeY = sizeY;
|
|
75164
|
+
this.update(sizeX, sizeY, 1.1);
|
|
75165
|
+
}
|
|
75166
|
+
};
|
|
75167
|
+
EShapeTriangleTriangulatedImpl.prototype.update = function (sizeX, sizeY, scale) {
|
|
75168
|
+
// Boundary
|
|
75169
|
+
var ax = Math.abs(sizeX);
|
|
75170
|
+
var ay = Math.abs(sizeY);
|
|
75171
|
+
var boundary = this._boundary;
|
|
75172
|
+
boundary[0] = -ax;
|
|
75173
|
+
boundary[1] = -ay;
|
|
75174
|
+
boundary[2] = +ax;
|
|
75175
|
+
boundary[3] = +ay;
|
|
75176
|
+
// # of vertices and # of indices
|
|
75177
|
+
var nv = 7;
|
|
75178
|
+
var ni = 3;
|
|
75179
|
+
this._nvertices = nv;
|
|
75180
|
+
this._nindices = ni;
|
|
75181
|
+
// ID
|
|
75182
|
+
this._id += 1;
|
|
75183
|
+
//
|
|
75184
|
+
if (sizeX === 0 || sizeY === 0) {
|
|
75185
|
+
this.pad(0, 0, nv, ni, 0);
|
|
75186
|
+
}
|
|
75187
|
+
else {
|
|
75188
|
+
this.updateAll(sizeX, sizeY, scale);
|
|
75189
|
+
}
|
|
75190
|
+
};
|
|
75191
|
+
/**
|
|
75192
|
+
* Fills the unused tail with degenerated triangles and trims the arrays
|
|
75193
|
+
* so that the buffers always hold exactly `nv` vertices and `ni` triangles.
|
|
75194
|
+
*/
|
|
75195
|
+
EShapeTriangleTriangulatedImpl.prototype.pad = function (iv, ii, nv, ni, fd) {
|
|
75196
|
+
var vertices = this._vertices;
|
|
75197
|
+
var distances = this._distances;
|
|
75198
|
+
var lengths = this._lengths;
|
|
75199
|
+
var clippings = this._clippings;
|
|
75200
|
+
var uvs = this._uvs;
|
|
75201
|
+
var indices = this._indices;
|
|
75202
|
+
for (var i = iv; i < nv; ++i) {
|
|
75203
|
+
var i2 = i << 1;
|
|
75204
|
+
vertices[i2] = 0;
|
|
75205
|
+
vertices[i2 + 1] = 0;
|
|
75206
|
+
distances[i] = fd;
|
|
75207
|
+
lengths[i] = 0;
|
|
75208
|
+
clippings[i] = 0;
|
|
75209
|
+
uvs[i2] = 0.5;
|
|
75210
|
+
uvs[i2 + 1] = 0.5;
|
|
75211
|
+
}
|
|
75212
|
+
for (var i = ii, imax = ni * 3; i < imax; ++i) {
|
|
75213
|
+
indices[i] = 0;
|
|
75214
|
+
}
|
|
75215
|
+
var nv2 = nv << 1;
|
|
75216
|
+
vertices.length = nv2;
|
|
75217
|
+
distances.length = nv;
|
|
75218
|
+
lengths.length = nv;
|
|
75219
|
+
clippings.length = nv;
|
|
75220
|
+
uvs.length = nv2;
|
|
75221
|
+
indices.length = ni * 3;
|
|
75222
|
+
};
|
|
75223
|
+
EShapeTriangleTriangulatedImpl.prototype.updateAll = function (sx, sy, scale) {
|
|
75224
|
+
var fx = 1 / sx;
|
|
75225
|
+
var fy = 1 / sy;
|
|
75226
|
+
var ax = Math.abs(sx);
|
|
75227
|
+
var ay = Math.abs(sy);
|
|
75228
|
+
// The triangle is defined by the apex (0, -sy) and the two base
|
|
75229
|
+
// vertices (-sx, sy) and (sx, sy). The signs of sx and
|
|
75230
|
+
// sy intentionally preserve horizontal and vertical reflections.
|
|
75231
|
+
// The sloped edge spans ax horizontally and 2 * ay vertically.
|
|
75232
|
+
var side = Math.sqrt(ax * ax + 4 * ay * ay);
|
|
75233
|
+
// The base is horizontal, so its length is twice the half-width.
|
|
75234
|
+
var base = 2 * ax;
|
|
75235
|
+
// Length values are measured along the triangle perimeter.
|
|
75236
|
+
var perimeter = 2 * side + base;
|
|
75237
|
+
// The incenter lies on the vertical center line. This is its y-coordinate.
|
|
75238
|
+
// Along the median, the distances from the top vertex to the incenter and
|
|
75239
|
+
// from the incenter to the base are in the ratio 2 * side : base.
|
|
75240
|
+
// Thus, (ay + cy) : (ay - cy) = 2 * side : base.
|
|
75241
|
+
// 2 side (ay - cy) = base * (ay + cy)
|
|
75242
|
+
// 2 side ay - 2 side cy = base ay + base cy
|
|
75243
|
+
// (base + 2 side) cy = ay (2 side - base)
|
|
75244
|
+
// cy = ay (2 side - base) / (2 side + base)
|
|
75245
|
+
// cy = ay (2 side - 2 ax) / (2 side + 2 ax)
|
|
75246
|
+
// cy = ay (side - ax) / (side + ax)
|
|
75247
|
+
var cx = 0;
|
|
75248
|
+
var cy = (sy * (side - ax)) / (side + ax);
|
|
75249
|
+
// The distance from the incenter to every edge is the inradius.
|
|
75250
|
+
// Since 0 <= (side - ax) / (side + ax) <= 1, the incenter remains
|
|
75251
|
+
// between the apex and the base even when sy is negative.
|
|
75252
|
+
var distance = Math.abs(sy - cy);
|
|
75253
|
+
var fdistance = 1 / distance;
|
|
75254
|
+
// Expand the triangle around its incenter for anti-aliasing and strokes.
|
|
75255
|
+
// The outer vertices are shared where their interpolated attributes match.
|
|
75256
|
+
var x0 = 0;
|
|
75257
|
+
var y0 = cy + scale * (-sy - cy);
|
|
75258
|
+
var x1 = scale * sx;
|
|
75259
|
+
var y1 = cy + scale * (sy - cy);
|
|
75260
|
+
var x2 = -x1;
|
|
75261
|
+
var y2 = y1;
|
|
75262
|
+
// Top-to-right edge cell. The inner vertex carries the fill attributes.
|
|
75263
|
+
this.updateVertex(0, x0, y0, fdistance, 0, scale, fx, fy);
|
|
75264
|
+
this.updateVertex(1, x1, y1, fdistance, side, scale, fx, fy);
|
|
75265
|
+
this.updateVertex(2, cx, cy, fdistance, side - ax, 0, fx, fy);
|
|
75266
|
+
var indices = this._indices;
|
|
75267
|
+
indices[0] = 0;
|
|
75268
|
+
indices[1] = 1;
|
|
75269
|
+
indices[2] = 2;
|
|
75270
|
+
// Right-to-left base edge cell. The right and left outer vertices are reused.
|
|
75271
|
+
this.updateVertex(3, x2, y2, fdistance, side + base, scale, fx, fy);
|
|
75272
|
+
this.updateVertex(4, cx, cy, fdistance, side + ax, 0, fx, fy);
|
|
75273
|
+
indices[3] = 1;
|
|
75274
|
+
indices[4] = 3;
|
|
75275
|
+
indices[5] = 4;
|
|
75276
|
+
// Left-to-top edge cell. The top vertex is duplicated for the perimeter seam.
|
|
75277
|
+
this.updateVertex(5, x0, y0, fdistance, perimeter, scale, fx, fy);
|
|
75278
|
+
this.updateVertex(6, cx, cy, fdistance, perimeter - (side - ax), 0, fx, fy);
|
|
75279
|
+
indices[6] = 3;
|
|
75280
|
+
indices[7] = 5;
|
|
75281
|
+
indices[8] = 6;
|
|
75282
|
+
};
|
|
75283
|
+
EShapeTriangleTriangulatedImpl.prototype.updateVertex = function (vertex, x, y, distance, length, clipping, fx, fy) {
|
|
75284
|
+
var vertex2 = vertex << 1;
|
|
75285
|
+
this._vertices[vertex2] = x;
|
|
75286
|
+
this._vertices[vertex2 + 1] = y;
|
|
75287
|
+
this._distances[vertex] = distance;
|
|
75288
|
+
this._lengths[vertex] = length;
|
|
75289
|
+
this._clippings[vertex] = clipping;
|
|
75290
|
+
this._uvs[vertex2] = 0.5 * (x * fx + 1);
|
|
75291
|
+
this._uvs[vertex2 + 1] = 0.5 * (y * fy + 1);
|
|
75292
|
+
};
|
|
75293
|
+
return EShapeTriangleTriangulatedImpl;
|
|
75294
|
+
}());
|
|
75295
|
+
|
|
74897
75296
|
/*
|
|
74898
75297
|
* Copyright (C) 2019 Toshiba Corporation
|
|
74899
75298
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -74902,8 +75301,20 @@ var EShapeTriangle = /** @class */ (function (_super) {
|
|
|
74902
75301
|
__extends(EShapeTriangle, _super);
|
|
74903
75302
|
function EShapeTriangle(type) {
|
|
74904
75303
|
if (type === void 0) { type = EShapeType.TRIANGLE; }
|
|
74905
|
-
|
|
75304
|
+
var _this = _super.call(this, type) || this;
|
|
75305
|
+
_this._triangulated = _this.newTriangulated();
|
|
75306
|
+
return _this;
|
|
74906
75307
|
}
|
|
75308
|
+
EShapeTriangle.prototype.newTriangulated = function () {
|
|
75309
|
+
return new EShapeTriangleTriangulatedImpl(this);
|
|
75310
|
+
};
|
|
75311
|
+
Object.defineProperty(EShapeTriangle.prototype, "triangulated", {
|
|
75312
|
+
get: function () {
|
|
75313
|
+
return this._triangulated;
|
|
75314
|
+
},
|
|
75315
|
+
enumerable: false,
|
|
75316
|
+
configurable: true
|
|
75317
|
+
});
|
|
74907
75318
|
EShapeTriangle.prototype.clone = function () {
|
|
74908
75319
|
return new EShapeTriangle(this.type).copy(this);
|
|
74909
75320
|
};
|
|
@@ -75063,7 +75474,7 @@ var deserializeRectangle = function (item, manager, shape) {
|
|
|
75063
75474
|
*/
|
|
75064
75475
|
var hitTestSemicircle = function (shape, x, y, ax, ay, sw, ss) {
|
|
75065
75476
|
if (y <= 0) {
|
|
75066
|
-
return
|
|
75477
|
+
return hitTestCircleLegacy(shape, x, y, ax, ay, sw, ss);
|
|
75067
75478
|
}
|
|
75068
75479
|
return false;
|
|
75069
75480
|
};
|
|
@@ -75105,6 +75516,36 @@ var deserializeSemicircle = function (item, manager, shape) {
|
|
|
75105
75516
|
return deserializeBase(item, manager, shape || new EShapeSemicircle());
|
|
75106
75517
|
};
|
|
75107
75518
|
|
|
75519
|
+
/*
|
|
75520
|
+
* Copyright (C) 2019 Toshiba Corporation
|
|
75521
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
75522
|
+
*/
|
|
75523
|
+
var EShapeTriangleLegacy = /** @class */ (function (_super) {
|
|
75524
|
+
__extends(EShapeTriangleLegacy, _super);
|
|
75525
|
+
function EShapeTriangleLegacy(type) {
|
|
75526
|
+
if (type === void 0) { type = EShapeType.TRIANGLE_LEGACY; }
|
|
75527
|
+
return _super.call(this, type) || this;
|
|
75528
|
+
}
|
|
75529
|
+
EShapeTriangleLegacy.prototype.clone = function () {
|
|
75530
|
+
return new EShapeTriangleLegacy(this.type).copy(this);
|
|
75531
|
+
};
|
|
75532
|
+
EShapeTriangleLegacy.prototype.containsAbs = function (x, y, ax, ay, sw, ss, sa) {
|
|
75533
|
+
if (_super.prototype.containsAbsBBox.call(this, x, y, ax, ay)) {
|
|
75534
|
+
return hitTestTriangleLegacy(this, x, y, ax, ay, sw, ss);
|
|
75535
|
+
}
|
|
75536
|
+
return false;
|
|
75537
|
+
};
|
|
75538
|
+
return EShapeTriangleLegacy;
|
|
75539
|
+
}(EShapePrimitive));
|
|
75540
|
+
|
|
75541
|
+
/*
|
|
75542
|
+
* Copyright (C) 2019 Toshiba Corporation
|
|
75543
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
75544
|
+
*/
|
|
75545
|
+
var deserializeTriangleLegacy = function (item, manager, shape) {
|
|
75546
|
+
return deserializeBase(item, manager, shape || new EShapeTriangleLegacy());
|
|
75547
|
+
};
|
|
75548
|
+
|
|
75108
75549
|
/*
|
|
75109
75550
|
* Copyright (C) 2019 Toshiba Corporation
|
|
75110
75551
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -75530,10 +75971,19 @@ var loadShapeSemicircle = function () {
|
|
|
75530
75971
|
* SPDX-License-Identifier: Apache-2.0
|
|
75531
75972
|
*/
|
|
75532
75973
|
var loadShapeTriangle = function () {
|
|
75533
|
-
EShapeUploadeds[EShapeType.TRIANGLE] =
|
|
75974
|
+
EShapeUploadeds[EShapeType.TRIANGLE] = createPolygonUploaded;
|
|
75534
75975
|
EShapeDeserializers[EShapeType.TRIANGLE] = deserializeTriangle;
|
|
75535
75976
|
};
|
|
75536
75977
|
|
|
75978
|
+
/*
|
|
75979
|
+
* Copyright (C) 2019 Toshiba Corporation
|
|
75980
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
75981
|
+
*/
|
|
75982
|
+
var loadShapeTriangleLegacy = function () {
|
|
75983
|
+
EShapeUploadeds[EShapeType.TRIANGLE_LEGACY] = createTriangleLegacyUploaded;
|
|
75984
|
+
EShapeDeserializers[EShapeType.TRIANGLE_LEGACY] = deserializeTriangleLegacy;
|
|
75985
|
+
};
|
|
75986
|
+
|
|
75537
75987
|
/*
|
|
75538
75988
|
* Copyright (C) 2019 Toshiba Corporation
|
|
75539
75989
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -75541,7 +75991,7 @@ var loadShapeTriangle = function () {
|
|
|
75541
75991
|
var loadShapeTriangleRounded = function () {
|
|
75542
75992
|
EShapeUploadeds[EShapeType.TRIANGLE_ROUNDED] = createTriangleRoundedUploaded;
|
|
75543
75993
|
EShapeDeserializers[EShapeType.TRIANGLE_ROUNDED] = deserializeTriangleRounded;
|
|
75544
|
-
EShapeCapabilities.set(EShapeType.TRIANGLE_ROUNDED, EShapeCapability.PRIMITIVE | EShapeCapability.
|
|
75994
|
+
EShapeCapabilities.set(EShapeType.TRIANGLE_ROUNDED, EShapeCapability.PRIMITIVE | EShapeCapability.BORDER_RADIUS);
|
|
75545
75995
|
};
|
|
75546
75996
|
|
|
75547
75997
|
/*
|
|
@@ -75569,6 +76019,7 @@ var loadShapeAll = function () {
|
|
|
75569
76019
|
loadShapeRectangleRounded();
|
|
75570
76020
|
loadShapeRectangle();
|
|
75571
76021
|
loadShapeSemicircle();
|
|
76022
|
+
loadShapeTriangleLegacy();
|
|
75572
76023
|
loadShapeTriangleRounded();
|
|
75573
76024
|
loadShapeTriangle();
|
|
75574
76025
|
loadShapeLineOfCircles();
|
|
@@ -106432,7 +106883,8 @@ exports.BuilderRectanglePivoted = BuilderRectanglePivoted;
|
|
|
106432
106883
|
exports.BuilderRectangleRounded = BuilderRectangleRounded;
|
|
106433
106884
|
exports.BuilderSemicircle = BuilderSemicircle;
|
|
106434
106885
|
exports.BuilderText = BuilderText;
|
|
106435
|
-
exports.BuilderTriangle =
|
|
106886
|
+
exports.BuilderTriangle = BuilderTriangleLegacy;
|
|
106887
|
+
exports.BuilderTriangleLegacy = BuilderTriangleLegacy;
|
|
106436
106888
|
exports.BuilderTriangleRounded = BuilderTriangleRounded;
|
|
106437
106889
|
exports.CIRCLE_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
|
|
106438
106890
|
exports.CIRCLE_LEGACY_INDEX_COUNT = CIRCLE_LEGACY_INDEX_COUNT;
|
|
@@ -107785,7 +108237,9 @@ exports.EShapeTextStyle = EShapeTextStyle;
|
|
|
107785
108237
|
exports.EShapeTextWeight = EShapeTextWeight;
|
|
107786
108238
|
exports.EShapeTransformImpl = EShapeTransformImpl;
|
|
107787
108239
|
exports.EShapeTriangle = EShapeTriangle;
|
|
108240
|
+
exports.EShapeTriangleLegacy = EShapeTriangleLegacy;
|
|
107788
108241
|
exports.EShapeTriangleRounded = EShapeTriangleRounded;
|
|
108242
|
+
exports.EShapeTriangleTriangulatedImpl = EShapeTriangleTriangulatedImpl;
|
|
107789
108243
|
exports.EShapeType = EShapeType;
|
|
107790
108244
|
exports.EShapeUploadedImpl = EShapeUploadedImpl;
|
|
107791
108245
|
exports.EShapeUploadeds = EShapeUploadeds;
|
|
@@ -107863,12 +108317,15 @@ exports.TEXT_INDEX_COUNT = TEXT_INDEX_COUNT;
|
|
|
107863
108317
|
exports.TEXT_INDEX_COUNT_SHIFT = TEXT_INDEX_COUNT_SHIFT;
|
|
107864
108318
|
exports.TEXT_VERTEX_COUNT = TEXT_VERTEX_COUNT;
|
|
107865
108319
|
exports.TEXT_VERTEX_COUNT_SHIFT = TEXT_VERTEX_COUNT_SHIFT;
|
|
107866
|
-
exports.TRIANGLE_INDEX_COUNT =
|
|
108320
|
+
exports.TRIANGLE_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
|
|
108321
|
+
exports.TRIANGLE_LEGACY_INDEX_COUNT = TRIANGLE_LEGACY_INDEX_COUNT;
|
|
108322
|
+
exports.TRIANGLE_LEGACY_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
|
|
108323
|
+
exports.TRIANGLE_LEGACY_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
|
|
107867
108324
|
exports.TRIANGLE_ROUNDED_INDEX_COUNT = TRIANGLE_ROUNDED_INDEX_COUNT;
|
|
107868
108325
|
exports.TRIANGLE_ROUNDED_VERTEX_COUNT = TRIANGLE_ROUNDED_VERTEX_COUNT;
|
|
107869
108326
|
exports.TRIANGLE_ROUNDED_WORLD_SIZE = TRIANGLE_ROUNDED_WORLD_SIZE;
|
|
107870
|
-
exports.TRIANGLE_VERTEX_COUNT =
|
|
107871
|
-
exports.TRIANGLE_WORLD_SIZE =
|
|
108327
|
+
exports.TRIANGLE_VERTEX_COUNT = TRIANGLE_LEGACY_VERTEX_COUNT;
|
|
108328
|
+
exports.TRIANGLE_WORLD_SIZE = TRIANGLE_LEGACY_WORLD_SIZE;
|
|
107872
108329
|
exports.UtilAlpha = UtilAlpha;
|
|
107873
108330
|
exports.UtilAttach = UtilAttach;
|
|
107874
108331
|
exports.UtilAttachAlign = UtilAttachAlign;
|
|
@@ -107964,14 +108421,18 @@ exports.buildSemicircleVertex = buildSemicircleVertex;
|
|
|
107964
108421
|
exports.buildTextIndex = buildTextIndex;
|
|
107965
108422
|
exports.buildTextStep = buildTextStep;
|
|
107966
108423
|
exports.buildTextVertex = buildTextVertex;
|
|
107967
|
-
exports.buildTriangleIndex =
|
|
108424
|
+
exports.buildTriangleIndex = buildTriangleLegacyIndex;
|
|
108425
|
+
exports.buildTriangleLegacyIndex = buildTriangleLegacyIndex;
|
|
108426
|
+
exports.buildTriangleLegacyStep = buildTriangleLegacyStep;
|
|
108427
|
+
exports.buildTriangleLegacyUv = buildTriangleLegacyUv;
|
|
108428
|
+
exports.buildTriangleLegacyVertex = buildTriangleLegacyVertex;
|
|
107968
108429
|
exports.buildTriangleRoundedIndex = buildTriangleRoundedIndex;
|
|
107969
108430
|
exports.buildTriangleRoundedStep = buildTriangleRoundedStep;
|
|
107970
108431
|
exports.buildTriangleRoundedUv = buildTriangleRoundedUv;
|
|
107971
108432
|
exports.buildTriangleRoundedVertex = buildTriangleRoundedVertex;
|
|
107972
|
-
exports.buildTriangleStep =
|
|
107973
|
-
exports.buildTriangleUv =
|
|
107974
|
-
exports.buildTriangleVertex =
|
|
108433
|
+
exports.buildTriangleStep = buildTriangleLegacyStep;
|
|
108434
|
+
exports.buildTriangleUv = buildTriangleLegacyUv;
|
|
108435
|
+
exports.buildTriangleVertex = buildTriangleLegacyVertex;
|
|
107975
108436
|
exports.copyIndex = copyIndex;
|
|
107976
108437
|
exports.copyStep = copyStep;
|
|
107977
108438
|
exports.copyUvs = copyUvs;
|
|
@@ -108001,8 +108462,9 @@ exports.createRectanglePivotedUploaded = createRectanglePivotedUploaded;
|
|
|
108001
108462
|
exports.createRectangleRoundedUploaded = createRectangleRoundedUploaded;
|
|
108002
108463
|
exports.createRectangleUploaded = createRectangleLegacyUploaded;
|
|
108003
108464
|
exports.createSemicircleUploaded = createSemicircleUploaded;
|
|
108465
|
+
exports.createTriangleLegacyUploaded = createTriangleLegacyUploaded;
|
|
108004
108466
|
exports.createTriangleRoundedUploaded = createTriangleRoundedUploaded;
|
|
108005
|
-
exports.createTriangleUploaded =
|
|
108467
|
+
exports.createTriangleUploaded = createTriangleLegacyUploaded;
|
|
108006
108468
|
exports.dThemeDarkEnUsDialogProcessingMessage = dThemeDarkEnUsDialogProcessingMessage;
|
|
108007
108469
|
exports.dThemeDarkJaJpDialogProcessingMessage = dThemeDarkJaJpDialogProcessingMessage;
|
|
108008
108470
|
exports.dThemeWhiteEnUsDialogProcessingMessage = dThemeWhiteEnUsDialogProcessingMessage;
|
|
@@ -108040,16 +108502,20 @@ exports.deserializeRectanglePivoted = deserializeRectanglePivoted;
|
|
|
108040
108502
|
exports.deserializeRectangleRounded = deserializeRectangleRounded;
|
|
108041
108503
|
exports.deserializeSemicircle = deserializeSemicircle;
|
|
108042
108504
|
exports.deserializeTriangle = deserializeTriangle;
|
|
108505
|
+
exports.deserializeTriangleLegacy = deserializeTriangleLegacy;
|
|
108043
108506
|
exports.deserializeTriangleRounded = deserializeTriangleRounded;
|
|
108044
108507
|
exports.eShapePointsFormatterCurve = eShapePointsFormatterCurve;
|
|
108045
108508
|
exports.eShapePointsFormatterCurveBezierQuadratic = eShapePointsFormatterCurveBezierQuadratic;
|
|
108046
108509
|
exports.hitTestBBox = hitTestBBox;
|
|
108047
108510
|
exports.hitTestCircle = hitTestCircle;
|
|
108511
|
+
exports.hitTestCircleLegacy = hitTestCircleLegacy;
|
|
108048
108512
|
exports.hitTestRectangle = hitTestRectangle;
|
|
108513
|
+
exports.hitTestRectangleLegacy = hitTestRectangleLegacy;
|
|
108049
108514
|
exports.hitTestRectangleRounded = hitTestRectangleRounded;
|
|
108050
108515
|
exports.hitTestSemicircle = hitTestSemicircle;
|
|
108051
108516
|
exports.hitTestTriangle = hitTestTriangle;
|
|
108052
108517
|
exports.hitTestTriangleFilled = hitTestTriangleFilled;
|
|
108518
|
+
exports.hitTestTriangleLegacy = hitTestTriangleLegacy;
|
|
108053
108519
|
exports.hitTestTriangleRounded = hitTestTriangleRounded;
|
|
108054
108520
|
exports.isArray = isArray;
|
|
108055
108521
|
exports.isFunction = isFunction;
|
|
@@ -108093,6 +108559,7 @@ exports.loadShapeRectanglePivoted = loadShapeRectanglePivoted;
|
|
|
108093
108559
|
exports.loadShapeRectangleRounded = loadShapeRectangleRounded;
|
|
108094
108560
|
exports.loadShapeSemicircle = loadShapeSemicircle;
|
|
108095
108561
|
exports.loadShapeTriangle = loadShapeTriangle;
|
|
108562
|
+
exports.loadShapeTriangleLegacy = loadShapeTriangleLegacy;
|
|
108096
108563
|
exports.loadShapeTriangleRounded = loadShapeTriangleRounded;
|
|
108097
108564
|
exports.loadThemeDark = loadThemeDark;
|
|
108098
108565
|
exports.loadThemeDarkBase = loadThemeDarkBase;
|