@revideo/2d 0.2.5 → 0.2.6-alpha.906
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/lib/code/CodeCursor.d.ts +74 -74
- package/lib/code/CodeCursor.js +286 -352
- package/lib/code/CodeDiffer.d.ts +16 -21
- package/lib/code/CodeDiffer.js +41 -39
- package/lib/code/CodeFragment.d.ts +8 -16
- package/lib/code/CodeFragment.js +36 -36
- package/lib/code/CodeHighlighter.d.ts +59 -59
- package/lib/code/CodeHighlighter.js +1 -1
- package/lib/code/CodeMetrics.d.ts +8 -12
- package/lib/code/CodeMetrics.js +24 -26
- package/lib/code/CodeRange.d.ts +5 -21
- package/lib/code/CodeRange.js +124 -131
- package/lib/code/CodeScope.d.ts +8 -18
- package/lib/code/CodeScope.js +61 -59
- package/lib/code/CodeSelection.d.ts +4 -9
- package/lib/code/CodeSelection.js +8 -8
- package/lib/code/CodeSignal.d.ts +47 -74
- package/lib/code/CodeSignal.js +189 -206
- package/lib/code/CodeTokenizer.d.ts +1 -1
- package/lib/code/CodeTokenizer.js +41 -41
- package/lib/code/DefaultHighlightStyle.d.ts +2 -2
- package/lib/code/DefaultHighlightStyle.js +96 -96
- package/lib/code/LezerHighlighter.d.ts +19 -21
- package/lib/code/LezerHighlighter.js +101 -101
- package/lib/code/diff.d.ts +9 -12
- package/lib/code/diff.js +205 -218
- package/lib/code/extractRange.d.ts +4 -7
- package/lib/code/extractRange.js +71 -79
- package/lib/code/index.d.ts +1 -1
- package/lib/code/index.js +1 -1
- package/lib/components/Audio.d.ts +11 -11
- package/lib/components/Audio.d.ts.map +1 -1
- package/lib/components/Audio.js +109 -115
- package/lib/components/Bezier.d.ts +18 -18
- package/lib/components/Bezier.js +75 -86
- package/lib/components/Circle.d.ts +90 -95
- package/lib/components/Circle.js +74 -85
- package/lib/components/Code.d.ts +211 -244
- package/lib/components/Code.d.ts.map +1 -1
- package/lib/components/Code.js +269 -317
- package/lib/components/CodeBlock.d.ts +67 -109
- package/lib/components/CodeBlock.d.ts.map +1 -1
- package/lib/components/CodeBlock.js +373 -414
- package/lib/components/CubicBezier.d.ts +36 -36
- package/lib/components/CubicBezier.js +49 -52
- package/lib/components/Curve.d.ts +198 -208
- package/lib/components/Curve.js +269 -270
- package/lib/components/Grid.d.ts +42 -47
- package/lib/components/Grid.js +56 -63
- package/lib/components/Icon.d.ts +50 -55
- package/lib/components/Icon.js +50 -58
- package/lib/components/Img.d.ts +79 -86
- package/lib/components/Img.d.ts.map +1 -1
- package/lib/components/Img.js +181 -193
- package/lib/components/Knot.d.ts +78 -97
- package/lib/components/Knot.js +60 -81
- package/lib/components/Latex.d.ts +12 -12
- package/lib/components/Latex.js +65 -77
- package/lib/components/Layout.d.ts +413 -455
- package/lib/components/Layout.d.ts.map +1 -1
- package/lib/components/Layout.js +681 -666
- package/lib/components/Line.d.ts +49 -61
- package/lib/components/Line.js +193 -216
- package/lib/components/Media.d.ts +35 -35
- package/lib/components/Media.d.ts.map +1 -1
- package/lib/components/Media.js +134 -135
- package/lib/components/Node.d.ts +830 -875
- package/lib/components/Node.d.ts.map +1 -1
- package/lib/components/Node.js +1314 -1383
- package/lib/components/Path.d.ts +14 -35
- package/lib/components/Path.js +89 -100
- package/lib/components/Polygon.d.ts +55 -60
- package/lib/components/Polygon.js +66 -71
- package/lib/components/QuadBezier.d.ts +29 -29
- package/lib/components/QuadBezier.js +45 -50
- package/lib/components/Ray.d.ts +28 -28
- package/lib/components/Ray.js +64 -71
- package/lib/components/Rect.d.ts +108 -115
- package/lib/components/Rect.js +72 -78
- package/lib/components/SVG.d.ts +139 -165
- package/lib/components/SVG.js +541 -609
- package/lib/components/Shape.d.ts +35 -44
- package/lib/components/Shape.d.ts.map +1 -1
- package/lib/components/Shape.js +127 -112
- package/lib/components/Spline.d.ts +40 -46
- package/lib/components/Spline.js +175 -190
- package/lib/components/Txt.d.ts +44 -55
- package/lib/components/Txt.d.ts.map +1 -1
- package/lib/components/Txt.js +155 -156
- package/lib/components/TxtLeaf.d.ts +16 -20
- package/lib/components/TxtLeaf.d.ts.map +1 -1
- package/lib/components/TxtLeaf.js +2 -2
- package/lib/components/Video.d.ts +45 -41
- package/lib/components/Video.d.ts.map +1 -1
- package/lib/components/Video.js +207 -138
- package/lib/components/View2D.d.ts +22 -21
- package/lib/components/View2D.d.ts.map +1 -1
- package/lib/components/View2D.js +89 -98
- package/lib/components/index.d.ts +1 -1
- package/lib/components/index.js +1 -1
- package/lib/components/types.d.ts +9 -22
- package/lib/components/types.js +1 -1
- package/lib/curves/ArcSegment.d.ts +24 -36
- package/lib/curves/ArcSegment.js +94 -145
- package/lib/curves/CircleSegment.d.ts +16 -26
- package/lib/curves/CircleSegment.js +49 -56
- package/lib/curves/CubicBezierSegment.d.ts +13 -18
- package/lib/curves/CubicBezierSegment.js +46 -79
- package/lib/curves/CurveDrawingInfo.d.ts +9 -9
- package/lib/curves/CurveDrawingInfo.js +1 -1
- package/lib/curves/CurvePoint.d.ts +13 -13
- package/lib/curves/CurvePoint.js +1 -1
- package/lib/curves/CurveProfile.d.ts +5 -5
- package/lib/curves/CurveProfile.js +1 -1
- package/lib/curves/KnotInfo.d.ts +8 -8
- package/lib/curves/KnotInfo.js +1 -1
- package/lib/curves/LineSegment.d.ts +14 -19
- package/lib/curves/LineSegment.js +42 -42
- package/lib/curves/Polynomial.d.ts +110 -110
- package/lib/curves/Polynomial.js +239 -249
- package/lib/curves/Polynomial2D.d.ts +20 -20
- package/lib/curves/Polynomial2D.js +42 -46
- package/lib/curves/PolynomialSegment.d.ts +37 -42
- package/lib/curves/PolynomialSegment.js +81 -83
- package/lib/curves/QuadBezierSegment.d.ts +12 -12
- package/lib/curves/QuadBezierSegment.js +41 -71
- package/lib/curves/Segment.d.ts +7 -12
- package/lib/curves/Segment.js +3 -2
- package/lib/curves/UniformPolynomialCurveSampler.d.ts +34 -34
- package/lib/curves/UniformPolynomialCurveSampler.js +62 -68
- package/lib/curves/createCurveProfileLerp.d.ts +6 -17
- package/lib/curves/createCurveProfileLerp.js +208 -211
- package/lib/curves/getBezierSplineProfile.d.ts +4 -8
- package/lib/curves/getBezierSplineProfile.js +101 -145
- package/lib/curves/getCircleProfile.d.ts +4 -10
- package/lib/curves/getCircleProfile.js +40 -72
- package/lib/curves/getPathProfile.d.ts +2 -2
- package/lib/curves/getPathProfile.js +112 -135
- package/lib/curves/getPointAtDistance.d.ts +4 -7
- package/lib/curves/getPointAtDistance.js +12 -12
- package/lib/curves/getPolylineProfile.d.ts +4 -8
- package/lib/curves/getPolylineProfile.js +54 -67
- package/lib/curves/getRectProfile.d.ts +4 -9
- package/lib/curves/getRectProfile.js +52 -117
- package/lib/curves/index.d.ts +1 -1
- package/lib/curves/index.js +1 -1
- package/lib/decorators/canvasStyleSignal.d.ts +3 -3
- package/lib/decorators/canvasStyleSignal.js +10 -10
- package/lib/decorators/colorSignal.d.ts +1 -1
- package/lib/decorators/colorSignal.js +7 -7
- package/lib/decorators/compound.d.ts +2 -4
- package/lib/decorators/compound.js +23 -43
- package/lib/decorators/computed.d.ts +1 -1
- package/lib/decorators/computed.js +9 -9
- package/lib/decorators/defaultStyle.d.ts +2 -5
- package/lib/decorators/defaultStyle.js +11 -11
- package/lib/decorators/filtersSignal.d.ts +8 -28
- package/lib/decorators/filtersSignal.js +64 -87
- package/lib/decorators/index.d.ts +1 -1
- package/lib/decorators/index.js +1 -1
- package/lib/decorators/initializers.d.ts +2 -5
- package/lib/decorators/initializers.js +19 -18
- package/lib/decorators/nodeName.d.ts +1 -1
- package/lib/decorators/nodeName.js +4 -4
- package/lib/decorators/signal.d.ts +20 -40
- package/lib/decorators/signal.js +104 -113
- package/lib/decorators/spacingSignal.d.ts +1 -1
- package/lib/decorators/spacingSignal.js +13 -13
- package/lib/decorators/vector2Signal.d.ts +7 -13
- package/lib/decorators/vector2Signal.js +13 -15
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/lib/jsx-dev-runtime.d.ts +3 -3
- package/lib/jsx-dev-runtime.js +3 -3
- package/lib/jsx-runtime.d.ts +9 -19
- package/lib/jsx-runtime.js +18 -18
- package/lib/partials/Filter.d.ts +16 -24
- package/lib/partials/Filter.js +69 -69
- package/lib/partials/Gradient.d.ts +24 -30
- package/lib/partials/Gradient.js +58 -69
- package/lib/partials/Pattern.d.ts +9 -14
- package/lib/partials/Pattern.js +24 -30
- package/lib/partials/ShaderConfig.d.ts +74 -81
- package/lib/partials/ShaderConfig.js +23 -22
- package/lib/partials/index.d.ts +1 -1
- package/lib/partials/index.js +1 -1
- package/lib/partials/types.d.ts +6 -19
- package/lib/partials/types.js +1 -1
- package/lib/scenes/Scene2D.d.ts +23 -42
- package/lib/scenes/Scene2D.d.ts.map +1 -1
- package/lib/scenes/Scene2D.js +152 -161
- package/lib/scenes/index.d.ts +1 -1
- package/lib/scenes/index.js +1 -1
- package/lib/scenes/makeScene2D.d.ts +5 -7
- package/lib/scenes/makeScene2D.js +10 -10
- package/lib/scenes/useScene2D.d.ts +2 -2
- package/lib/scenes/useScene2D.js +3 -3
- package/lib/tsconfig.build.tsbuildinfo +1 -1
- package/lib/utils/CanvasUtils.d.ts +21 -93
- package/lib/utils/CanvasUtils.js +105 -186
- package/lib/utils/diff.d.ts +18 -25
- package/lib/utils/diff.js +87 -84
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/is.d.ts +2 -4
- package/lib/utils/is.js +2 -2
- package/lib/utils/makeSignalExtensions.d.ts +4 -11
- package/lib/utils/makeSignalExtensions.js +17 -17
- package/package.json +5 -5
- package/src/lib/components/Audio.ts +2 -2
- package/src/lib/components/Code.ts +4 -2
- package/src/lib/components/CodeBlock.ts +1 -1
- package/src/lib/components/Img.ts +2 -2
- package/src/lib/components/Layout.ts +2 -2
- package/src/lib/components/Media.ts +3 -1
- package/src/lib/components/Node.ts +9 -9
- package/src/lib/components/Shape.ts +2 -2
- package/src/lib/components/Txt.ts +2 -2
- package/src/lib/components/TxtLeaf.ts +1 -1
- package/src/lib/components/Video.ts +120 -8
- package/src/lib/components/View2D.ts +6 -2
- package/src/lib/scenes/Scene2D.ts +4 -3
package/lib/components/Bezier.js
CHANGED
|
@@ -1,91 +1,80 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var
|
|
5
|
-
r =
|
|
6
|
-
c < 3
|
|
7
|
-
? target
|
|
8
|
-
: desc === null
|
|
9
|
-
? (desc = Object.getOwnPropertyDescriptor(target, key))
|
|
10
|
-
: desc,
|
|
11
|
-
d;
|
|
12
|
-
if (typeof Reflect === 'object' && typeof Reflect.decorate === 'function')
|
|
13
|
-
r = Reflect.decorate(decorators, target, key, desc);
|
|
14
|
-
else
|
|
15
|
-
for (var i = decorators.length - 1; i >= 0; i--)
|
|
16
|
-
if ((d = decorators[i]))
|
|
17
|
-
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
|
|
20
|
-
import {BBox} from '@revideo/core';
|
|
21
|
-
import {computed} from '../decorators';
|
|
22
|
-
import {arc, drawLine, drawPivot, moveTo} from '../utils';
|
|
23
|
-
import {Curve} from './Curve';
|
|
6
|
+
};
|
|
7
|
+
import { BBox } from '@revideo/core';
|
|
8
|
+
import { computed } from '../decorators';
|
|
9
|
+
import { arc, drawLine, drawPivot, moveTo } from '../utils';
|
|
10
|
+
import { Curve } from './Curve';
|
|
24
11
|
export class Bezier extends Curve {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
childrenBBox() {
|
|
34
|
-
return BBox.fromPoints(...this.segment().points);
|
|
35
|
-
}
|
|
36
|
-
desiredSize() {
|
|
37
|
-
return this.segment().getBBox().size;
|
|
38
|
-
}
|
|
39
|
-
offsetComputedLayout(box) {
|
|
40
|
-
box.position = box.position.sub(this.segment().getBBox().center);
|
|
41
|
-
return box;
|
|
42
|
-
}
|
|
43
|
-
drawOverlay(context, matrix) {
|
|
44
|
-
const size = this.computedSize();
|
|
45
|
-
const box = this.childrenBBox().transformCorners(matrix);
|
|
46
|
-
const offset = size.mul(this.offset()).scale(0.5).transformAsPoint(matrix);
|
|
47
|
-
const overlayInfo = this.overlayInfo(matrix);
|
|
48
|
-
context.lineWidth = 1;
|
|
49
|
-
context.strokeStyle = 'white';
|
|
50
|
-
context.fillStyle = 'white';
|
|
51
|
-
// Draw the curve itself first so everything else gets drawn on top of it
|
|
52
|
-
context.stroke(overlayInfo.curve);
|
|
53
|
-
context.fillStyle = 'white';
|
|
54
|
-
context.globalAlpha = 0.5;
|
|
55
|
-
context.beginPath();
|
|
56
|
-
context.stroke(overlayInfo.handleLines);
|
|
57
|
-
context.globalAlpha = 1;
|
|
58
|
-
context.lineWidth = 2;
|
|
59
|
-
// Draw start and end points
|
|
60
|
-
for (const point of [overlayInfo.startPoint, overlayInfo.endPoint]) {
|
|
61
|
-
moveTo(context, point);
|
|
62
|
-
context.beginPath();
|
|
63
|
-
arc(context, point, 4);
|
|
64
|
-
context.closePath();
|
|
65
|
-
context.stroke();
|
|
66
|
-
context.fill();
|
|
12
|
+
profile() {
|
|
13
|
+
const segment = this.segment();
|
|
14
|
+
return {
|
|
15
|
+
segments: [segment],
|
|
16
|
+
arcLength: segment.arcLength,
|
|
17
|
+
minSin: 0,
|
|
18
|
+
};
|
|
67
19
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
20
|
+
childrenBBox() {
|
|
21
|
+
return BBox.fromPoints(...this.segment().points);
|
|
22
|
+
}
|
|
23
|
+
desiredSize() {
|
|
24
|
+
return this.segment().getBBox().size;
|
|
25
|
+
}
|
|
26
|
+
offsetComputedLayout(box) {
|
|
27
|
+
box.position = box.position.sub(this.segment().getBBox().center);
|
|
28
|
+
return box;
|
|
29
|
+
}
|
|
30
|
+
drawOverlay(context, matrix) {
|
|
31
|
+
const size = this.computedSize();
|
|
32
|
+
const box = this.childrenBBox().transformCorners(matrix);
|
|
33
|
+
const offset = size.mul(this.offset()).scale(0.5).transformAsPoint(matrix);
|
|
34
|
+
const overlayInfo = this.overlayInfo(matrix);
|
|
35
|
+
context.lineWidth = 1;
|
|
36
|
+
context.strokeStyle = 'white';
|
|
37
|
+
context.fillStyle = 'white';
|
|
38
|
+
// Draw the curve itself first so everything else gets drawn on top of it
|
|
39
|
+
context.stroke(overlayInfo.curve);
|
|
40
|
+
context.fillStyle = 'white';
|
|
41
|
+
context.globalAlpha = 0.5;
|
|
42
|
+
context.beginPath();
|
|
43
|
+
context.stroke(overlayInfo.handleLines);
|
|
44
|
+
context.globalAlpha = 1;
|
|
45
|
+
context.lineWidth = 2;
|
|
46
|
+
// Draw start and end points
|
|
47
|
+
for (const point of [overlayInfo.startPoint, overlayInfo.endPoint]) {
|
|
48
|
+
moveTo(context, point);
|
|
49
|
+
context.beginPath();
|
|
50
|
+
arc(context, point, 4);
|
|
51
|
+
context.closePath();
|
|
52
|
+
context.stroke();
|
|
53
|
+
context.fill();
|
|
54
|
+
}
|
|
55
|
+
// Draw the control points
|
|
56
|
+
context.fillStyle = 'black';
|
|
57
|
+
for (const point of overlayInfo.controlPoints) {
|
|
58
|
+
moveTo(context, point);
|
|
59
|
+
context.beginPath();
|
|
60
|
+
arc(context, point, 4);
|
|
61
|
+
context.closePath();
|
|
62
|
+
context.fill();
|
|
63
|
+
context.stroke();
|
|
64
|
+
}
|
|
65
|
+
// Draw the offset marker
|
|
66
|
+
context.lineWidth = 1;
|
|
67
|
+
context.beginPath();
|
|
68
|
+
drawPivot(context, offset);
|
|
69
|
+
context.stroke();
|
|
70
|
+
// Draw the bounding box
|
|
71
|
+
context.beginPath();
|
|
72
|
+
drawLine(context, box);
|
|
73
|
+
context.closePath();
|
|
74
|
+
context.stroke();
|
|
77
75
|
}
|
|
78
|
-
// Draw the offset marker
|
|
79
|
-
context.lineWidth = 1;
|
|
80
|
-
context.beginPath();
|
|
81
|
-
drawPivot(context, offset);
|
|
82
|
-
context.stroke();
|
|
83
|
-
// Draw the bounding box
|
|
84
|
-
context.beginPath();
|
|
85
|
-
drawLine(context, box);
|
|
86
|
-
context.closePath();
|
|
87
|
-
context.stroke();
|
|
88
|
-
}
|
|
89
76
|
}
|
|
90
|
-
__decorate([
|
|
91
|
-
|
|
77
|
+
__decorate([
|
|
78
|
+
computed()
|
|
79
|
+
], Bezier.prototype, "childrenBBox", null);
|
|
80
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQmV6aWVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9jb21wb25lbnRzL0Jlemllci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxPQUFPLEVBQUMsSUFBSSxFQUE2QixNQUFNLGVBQWUsQ0FBQztBQUcvRCxPQUFPLEVBQUMsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBRXZDLE9BQU8sRUFBQyxHQUFHLEVBQUUsUUFBUSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUMsTUFBTSxVQUFVLENBQUM7QUFDMUQsT0FBTyxFQUFDLEtBQUssRUFBQyxNQUFNLFNBQVMsQ0FBQztBQVU5QixNQUFNLE9BQWdCLE1BQU8sU0FBUSxLQUFLO0lBQ3hCLE9BQU87UUFDckIsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQy9CLE9BQU87WUFDTCxRQUFRLEVBQUUsQ0FBQyxPQUFPLENBQUM7WUFDbkIsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTO1lBQzVCLE1BQU0sRUFBRSxDQUFDO1NBQ1YsQ0FBQztJQUNKLENBQUM7SUFPUyxZQUFZO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNuRCxDQUFDO0lBRWtCLFdBQVc7UUFDNUIsT0FBTyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ3ZDLENBQUM7SUFFa0Isb0JBQW9CLENBQUMsR0FBUztRQUMvQyxHQUFHLENBQUMsUUFBUSxHQUFHLEdBQUcsQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxPQUFPLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUNqRSxPQUFPLEdBQUcsQ0FBQztJQUNiLENBQUM7SUFFZSxXQUFXLENBQ3pCLE9BQWlDLEVBQ2pDLE1BQWlC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
|
|
@@ -1,29 +1,24 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
SimpleSignal,
|
|
6
|
-
} from '@revideo/core';
|
|
7
|
-
import {CurveProfile} from '../curves';
|
|
8
|
-
import {DesiredLength} from '../partials';
|
|
9
|
-
import {Curve, CurveProps} from './Curve';
|
|
1
|
+
import { BBox, SerializedVector2, SignalValue, SimpleSignal } from '@revideo/core';
|
|
2
|
+
import { CurveProfile } from '../curves';
|
|
3
|
+
import { DesiredLength } from '../partials';
|
|
4
|
+
import { Curve, CurveProps } from './Curve';
|
|
10
5
|
export interface CircleProps extends CurveProps {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
6
|
+
/**
|
|
7
|
+
* {@inheritDoc Circle.startAngle}
|
|
8
|
+
*/
|
|
9
|
+
startAngle?: SignalValue<number>;
|
|
10
|
+
/**
|
|
11
|
+
* {@inheritDoc Circle.endAngle}
|
|
12
|
+
*/
|
|
13
|
+
endAngle?: SignalValue<number>;
|
|
14
|
+
/**
|
|
15
|
+
* {@inheritDoc Circle.counterclockwise}
|
|
16
|
+
*/
|
|
17
|
+
counterclockwise?: SignalValue<boolean>;
|
|
18
|
+
/**
|
|
19
|
+
* {@inheritDoc Circle.closed}
|
|
20
|
+
*/
|
|
21
|
+
closed?: SignalValue<boolean>;
|
|
27
22
|
}
|
|
28
23
|
/**
|
|
29
24
|
* A node for drawing circular shapes.
|
|
@@ -123,74 +118,74 @@ export interface CircleProps extends CurveProps {
|
|
|
123
118
|
* ```
|
|
124
119
|
*/
|
|
125
120
|
export declare class Circle extends Curve {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
121
|
+
/**
|
|
122
|
+
* The starting angle in degrees for the circle sector.
|
|
123
|
+
*
|
|
124
|
+
* @remarks
|
|
125
|
+
* This property can be used together with {@link startAngle} to turn this
|
|
126
|
+
* circle into a sector (when using fill) or an arc (when using stroke).
|
|
127
|
+
*
|
|
128
|
+
* @defaultValue 0
|
|
129
|
+
*/
|
|
130
|
+
readonly startAngle: SimpleSignal<number, this>;
|
|
131
|
+
/**
|
|
132
|
+
* The ending angle in degrees for the circle sector.
|
|
133
|
+
*
|
|
134
|
+
* @remarks
|
|
135
|
+
* This property can be used together with {@link endAngle} to turn this
|
|
136
|
+
* circle into a sector (when using fill) or an arc (when using stroke).
|
|
137
|
+
*
|
|
138
|
+
* @defaultValue 360
|
|
139
|
+
*/
|
|
140
|
+
readonly endAngle: SimpleSignal<number, this>;
|
|
141
|
+
/**
|
|
142
|
+
* Whether the circle sector should be drawn counterclockwise.
|
|
143
|
+
*
|
|
144
|
+
* @remarks
|
|
145
|
+
* By default, the circle begins at {@link startAngle} and is drawn clockwise
|
|
146
|
+
* until reaching {@link endAngle}. Setting this property to true will reverse
|
|
147
|
+
* this direction.
|
|
148
|
+
*/
|
|
149
|
+
readonly counterclockwise: SimpleSignal<boolean, this>;
|
|
150
|
+
/**
|
|
151
|
+
* Whether the path of this circle should be closed.
|
|
152
|
+
*
|
|
153
|
+
* @remarks
|
|
154
|
+
* When set to true, the path of this circle will start and end at the center.
|
|
155
|
+
* This can be used to fine-tune how sectors are rendered.
|
|
156
|
+
*
|
|
157
|
+
* @example
|
|
158
|
+
* A closed circle will look like a pie chart:
|
|
159
|
+
* ```tsx
|
|
160
|
+
* <Circle
|
|
161
|
+
* size={300}
|
|
162
|
+
* fill={'lightseagreen'}
|
|
163
|
+
* endAngle={230}
|
|
164
|
+
* closed={true}
|
|
165
|
+
* />
|
|
166
|
+
* ```
|
|
167
|
+
* An open one will look like an arc:
|
|
168
|
+
* ```tsx
|
|
169
|
+
* <Circle
|
|
170
|
+
* size={300}
|
|
171
|
+
* stroke={'lightseagreen'}
|
|
172
|
+
* lineWidth={8}
|
|
173
|
+
* endAngle={230}
|
|
174
|
+
* closed={false}
|
|
175
|
+
* />
|
|
176
|
+
* ```
|
|
177
|
+
*
|
|
178
|
+
* @defaultValue false
|
|
179
|
+
*/
|
|
180
|
+
readonly closed: SimpleSignal<boolean, this>;
|
|
181
|
+
constructor(props: CircleProps);
|
|
182
|
+
profile(): CurveProfile;
|
|
183
|
+
protected desiredSize(): SerializedVector2<DesiredLength>;
|
|
184
|
+
protected offsetComputedLayout(box: BBox): BBox;
|
|
185
|
+
protected childrenBBox(): BBox;
|
|
186
|
+
protected getPath(): Path2D;
|
|
187
|
+
protected getRipplePath(): Path2D;
|
|
188
|
+
protected getCacheBBox(): BBox;
|
|
189
|
+
protected createPath(expand?: number): Path2D;
|
|
195
190
|
}
|
|
196
|
-
//# sourceMappingURL=Circle.d.ts.map
|
|
191
|
+
//# sourceMappingURL=Circle.d.ts.map
|
package/lib/components/Circle.js
CHANGED
|
@@ -1,26 +1,13 @@
|
|
|
1
|
-
var __decorate =
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var
|
|
5
|
-
r =
|
|
6
|
-
c < 3
|
|
7
|
-
? target
|
|
8
|
-
: desc === null
|
|
9
|
-
? (desc = Object.getOwnPropertyDescriptor(target, key))
|
|
10
|
-
: desc,
|
|
11
|
-
d;
|
|
12
|
-
if (typeof Reflect === 'object' && typeof Reflect.decorate === 'function')
|
|
13
|
-
r = Reflect.decorate(decorators, target, key, desc);
|
|
14
|
-
else
|
|
15
|
-
for (var i = decorators.length - 1; i >= 0; i--)
|
|
16
|
-
if ((d = decorators[i]))
|
|
17
|
-
r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
18
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
19
|
-
|
|
20
|
-
import {BBox, DEG2RAD} from '@revideo/core';
|
|
21
|
-
import {getCircleProfile} from '../curves';
|
|
22
|
-
import {computed, initial, nodeName, signal} from '../decorators';
|
|
23
|
-
import {Curve} from './Curve';
|
|
6
|
+
};
|
|
7
|
+
import { BBox, DEG2RAD, } from '@revideo/core';
|
|
8
|
+
import { getCircleProfile } from '../curves';
|
|
9
|
+
import { computed, initial, nodeName, signal } from '../decorators';
|
|
10
|
+
import { Curve } from './Curve';
|
|
24
11
|
/**
|
|
25
12
|
* A node for drawing circular shapes.
|
|
26
13
|
*
|
|
@@ -119,71 +106,73 @@ import {Curve} from './Curve';
|
|
|
119
106
|
* ```
|
|
120
107
|
*/
|
|
121
108
|
let Circle = class Circle extends Curve {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
}
|
|
146
|
-
getPath() {
|
|
147
|
-
if (this.requiresProfile()) {
|
|
148
|
-
return this.curveDrawingInfo().path;
|
|
109
|
+
constructor(props) {
|
|
110
|
+
super(props);
|
|
111
|
+
}
|
|
112
|
+
profile() {
|
|
113
|
+
return getCircleProfile(this.size().scale(0.5), this.startAngle() * DEG2RAD, this.endAngle() * DEG2RAD, this.closed(), this.counterclockwise());
|
|
114
|
+
}
|
|
115
|
+
desiredSize() {
|
|
116
|
+
return {
|
|
117
|
+
x: this.width.context.getter(),
|
|
118
|
+
y: this.height.context.getter(),
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
offsetComputedLayout(box) {
|
|
122
|
+
return box;
|
|
123
|
+
}
|
|
124
|
+
childrenBBox() {
|
|
125
|
+
return BBox.fromSizeCentered(this.computedSize());
|
|
126
|
+
}
|
|
127
|
+
getPath() {
|
|
128
|
+
if (this.requiresProfile()) {
|
|
129
|
+
return this.curveDrawingInfo().path;
|
|
130
|
+
}
|
|
131
|
+
return this.createPath();
|
|
149
132
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
getRipplePath() {
|
|
153
|
-
return this.createPath(this.rippleSize());
|
|
154
|
-
}
|
|
155
|
-
getCacheBBox() {
|
|
156
|
-
return super.getCacheBBox().expand(this.rippleSize());
|
|
157
|
-
}
|
|
158
|
-
createPath(expand = 0) {
|
|
159
|
-
const path = new Path2D();
|
|
160
|
-
const start = this.startAngle() * DEG2RAD;
|
|
161
|
-
let end = this.endAngle() * DEG2RAD;
|
|
162
|
-
const size = this.size().scale(0.5).add(expand);
|
|
163
|
-
const closed = this.closed();
|
|
164
|
-
if (end > start + Math.PI * 2) {
|
|
165
|
-
const loops = Math.floor((end - start) / (Math.PI * 2));
|
|
166
|
-
end -= Math.PI * 2 * loops;
|
|
133
|
+
getRipplePath() {
|
|
134
|
+
return this.createPath(this.rippleSize());
|
|
167
135
|
}
|
|
168
|
-
|
|
169
|
-
|
|
136
|
+
getCacheBBox() {
|
|
137
|
+
return super.getCacheBBox().expand(this.rippleSize());
|
|
170
138
|
}
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
139
|
+
createPath(expand = 0) {
|
|
140
|
+
const path = new Path2D();
|
|
141
|
+
const start = this.startAngle() * DEG2RAD;
|
|
142
|
+
let end = this.endAngle() * DEG2RAD;
|
|
143
|
+
const size = this.size().scale(0.5).add(expand);
|
|
144
|
+
const closed = this.closed();
|
|
145
|
+
if (end > start + Math.PI * 2) {
|
|
146
|
+
const loops = Math.floor((end - start) / (Math.PI * 2));
|
|
147
|
+
end -= Math.PI * 2 * loops;
|
|
148
|
+
}
|
|
149
|
+
if (closed) {
|
|
150
|
+
path.moveTo(0, 0);
|
|
151
|
+
}
|
|
152
|
+
path.ellipse(0, 0, size.x, size.y, 0, start, end, this.counterclockwise());
|
|
153
|
+
if (closed) {
|
|
154
|
+
path.closePath();
|
|
155
|
+
}
|
|
156
|
+
return path;
|
|
174
157
|
}
|
|
175
|
-
return path;
|
|
176
|
-
}
|
|
177
158
|
};
|
|
178
|
-
__decorate([
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
);
|
|
186
|
-
__decorate([
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
159
|
+
__decorate([
|
|
160
|
+
initial(0),
|
|
161
|
+
signal()
|
|
162
|
+
], Circle.prototype, "startAngle", void 0);
|
|
163
|
+
__decorate([
|
|
164
|
+
initial(360),
|
|
165
|
+
signal()
|
|
166
|
+
], Circle.prototype, "endAngle", void 0);
|
|
167
|
+
__decorate([
|
|
168
|
+
initial(false),
|
|
169
|
+
signal()
|
|
170
|
+
], Circle.prototype, "counterclockwise", void 0);
|
|
171
|
+
__decorate([
|
|
172
|
+
computed()
|
|
173
|
+
], Circle.prototype, "profile", null);
|
|
174
|
+
Circle = __decorate([
|
|
175
|
+
nodeName('Circle')
|
|
176
|
+
], Circle);
|
|
177
|
+
export { Circle };
|
|
178
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2lyY2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9jb21wb25lbnRzL0NpcmNsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQSxPQUFPLEVBQ0wsSUFBSSxFQUNKLE9BQU8sR0FJUixNQUFNLGVBQWUsQ0FBQztBQUN2QixPQUFPLEVBQWUsZ0JBQWdCLEVBQUMsTUFBTSxXQUFXLENBQUM7QUFDekQsT0FBTyxFQUFDLFFBQVEsRUFBRSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUVsRSxPQUFPLEVBQUMsS0FBSyxFQUFhLE1BQU0sU0FBUyxDQUFDO0FBcUIxQzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBZ0dHO0FBRUksSUFBTSxNQUFNLEdBQVosTUFBTSxNQUFPLFNBQVEsS0FBSztJQXVFL0IsWUFBbUIsS0FBa0I7UUFDbkMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2YsQ0FBQztJQUdNLE9BQU87UUFDWixPQUFPLGdCQUFnQixDQUNyQixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUN0QixJQUFJLENBQUMsVUFBVSxFQUFFLEdBQUcsT0FBTyxFQUMzQixJQUFJLENBQUMsUUFBUSxFQUFFLEdBQUcsT0FBTyxFQUN6QixJQUFJLENBQUMsTUFBTSxFQUFFLEVBQ2IsSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQ3hCLENBQUM7SUFDSixDQUFDO0lBRWtCLFdBQVc7UUFDNUIsT0FBTztZQUNMLENBQUMsRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUU7WUFDOUIsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtTQUNo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
|