@motionscript/math 0.1.0-alpha.5 → 0.1.0-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (233) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/README.md +39 -33
  3. package/dist/annotate/angle-mark.d.ts +77 -27
  4. package/dist/annotate/angle-mark.d.ts.map +1 -1
  5. package/dist/annotate/angle-mark.js +80 -115
  6. package/dist/annotate/angle-mark.js.map +1 -1
  7. package/dist/annotate/curly-brace.d.ts +94 -25
  8. package/dist/annotate/curly-brace.d.ts.map +1 -1
  9. package/dist/annotate/curly-brace.js +85 -100
  10. package/dist/annotate/curly-brace.js.map +1 -1
  11. package/dist/annotate/emphasis-mark.d.ts +69 -9
  12. package/dist/annotate/emphasis-mark.d.ts.map +1 -1
  13. package/dist/annotate/emphasis-mark.js +33 -34
  14. package/dist/annotate/emphasis-mark.js.map +1 -1
  15. package/dist/browser/chunks/chunk-ABYBW64J.js +2 -0
  16. package/dist/browser/chunks/chunk-ABYBW64J.js.map +7 -0
  17. package/dist/browser/chunks/chunk-K77KLQX4.js +2 -0
  18. package/dist/browser/chunks/chunk-K77KLQX4.js.map +7 -0
  19. package/dist/browser/index.js +1 -1
  20. package/dist/browser/index.js.map +3 -3
  21. package/dist/browser/kit.js +1 -1
  22. package/dist/browser/manifest.json +1 -1
  23. package/dist/browser/tex.js +1 -1
  24. package/dist/browser/tex.js.map +2 -2
  25. package/dist/engine.d.ts +26 -19
  26. package/dist/engine.d.ts.map +1 -1
  27. package/dist/engine.js +17 -14
  28. package/dist/engine.js.map +1 -1
  29. package/dist/kit/component.d.ts +51 -0
  30. package/dist/kit/component.d.ts.map +1 -0
  31. package/dist/kit/component.js +30 -0
  32. package/dist/kit/component.js.map +1 -0
  33. package/dist/kit/curve.d.ts +22 -11
  34. package/dist/kit/curve.d.ts.map +1 -1
  35. package/dist/kit/curve.js +25 -18
  36. package/dist/kit/curve.js.map +1 -1
  37. package/dist/kit/field-mark.d.ts +56 -35
  38. package/dist/kit/field-mark.d.ts.map +1 -1
  39. package/dist/kit/field-mark.js +100 -120
  40. package/dist/kit/field-mark.js.map +1 -1
  41. package/dist/kit/follow.d.ts +67 -29
  42. package/dist/kit/follow.d.ts.map +1 -1
  43. package/dist/kit/follow.js +114 -110
  44. package/dist/kit/follow.js.map +1 -1
  45. package/dist/kit/furniture.d.ts +3 -1
  46. package/dist/kit/furniture.d.ts.map +1 -1
  47. package/dist/kit/furniture.js +5 -0
  48. package/dist/kit/furniture.js.map +1 -1
  49. package/dist/kit/graph.d.ts +46 -0
  50. package/dist/kit/graph.d.ts.map +1 -0
  51. package/dist/kit/graph.js +90 -0
  52. package/dist/kit/graph.js.map +1 -0
  53. package/dist/kit/mark.d.ts +64 -39
  54. package/dist/kit/mark.d.ts.map +1 -1
  55. package/dist/kit/mark.js +80 -96
  56. package/dist/kit/mark.js.map +1 -1
  57. package/dist/kit/place.d.ts +10 -8
  58. package/dist/kit/place.d.ts.map +1 -1
  59. package/dist/kit/place.js +28 -30
  60. package/dist/kit/place.js.map +1 -1
  61. package/dist/kit/system.d.ts +27 -29
  62. package/dist/kit/system.d.ts.map +1 -1
  63. package/dist/kit/system.js +62 -58
  64. package/dist/kit/system.js.map +1 -1
  65. package/dist/kit/withdrawn.d.ts +3 -3
  66. package/dist/kit/withdrawn.js +3 -3
  67. package/dist/kit/withdrawn.js.map +1 -1
  68. package/dist/marks/curve-area.d.ts +37 -18
  69. package/dist/marks/curve-area.d.ts.map +1 -1
  70. package/dist/marks/curve-area.js +50 -73
  71. package/dist/marks/curve-area.js.map +1 -1
  72. package/dist/marks/drop-lines.d.ts +45 -10
  73. package/dist/marks/drop-lines.d.ts.map +1 -1
  74. package/dist/marks/drop-lines.js +37 -52
  75. package/dist/marks/drop-lines.js.map +1 -1
  76. package/dist/marks/plot-point.d.ts +56 -20
  77. package/dist/marks/plot-point.d.ts.map +1 -1
  78. package/dist/marks/plot-point.js +65 -91
  79. package/dist/marks/plot-point.js.map +1 -1
  80. package/dist/marks/riemann-sum.d.ts +47 -26
  81. package/dist/marks/riemann-sum.d.ts.map +1 -1
  82. package/dist/marks/riemann-sum.js +57 -85
  83. package/dist/marks/riemann-sum.js.map +1 -1
  84. package/dist/marks/tangent-line.d.ts +58 -14
  85. package/dist/marks/tangent-line.d.ts.map +1 -1
  86. package/dist/marks/tangent-line.js +73 -87
  87. package/dist/marks/tangent-line.js.map +1 -1
  88. package/dist/marks/vector-arrow.d.ts +48 -20
  89. package/dist/marks/vector-arrow.d.ts.map +1 -1
  90. package/dist/marks/vector-arrow.js +58 -78
  91. package/dist/marks/vector-arrow.js.map +1 -1
  92. package/dist/nodes.d.ts +13 -5
  93. package/dist/nodes.d.ts.map +1 -1
  94. package/dist/nodes.js +0 -6
  95. package/dist/nodes.js.map +1 -1
  96. package/dist/plots/function-plot.d.ts +135 -43
  97. package/dist/plots/function-plot.d.ts.map +1 -1
  98. package/dist/plots/function-plot.js +146 -177
  99. package/dist/plots/function-plot.js.map +1 -1
  100. package/dist/plots/points-plot.d.ts +55 -19
  101. package/dist/plots/points-plot.d.ts.map +1 -1
  102. package/dist/plots/points-plot.js +31 -58
  103. package/dist/plots/points-plot.js.map +1 -1
  104. package/dist/plots/stream-lines.d.ts +60 -19
  105. package/dist/plots/stream-lines.d.ts.map +1 -1
  106. package/dist/plots/stream-lines.js +60 -79
  107. package/dist/plots/stream-lines.js.map +1 -1
  108. package/dist/plots/traced-path.d.ts +54 -15
  109. package/dist/plots/traced-path.d.ts.map +1 -1
  110. package/dist/plots/traced-path.js +33 -48
  111. package/dist/plots/traced-path.js.map +1 -1
  112. package/dist/plots/vector-field.d.ts +48 -11
  113. package/dist/plots/vector-field.d.ts.map +1 -1
  114. package/dist/plots/vector-field.js +50 -64
  115. package/dist/plots/vector-field.js.map +1 -1
  116. package/dist/structures/network-graph.d.ts +140 -49
  117. package/dist/structures/network-graph.d.ts.map +1 -1
  118. package/dist/structures/network-graph.js +168 -217
  119. package/dist/structures/network-graph.js.map +1 -1
  120. package/dist/structures/sample-space.d.ts +90 -38
  121. package/dist/structures/sample-space.d.ts.map +1 -1
  122. package/dist/structures/sample-space.js +132 -170
  123. package/dist/structures/sample-space.js.map +1 -1
  124. package/dist/systems/axes2d.d.ts +159 -37
  125. package/dist/systems/axes2d.d.ts.map +1 -1
  126. package/dist/systems/axes2d.js +147 -183
  127. package/dist/systems/axes2d.js.map +1 -1
  128. package/dist/systems/number-line.d.ts +80 -28
  129. package/dist/systems/number-line.d.ts.map +1 -1
  130. package/dist/systems/number-line.js +82 -118
  131. package/dist/systems/number-line.js.map +1 -1
  132. package/dist/systems/number-plane.d.ts +140 -31
  133. package/dist/systems/number-plane.d.ts.map +1 -1
  134. package/dist/systems/number-plane.js +142 -149
  135. package/dist/systems/number-plane.js.map +1 -1
  136. package/dist/systems/polar-plane.d.ts +76 -26
  137. package/dist/systems/polar-plane.d.ts.map +1 -1
  138. package/dist/systems/polar-plane.js +107 -133
  139. package/dist/systems/polar-plane.js.map +1 -1
  140. package/dist/tex/index.d.ts.map +1 -1
  141. package/dist/tex/index.js +1 -0
  142. package/dist/tex/index.js.map +1 -1
  143. package/dist/tex/matrix.d.ts +88 -18
  144. package/dist/tex/matrix.d.ts.map +1 -1
  145. package/dist/tex/matrix.js +33 -50
  146. package/dist/tex/matrix.js.map +1 -1
  147. package/dist/tex/node.d.ts +84 -201
  148. package/dist/tex/node.d.ts.map +1 -1
  149. package/dist/tex/node.js +23 -593
  150. package/dist/tex/node.js.map +1 -1
  151. package/dist/tex/typeset.d.ts +133 -0
  152. package/dist/tex/typeset.d.ts.map +1 -0
  153. package/dist/tex/typeset.js +403 -0
  154. package/dist/tex/typeset.js.map +1 -0
  155. package/dist/three/axes3d.d.ts +214 -54
  156. package/dist/three/axes3d.d.ts.map +1 -1
  157. package/dist/three/axes3d.js +163 -204
  158. package/dist/three/axes3d.js.map +1 -1
  159. package/dist/three/curve-plot3d.d.ts +108 -42
  160. package/dist/three/curve-plot3d.d.ts.map +1 -1
  161. package/dist/three/curve-plot3d.js +97 -132
  162. package/dist/three/curve-plot3d.js.map +1 -1
  163. package/dist/three/entries.d.ts +17 -0
  164. package/dist/three/entries.d.ts.map +1 -0
  165. package/dist/three/entries.js +15 -0
  166. package/dist/three/entries.js.map +1 -0
  167. package/dist/three/plot-point3d.d.ts +85 -12
  168. package/dist/three/plot-point3d.d.ts.map +1 -1
  169. package/dist/three/plot-point3d.js +27 -53
  170. package/dist/three/plot-point3d.js.map +1 -1
  171. package/dist/three/space.d.ts +17 -2
  172. package/dist/three/space.d.ts.map +1 -1
  173. package/dist/three/space.js +19 -8
  174. package/dist/three/space.js.map +1 -1
  175. package/dist/three/surface-plot3d.d.ts +176 -49
  176. package/dist/three/surface-plot3d.d.ts.map +1 -1
  177. package/dist/three/surface-plot3d.js +227 -261
  178. package/dist/three/surface-plot3d.js.map +1 -1
  179. package/dist/three/vector-arrow3d.d.ts +87 -16
  180. package/dist/three/vector-arrow3d.d.ts.map +1 -1
  181. package/dist/three/vector-arrow3d.js +48 -67
  182. package/dist/three/vector-arrow3d.js.map +1 -1
  183. package/package.json +4 -4
  184. package/src/annotate/angle-mark.ts +95 -105
  185. package/src/annotate/curly-brace.ts +107 -85
  186. package/src/annotate/emphasis-mark.ts +55 -26
  187. package/src/engine.ts +35 -21
  188. package/src/kit/component.ts +57 -0
  189. package/src/kit/curve.ts +38 -20
  190. package/src/kit/field-mark.ts +124 -108
  191. package/src/kit/follow.ts +146 -120
  192. package/src/kit/furniture.ts +6 -1
  193. package/src/kit/graph.ts +116 -0
  194. package/src/kit/mark.ts +135 -114
  195. package/src/kit/place.ts +32 -56
  196. package/src/kit/system.ts +77 -71
  197. package/src/kit/withdrawn.ts +3 -3
  198. package/src/marks/curve-area.ts +65 -65
  199. package/src/marks/drop-lines.ts +50 -42
  200. package/src/marks/plot-point.ts +77 -82
  201. package/src/marks/riemann-sum.ts +73 -72
  202. package/src/marks/tangent-line.ts +87 -71
  203. package/src/marks/vector-arrow.ts +73 -73
  204. package/src/nodes.ts +41 -5
  205. package/src/plots/function-plot.ts +155 -171
  206. package/src/plots/points-plot.ts +46 -50
  207. package/src/plots/stream-lines.ts +75 -66
  208. package/src/plots/traced-path.ts +51 -33
  209. package/src/plots/vector-field.ts +68 -49
  210. package/src/structures/network-graph.ts +168 -185
  211. package/src/structures/sample-space.ts +149 -148
  212. package/src/systems/axes2d.ts +165 -156
  213. package/src/systems/number-line.ts +91 -92
  214. package/src/systems/number-plane.ts +149 -120
  215. package/src/systems/polar-plane.ts +117 -116
  216. package/src/tex/index.ts +2 -1
  217. package/src/tex/matrix.ts +62 -40
  218. package/src/tex/node.ts +54 -621
  219. package/src/tex/typeset.ts +461 -0
  220. package/src/three/axes3d.ts +187 -160
  221. package/src/three/curve-plot3d.ts +107 -110
  222. package/src/three/entries.ts +42 -0
  223. package/src/three/plot-point3d.ts +42 -45
  224. package/src/three/space.ts +34 -9
  225. package/src/three/surface-plot3d.ts +312 -323
  226. package/src/three/vector-arrow3d.ts +65 -54
  227. package/dist/browser/chunks/chunk-3GJB6AVO.js +0 -2
  228. package/dist/browser/chunks/chunk-3GJB6AVO.js.map +0 -7
  229. package/dist/browser/chunks/chunk-D5WHCVBC.js +0 -2
  230. package/dist/browser/chunks/chunk-D5WHCVBC.js.map +0 -7
  231. package/dist/browser/chunks/chunk-WL4KEX7Y.js +0 -2
  232. package/dist/browser/chunks/chunk-WL4KEX7Y.js.map +0 -7
  233. package/src/kit/placement.ts +0 -8
@@ -1,19 +1,23 @@
1
1
  import {
2
- command,
3
- node,
4
- property,
5
- strokeProperty,
6
- type Command,
7
- type CommandArgs,
8
- type NodeConfig,
9
- type Stroke,
2
+ component2d,
3
+ Types,
4
+ type NodeOf,
10
5
  type Vector2,
6
+ // Named so the emitted declaration reaches these through the sdk, not core.
7
+ type Fill as _Fill,
8
+ type FillResolved as _FillResolved,
9
+ type Node2D as _Node2D,
10
+ type Node2DProps as _Node2DProps,
11
+ type Shadow as _Shadow,
12
+ type ShadowResolved as _ShadowResolved,
13
+ type Stroke as _Stroke,
14
+ type StrokeResolved as _StrokeResolved,
11
15
  } from "@motionscript/sdk";
12
16
  import type { CoordinateMap } from "../kit/coords";
13
- import { FieldMark, type FieldProps, type FieldSampler, type FieldStroke } from "../kit/field-mark";
17
+ import { drawField, FIELD_COMMANDS, FIELD_STATE, traceField, type FieldDrawing, type FieldProps, type FieldSampler, type FieldStroke, type FieldValues } from "../kit/field-mark";
14
18
  import { PLOT_COLOR } from "../kit/furniture";
15
- import { clamp, stated } from "../kit/geometry";
16
- import { SYSTEMS } from "../kit/placement";
19
+ import { clamp } from "../kit/geometry";
20
+ import { inkSize, reading, traced, type MarkReading } from "../kit/mark";
17
21
 
18
22
  export interface StreamLinesProps extends FieldProps {
19
23
  spacing?: number;
@@ -27,73 +31,78 @@ const MAX_LINES = 1600;
27
31
  const STEPS_PER_SPACING = 8;
28
32
  const MAX_STEPS = 600;
29
33
 
30
- /**
31
- * The lines a vector field carries a point along, one from each point of a
32
- * grid: `(-y, x)` draws circles. With a `window` below one, each line shows
33
- * only a stretch of itself, and `flowTo` sends those stretches along.
34
- */
35
- @node({
36
- key: "streamLines",
37
- within: SYSTEMS,
38
- parentKey: "shape",
39
- forkable: true,
40
- layout: { children: "freeform", defaultWidthMode: "hug", defaultHeightMode: "hug", acceptsChildren: false },
41
- seed: { expression: "(sin(y), cos(x))" },
42
- })
43
- export class StreamLines extends FieldMark<StreamLinesProps> {
34
+ const state = {
35
+ ...FIELD_STATE,
44
36
  /** How far apart the lines start, in graph units. */
45
- @property({ default: 1, min: 0.01, step: 0.1 }) declare spacing: number;
37
+ spacing: Types.number(1, { min: 0.01, step: 0.1 }),
46
38
  /** How far each line runs from where it starts, in graph units along itself. */
47
- @property({ default: 3, min: 0, step: 0.1 }) declare length: number;
39
+ length: Types.number(3, { min: 0, step: 0.1 }),
48
40
  /** The share of each line that is shown at once; one shows all of it. */
49
- @property({ default: 1, min: 0.01, max: 1, step: 0.01 }) declare window: number;
41
+ window: Types.number(1, { min: 0.01, max: 1, step: 0.01 }),
50
42
  /** Where along its line each shown stretch is: one turn of it runs every line from end to end. */
51
- @property({ default: 0, step: 0.01 }) declare phase: number;
43
+ phase: Types.number(0, { step: 0.01 }),
44
+ };
52
45
 
53
- @strokeProperty({ default: { weight: 2, fill: PLOT_COLOR, align: "center", cap: "round", join: "round" } })
54
- declare stroke: Stroke;
46
+ interface LinesValues extends FieldValues {
47
+ readonly spacing: number;
48
+ readonly length: number;
49
+ readonly window: number;
50
+ readonly phase: number;
51
+ }
55
52
 
56
- constructor(props?: NodeConfig<StreamLines, StreamLinesProps>) {
57
- super(props ?? {});
58
- }
53
+ const LINES: FieldDrawing<LinesValues> = {
54
+ own: (s) => `${s.spacing}|${s.length}|${s.window}|${s.phase}`,
55
+ strokes: (s, map, field) => lines(s, map, field),
56
+ };
59
57
 
60
- /** Send the shown stretches along their lines: a whole number runs each line that many times over. */
61
- @command({ args: ["phase"] })
62
- flowTo(args: CommandArgs<{ phase: number }> & { duration: number }): Command<StreamLinesProps> {
63
- return this.to({ data: stated(args.data), duration: args.duration, easing: args.easing });
64
- }
58
+ const traceLines = (s: LinesValues, read: MarkReading) => traceField("streamLines", LINES, s, read);
65
59
 
66
- protected own(): string {
67
- return `${this.spacing}|${this.length}|${this.window}|${this.phase}`;
68
- }
60
+ /**
61
+ * The lines a vector field carries a point along, one from each point of a
62
+ * grid: `(-y, x)` draws circles. With a `window` below one, each line shows
63
+ * only a stretch of itself, and `flowTo` sends those stretches along.
64
+ */
65
+ export const StreamLines = traced(component2d({
66
+ key: "streamLines",
67
+ state,
68
+ defaults: { stroke: { weight: 2, fill: PLOT_COLOR, align: "center", cap: "round", join: "round" }, width: "hug", height: "hug" },
69
+ commands: {
70
+ ...FIELD_COMMANDS,
71
+ /** Send the shown stretches along their lines: a whole number runs each line that many times over. */
72
+ flowTo: { args: ["phase"] },
73
+ },
74
+ measure: (_measurer, s) => inkSize(traceLines(s, reading(s)).runs),
75
+ render: (ctx, s) => drawField(ctx, s, traceLines(s, reading(s))),
76
+ }), (s: LinesValues, read: MarkReading) => traceLines(s, read).runs);
77
+
78
+ export type StreamLines = NodeOf<typeof StreamLines>;
69
79
 
70
- protected strokes(map: CoordinateMap, field: FieldSampler): FieldStroke[] {
71
- const [x0, x1] = map.xRange;
72
- const [y0, y1] = map.yRange;
73
- let spacing = Math.max(this.spacing, 1e-6);
74
- const count = () => (Math.floor((x1 - x0) / spacing) + 1) * (Math.floor((y1 - y0) / spacing) + 1);
75
- while (count() > MAX_LINES) spacing *= 2;
76
- const step = spacing / STEPS_PER_SPACING;
77
- const steps = Math.min(MAX_STEPS, Math.round(this.length / step));
78
- if (steps < 1) return [];
79
- // A line is followed a little past what is shown, so it leaves the box rather than stopping at its edge.
80
- const inside = (x: number, y: number) => x >= x0 - spacing && x <= x1 + spacing && y >= y0 - spacing && y <= y1 + spacing;
81
- const window = clamp(this.window, 0, 1);
80
+ function lines(s: LinesValues, map: CoordinateMap, field: FieldSampler): FieldStroke[] {
81
+ const [x0, x1] = map.xRange;
82
+ const [y0, y1] = map.yRange;
83
+ let spacing = Math.max(s.spacing, 1e-6);
84
+ const count = () => (Math.floor((x1 - x0) / spacing) + 1) * (Math.floor((y1 - y0) / spacing) + 1);
85
+ while (count() > MAX_LINES) spacing *= 2;
86
+ const step = spacing / STEPS_PER_SPACING;
87
+ const steps = Math.min(MAX_STEPS, Math.round(s.length / step));
88
+ if (steps < 1) return [];
89
+ // A line is followed a little past what is shown, so it leaves the box rather than stopping at its edge.
90
+ const inside = (x: number, y: number) => x >= x0 - spacing && x <= x1 + spacing && y >= y0 - spacing && y <= y1 + spacing;
91
+ const window = clamp(s.window, 0, 1);
82
92
 
83
- const drawn: FieldStroke[] = [];
84
- let index = 0;
85
- for (let i = Math.ceil(x0 / spacing - 1e-9); i * spacing <= x1 + 1e-9; i++) {
86
- for (let j = Math.ceil(y0 / spacing - 1e-9); j * spacing <= y1 + 1e-9; j++) {
87
- const line = follow(field, i * spacing, j * spacing, step, steps, inside);
88
- index++;
89
- if (line.points.length < 2) continue;
90
- const shown = window >= 1 ? line.points : stretch(line.points, window, this.phase + stagger(index));
91
- if (shown.length < 2) continue;
92
- drawn.push({ runs: [shown.map((p) => map.toPoint(p.x, p.y))], magnitude: line.magnitude });
93
- }
93
+ const drawn: FieldStroke[] = [];
94
+ let index = 0;
95
+ for (let i = Math.ceil(x0 / spacing - 1e-9); i * spacing <= x1 + 1e-9; i++) {
96
+ for (let j = Math.ceil(y0 / spacing - 1e-9); j * spacing <= y1 + 1e-9; j++) {
97
+ const line = follow(field, i * spacing, j * spacing, step, steps, inside);
98
+ index++;
99
+ if (line.points.length < 2) continue;
100
+ const shown = window >= 1 ? line.points : stretch(line.points, window, s.phase + stagger(index));
101
+ if (shown.length < 2) continue;
102
+ drawn.push({ runs: [shown.map((p) => map.toPoint(p.x, p.y))], magnitude: line.magnitude });
94
103
  }
95
- return drawn;
96
104
  }
105
+ return drawn;
97
106
  }
98
107
 
99
108
  /** The graph points a field carries a point through from `(x, y)`, at an even pace, and how strong it was on the way. */
@@ -1,9 +1,19 @@
1
- import { command, node, property, withdraw, type Command, type CommandArgs, type NodeConfig } from "@motionscript/sdk";
1
+ import {
2
+ component2d,
3
+ Types,
4
+ type NodeOf,
5
+ // Named so the emitted declaration reaches these through the sdk, not core.
6
+ type Node2D as _Node2D,
7
+ type Node2DProps as _Node2DProps,
8
+ type Shadow as _Shadow,
9
+ type ShadowResolved as _ShadowResolved,
10
+ type Stroke as _Stroke,
11
+ type StrokeResolved as _StrokeResolved,
12
+ } from "@motionscript/sdk";
13
+ import { omit } from "../kit/component";
2
14
  import type { Interval } from "../kit/coords";
3
- import { stated } from "../kit/geometry";
4
- import { SYSTEMS } from "../kit/placement";
5
- import { FunctionPlot, type FunctionPlotProps } from "./function-plot";
6
- import { OUTLINE_TRIM } from "../kit/withdrawn";
15
+ import { drawMark, inkSize, reading, traced, type MarkReading } from "../kit/mark";
16
+ import { PLOT_COMMANDS, PLOT_STATE, PLOT_STROKE, tracePlot, type FunctionPlotProps, type PlotValues } from "./function-plot";
7
17
 
8
18
  export interface TracedPathProps extends FunctionPlotProps {
9
19
  from?: number;
@@ -11,42 +21,50 @@ export interface TracedPathProps extends FunctionPlotProps {
11
21
  tail?: number;
12
22
  }
13
23
 
24
+ const state = {
25
+ // It reveals itself by its value, so it trims no outline of its own.
26
+ ...omit(PLOT_STATE, "start", "end"),
27
+ /** The value the trail starts at. */
28
+ from: Types.number(0, { step: 0.1 }),
29
+ /** The value the point is at now: where the trail ends. */
30
+ value: Types.number(0, { step: 0.1 }),
31
+ /** How much of the trail is kept, in the value's own units; zero keeps all of it. */
32
+ tail: Types.number(0, { min: 0, step: 0.1 }),
33
+ };
34
+
35
+ interface TrailValues extends PlotValues {
36
+ readonly from: number;
37
+ readonly value: number;
38
+ readonly tail: number;
39
+ }
40
+
14
41
  /**
15
42
  * The trail a point leaves as a value changes: the curve of its equation from
16
43
  * where the value began to where it is now. Bind `value` to a variable
17
44
  * (`"=[t]"`) and the trail grows as the variable is driven, or drive it with
18
45
  * `traceTo`; a `tail` keeps only its most recent stretch.
19
46
  */
20
- @node({
47
+ export const TracedPath = traced(component2d({
21
48
  key: "tracedPath",
22
- within: SYSTEMS,
23
- parentKey: "functionPlot",
24
- forkable: true,
25
- layout: { children: "freeform", defaultWidthMode: "hug", defaultHeightMode: "hug", acceptsChildren: false },
26
- seed: { expression: "(2cos(t), sin(2t))", value: 6.28 },
27
- })
28
- @withdraw(...OUTLINE_TRIM)
29
- export class TracedPath extends FunctionPlot<TracedPathProps> {
30
- /** The value the trail starts at. */
31
- @property({ default: 0, step: 0.1 }) declare from: number;
32
- /** The value the point is at now: where the trail ends. */
33
- @property({ default: 0, step: 0.1 }) declare value: number;
34
- /** How much of the trail is kept, in the value's own units; zero keeps all of it. */
35
- @property({ default: 0, min: 0, step: 0.1 }) declare tail: number;
49
+ state,
50
+ defaults: { stroke: PLOT_STROKE, width: "hug", height: "hug" },
51
+ commands: {
52
+ ...omit(PLOT_COMMANDS, "progressTo", "flash"),
53
+ /** Carry the point on to another value, the trail following it. */
54
+ traceTo: { args: ["value"] },
55
+ },
56
+ measure: (_measurer, s) => inkSize(traceTrail(s, reading(s))),
57
+ render: (ctx, s) => drawMark(ctx, s, traceTrail(s, reading(s))),
58
+ }), traceTrail);
36
59
 
37
- constructor(props?: NodeConfig<TracedPath, TracedPathProps>) {
38
- super((props ?? {}) as NodeConfig<FunctionPlot<TracedPathProps>, TracedPathProps>);
39
- }
60
+ export type TracedPath = NodeOf<typeof TracedPath>;
40
61
 
41
- /** Carry the point on to another value, the trail following it. */
42
- @command({ args: ["value"] })
43
- traceTo(args: CommandArgs<{ value: number }> & { duration: number }): Command<TracedPathProps> {
44
- return this.to({ data: stated(args.data), duration: args.duration, easing: args.easing });
45
- }
62
+ function traceTrail(s: TrailValues, read: MarkReading) {
63
+ return tracePlot(s, read, span(s));
64
+ }
46
65
 
47
- protected override span(): Interval | null {
48
- const { from, value, tail } = this;
49
- const kept = tail > 0 ? Math.min(Math.abs(value - from), tail) : Math.abs(value - from);
50
- return value >= from ? [value - kept, value] : [value, value + kept];
51
- }
66
+ /** The span of the free variable the trail covers: from where the value began, or its tail, to where it is. */
67
+ function span({ from, value, tail }: TrailValues): Interval {
68
+ const kept = tail > 0 ? Math.min(Math.abs(value - from), tail) : Math.abs(value - from);
69
+ return value >= from ? [value - kept, value] : [value, value + kept];
52
70
  }
@@ -1,8 +1,22 @@
1
- import { node, property, strokeProperty, type NodeConfig, type Stroke, type Vector2 } from "@motionscript/sdk";
1
+ import {
2
+ component2d,
3
+ Types,
4
+ type NodeOf,
5
+ type Vector2,
6
+ // Named so the emitted declaration reaches these through the sdk, not core.
7
+ type Fill as _Fill,
8
+ type FillResolved as _FillResolved,
9
+ type Node2D as _Node2D,
10
+ type Node2DProps as _Node2DProps,
11
+ type Shadow as _Shadow,
12
+ type ShadowResolved as _ShadowResolved,
13
+ type Stroke as _Stroke,
14
+ type StrokeResolved as _StrokeResolved,
15
+ } from "@motionscript/sdk";
2
16
  import type { CoordinateMap } from "../kit/coords";
3
- import { FieldMark, type FieldProps, type FieldSampler, type FieldStroke } from "../kit/field-mark";
17
+ import { drawField, FIELD_COMMANDS, FIELD_STATE, traceField, type FieldDrawing, type FieldProps, type FieldValues, type FieldSampler, type FieldStroke } from "../kit/field-mark";
4
18
  import { PLOT_COLOR } from "../kit/furniture";
5
- import { SYSTEMS } from "../kit/placement";
19
+ import { inkSize, reading, traced, type MarkReading } from "../kit/mark";
6
20
 
7
21
  export interface VectorFieldProps extends FieldProps {
8
22
  spacing?: number;
@@ -16,63 +30,68 @@ const HEAD_SHARE = 0.38;
16
30
  const HEAD_MAX = 11;
17
31
  const HEAD_ANGLE = (26 * Math.PI) / 180;
18
32
 
33
+ const state = {
34
+ ...FIELD_STATE,
35
+ /** How far apart the arrows stand, in graph units. */
36
+ spacing: Types.number(1, { min: 0.01, step: 0.1 }),
37
+ /** How long an arrow is drawn for a vector of length one, in graph units. */
38
+ arrowScale: Types.number(0.4, { min: 0, step: 0.05 }),
39
+ };
40
+
41
+ interface ArrowsValues extends FieldValues {
42
+ readonly spacing: number;
43
+ readonly arrowScale: number;
44
+ }
45
+
46
+ const ARROWS: FieldDrawing<ArrowsValues> = {
47
+ own: (s) => `${s.spacing}|${s.arrowScale}`,
48
+ strokes: (s, map, field) => arrows(s, map, field),
49
+ };
50
+
51
+ const traceArrows = (s: ArrowsValues, read: MarkReading) => traceField("vectorField", ARROWS, s, read);
52
+
19
53
  /**
20
54
  * A grid of arrows showing a vector field, two parts in x and y: `(-y, x)`.
21
55
  * Each arrow is centred on its point and is as long as the field is strong
22
56
  * there, up to the spacing.
23
57
  */
24
- @node({
58
+ export const VectorField = traced(component2d({
25
59
  key: "vectorField",
26
- within: SYSTEMS,
27
- parentKey: "shape",
28
- forkable: true,
29
- layout: { children: "freeform", defaultWidthMode: "hug", defaultHeightMode: "hug", acceptsChildren: false },
30
- seed: { expression: "(-y, x)" },
31
- })
32
- export class VectorField extends FieldMark<VectorFieldProps> {
33
- /** How far apart the arrows stand, in graph units. */
34
- @property({ default: 1, min: 0.01, step: 0.1 }) declare spacing: number;
35
- /** How long an arrow is drawn for a vector of length one, in graph units. */
36
- @property({ default: 0.4, min: 0, step: 0.05 }) declare arrowScale: number;
37
-
38
- @strokeProperty({ default: { weight: 2.5, fill: PLOT_COLOR, align: "center", cap: "round", join: "round" } })
39
- declare stroke: Stroke;
60
+ state,
61
+ defaults: { stroke: { weight: 2.5, fill: PLOT_COLOR, align: "center", cap: "round", join: "round" }, width: "hug", height: "hug" },
62
+ commands: FIELD_COMMANDS,
63
+ measure: (_measurer, s) => inkSize(traceArrows(s, reading(s)).runs),
64
+ render: (ctx, s) => drawField(ctx, s, traceArrows(s, reading(s))),
65
+ }), (s: ArrowsValues, read: MarkReading) => traceArrows(s, read).runs);
40
66
 
41
- constructor(props?: NodeConfig<VectorField, VectorFieldProps>) {
42
- super(props ?? {});
43
- }
44
-
45
- protected own(): string {
46
- return `${this.spacing}|${this.arrowScale}`;
47
- }
67
+ export type VectorField = NodeOf<typeof VectorField>;
48
68
 
49
- protected strokes(map: CoordinateMap, field: FieldSampler): FieldStroke[] {
50
- const [x0, x1] = map.xRange;
51
- const [y0, y1] = map.yRange;
52
- let spacing = Math.max(this.spacing, 1e-6);
53
- const count = () => (Math.floor((x1 - x0) / spacing) + 1) * (Math.floor((y1 - y0) / spacing) + 1);
54
- while (count() > MAX_ARROWS) spacing *= 2;
69
+ function arrows(s: ArrowsValues, map: CoordinateMap, field: FieldSampler): FieldStroke[] {
70
+ const [x0, x1] = map.xRange;
71
+ const [y0, y1] = map.yRange;
72
+ let spacing = Math.max(s.spacing, 1e-6);
73
+ const count = () => (Math.floor((x1 - x0) / spacing) + 1) * (Math.floor((y1 - y0) / spacing) + 1);
74
+ while (count() > MAX_ARROWS) spacing *= 2;
55
75
 
56
- const drawn: FieldStroke[] = [];
57
- const v: Vector2 = { x: 0, y: 0 };
58
- const longest = spacing * 0.9;
59
- for (let i = Math.ceil(x0 / spacing - 1e-9); i * spacing <= x1 + 1e-9; i++) {
60
- for (let j = Math.ceil(y0 / spacing - 1e-9); j * spacing <= y1 + 1e-9; j++) {
61
- const gx = i * spacing;
62
- const gy = j * spacing;
63
- if (!field(gx, gy, v)) continue;
64
- const magnitude = Math.hypot(v.x, v.y);
65
- const length = Math.min(magnitude * this.arrowScale, longest);
66
- if (!(length > 0)) continue;
67
- const hx = ((v.x / magnitude) * length) / 2;
68
- const hy = ((v.y / magnitude) * length) / 2;
69
- const tail = map.toPoint(gx - hx, gy - hy);
70
- const head = map.toPoint(gx + hx, gy + hy);
71
- drawn.push({ runs: arrow(tail, head), magnitude });
72
- }
76
+ const drawn: FieldStroke[] = [];
77
+ const v: Vector2 = { x: 0, y: 0 };
78
+ const longest = spacing * 0.9;
79
+ for (let i = Math.ceil(x0 / spacing - 1e-9); i * spacing <= x1 + 1e-9; i++) {
80
+ for (let j = Math.ceil(y0 / spacing - 1e-9); j * spacing <= y1 + 1e-9; j++) {
81
+ const gx = i * spacing;
82
+ const gy = j * spacing;
83
+ if (!field(gx, gy, v)) continue;
84
+ const magnitude = Math.hypot(v.x, v.y);
85
+ const length = Math.min(magnitude * s.arrowScale, longest);
86
+ if (!(length > 0)) continue;
87
+ const hx = ((v.x / magnitude) * length) / 2;
88
+ const hy = ((v.y / magnitude) * length) / 2;
89
+ const tail = map.toPoint(gx - hx, gy - hy);
90
+ const head = map.toPoint(gx + hx, gy + hy);
91
+ drawn.push({ runs: arrow(tail, head), magnitude });
73
92
  }
74
- return drawn;
75
93
  }
94
+ return drawn;
76
95
  }
77
96
 
78
97
  /** A shaft and the two barbs of its head, in pixels. */