@motionscript/math 0.1.0-alpha.4 → 0.1.0-alpha.6

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 +132 -92
  2. package/README.md +39 -33
  3. package/dist/annotate/angle-mark.d.ts +52 -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 +59 -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 +43 -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 +58 -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 +24 -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 +28 -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 +37 -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 +30 -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 +38 -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 +30 -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 +107 -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 +34 -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 +38 -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 +34 -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 +31 -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 +99 -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 +69 -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 +126 -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 +51 -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 +92 -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 +47 -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 +56 -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 +55 -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 +140 -54
  156. package/dist/three/axes3d.d.ts.map +1 -1
  157. package/dist/three/axes3d.js +159 -204
  158. package/dist/three/axes3d.js.map +1 -1
  159. package/dist/three/curve-plot3d.d.ts +70 -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 +57 -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 +131 -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 +58 -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 +182 -161
  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,8 +1,14 @@
1
- import { type Command, type CommandArgs, type Fill, type PaintProps, type RenderContext2D, type Vector2 } from "@motionscript/sdk";
1
+ import { type Fill, type FillResolved, type PaintProps, type RenderContext, type StrokeResolved, type Vector2, type Shadow as _Shadow, type ShadowResolved as _ShadowResolved, type Stroke as _Stroke } from "@motionscript/sdk";
2
2
  import type { CoordinateMap } from "./coords.js";
3
3
  import type { ExpressionScope } from "./expression.js";
4
- import { Mark } from "./mark.js";
4
+ import { type MarkPaint, type MarkReading } from "./mark.js";
5
5
  import { type PlotSource } from "./source.js";
6
+ /**
7
+ * What a mark drawn from a vector field, `(P(x, y), Q(x, y))`, shares: arrows,
8
+ * or the lines that follow it, all in one stroke. Without strength fills it is
9
+ * one path in the stroke's paint; with them, what it draws is sorted by the
10
+ * field's strength into a few shades.
11
+ */
6
12
  export interface FieldProps extends PaintProps {
7
13
  expression?: string | PlotSource;
8
14
  params?: ExpressionScope;
@@ -16,43 +22,60 @@ export interface FieldStroke {
16
22
  runs: Vector2[][];
17
23
  magnitude: number;
18
24
  }
19
- /**
20
- * A mark drawn from a vector field, `(P(x, y), Q(x, y))`: arrows, or the lines
21
- * that follow it, all in one stroke. Without strength fills it is one path in
22
- * the stroke's paint; with them, what it draws is sorted by the field's
23
- * strength into a few shades.
24
- */
25
- export declare abstract class FieldMark<P extends FieldProps = FieldProps> extends Mark<P> {
26
- expression: PlotSource;
25
+ /** A field mark's entries. It is only strokes, revealed its own way: it has no fill and trims no outline. */
26
+ export declare const FIELD_STATE: {
27
+ expression: import("@motionscript/sdk").Type<string | PlotSource, PlotSource, false>;
27
28
  /** The equation's named values: any name in it that is not `x`, `y`, a function or a constant. */
28
- params: ExpressionScope;
29
+ params: import("@motionscript/sdk").Type<Readonly<Record<string, number>>, Readonly<Record<string, number>>, false>;
29
30
  /** Paints by the field's strength, weakest first. Empty draws everything in the stroke's own paint. */
30
- strengthFills: Fill[];
31
+ strengthFills: import("@motionscript/sdk").Type<Fill[], FillResolved[][], false>;
31
32
  /** The strength the last paint stands for; zero takes the strongest the field is where it is drawn. */
32
- maxMagnitude: number;
33
+ maxMagnitude: import("@motionscript/sdk").Type<number, number, false>;
34
+ graph: import("@motionscript/sdk").Type<import("./graph.js").GraphPlane | null, import("./graph.js").GraphPlane | null, true>;
35
+ stroke: import("@motionscript/sdk").Attribute<_Stroke, StrokeResolved[]>;
36
+ shadow: import("@motionscript/sdk").Attribute<_Shadow, _ShadowResolved[]>;
37
+ };
38
+ export declare const FIELD_COMMANDS: {
33
39
  /** Change the field, each vector turning from the one into the other. */
34
- morphTo(args: CommandArgs<{
35
- expression: string;
36
- }> & {
37
- duration: number;
38
- }): Command<P>;
40
+ morphTo: {
41
+ args: readonly ["expression"];
42
+ };
39
43
  /** Animate the equation's named values. */
40
- paramsTo(args: CommandArgs<{
41
- params: ExpressionScope;
42
- }> & {
43
- duration: number;
44
- }): Command<P>;
45
- /** What is drawn of `field` through `map`. */
46
- protected abstract strokes(map: CoordinateMap, field: FieldSampler): FieldStroke[];
47
- /** The props of its own that change what {@link strokes} returns. */
48
- protected abstract own(): string;
49
- protected trace(map: CoordinateMap): Vector2[][];
50
- protected renderInk(ctx: RenderContext2D): void;
51
- private _key;
52
- private _drawn;
53
- private _runs;
54
- /** The field at a graph point, measured from this mark's own shift, mid-morph a blend of two. */
55
- private _sampler;
56
- private _field;
44
+ paramsTo: {
45
+ args: readonly ["params"];
46
+ };
47
+ strokeTo: {
48
+ readonly args: readonly ["stroke"];
49
+ readonly run
50
+ /** A field's vector at a graph point, written into `out`; `false` where it has none. */
51
+ ?: undefined;
52
+ };
53
+ shadowTo: {
54
+ readonly args: readonly ["shadow"];
55
+ readonly run?: undefined;
56
+ };
57
+ };
58
+ /** What a field mark is drawn from. */
59
+ export interface FieldValues {
60
+ readonly expression: PlotSource;
61
+ readonly params: ExpressionScope;
62
+ }
63
+ /** What one kind of field mark draws of `field` through `map`, and the entries of its own that change it. */
64
+ export interface FieldDrawing<S> {
65
+ strokes(s: S, map: CoordinateMap, field: FieldSampler): FieldStroke[];
66
+ /** The entries of its own that change what `strokes` returns, as a key. */
67
+ own(s: S): string;
68
+ }
69
+ interface Traced {
70
+ readonly drawn: FieldStroke[];
71
+ readonly runs: Vector2[][];
57
72
  }
73
+ /** What a field mark of `kind` draws through `read`: each stroke with its strength, and all their runs. */
74
+ export declare function traceField<S extends FieldValues>(kind: string, drawing: FieldDrawing<S>, s: S, { map, shift }: MarkReading): Traced;
75
+ /** A field mark's paint: one stroke, or a shade per strength when it has strength fills. */
76
+ export declare function drawField(ctx: RenderContext, s: MarkPaint & {
77
+ readonly strengthFills: FillResolved[][];
78
+ readonly maxMagnitude: number;
79
+ }, { drawn, runs }: Traced): void;
80
+ export {};
58
81
  //# sourceMappingURL=field-mark.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"field-mark.d.ts","sourceRoot":"","sources":["../../src/kit/field-mark.ts"],"names":[],"mappings":"AAAA,OAAO,EAKH,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,IAAI,EAET,KAAK,UAAU,EACf,KAAK,eAAe,EAEpB,KAAK,OAAO,EACf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAGpD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,OAAO,EAAgD,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAGzF,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC1C,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wFAAwF;AACxF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;AAE3E,0FAA0F;AAC1F,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAKD;;;;;GAKG;AACH,8BACsB,SAAS,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAAE,SAAQ,IAAI,CAAC,CAAC,CAAC;IAEtE,UAAU,EAAE,UAAU,CAAC;IAE/B,kGAAkG;IAC5C,MAAM,EAAE,eAAe,CAAC;IAE9E,uGAAuG;IACP,aAAa,EAAE,IAAI,EAAE,CAAC;IACtH,uGAAuG;IAClD,YAAY,EAAE,MAAM,CAAC;IAE1E,yEAAyE;IAEzE,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAIrF,2CAA2C;IAE3C,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAAE,MAAM,EAAE,eAAe,CAAA;KAAE,CAAC,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IAI3F,8CAA8C;IAC9C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,GAAG,WAAW,EAAE;IAElF,qEAAqE;IACrE,SAAS,CAAC,QAAQ,CAAC,GAAG,IAAI,MAAM;IAEhC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,EAAE,EAAE;cAe7B,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IA0BxD,OAAO,CAAC,IAAI,CAAM;IAClB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,KAAK,CAAmB;IAEhC,iGAAiG;IACjG,OAAO,CAAC,QAAQ;IAehB,OAAO,CAAC,MAAM;CAcjB"}
1
+ {"version":3,"file":"field-mark.d.ts","sourceRoot":"","sources":["../../src/kit/field-mark.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,IAAI,EACT,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,OAAO,EAEZ,KAAK,MAAM,IAAI,OAAO,EACtB,KAAK,cAAc,IAAI,eAAe,EACtC,KAAK,MAAM,IAAI,OAAO,EACzB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAIpD,OAAO,EAAY,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AAEpE,OAAO,EAAgD,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAEzF;;;;;GAKG;AAEH,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC1C,UAAU,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IACjC,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,aAAa,CAAC,EAAE,IAAI,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wFAAwF;AACxF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;AAE3E,0FAA0F;AAC1F,MAAM,WAAW,WAAW;IACxB,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAKD,6GAA6G;AAC7G,eAAO,MAAM,WAAW;;IAGpB,kGAAkG;;IAElG,uGAAuG;;IAEvG,uGAAuG;;;;;CAG1G,CAAC;AAEF,eAAO,MAAM,cAAc;IAEvB,yEAAyE;;;;IAEzE,2CAA2C;;;;;;;QA7B/C,wFAAwF;QACxF,CAFA;;;;oBAEiB,CAAC;;CA8BjB,CAAC;AAEF,uCAAuC;AACvC,MAAM,WAAW,WAAW;IACxB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;CACpC;AAED,6GAA6G;AAC7G,MAAM,WAAW,YAAY,CAAC,CAAC;IAC3B,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,GAAG,WAAW,EAAE,CAAC;IACtE,2EAA2E;IAC3E,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;CACrB;AAED,UAAU,MAAM;IACZ,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC;CAC9B;AAKD,2GAA2G;AAC3G,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,WAAW,GAAG,MAAM,CAYnI;AAED,4FAA4F;AAC5F,wBAAgB,SAAS,CACrB,GAAG,EAAE,aAAa,EAClB,CAAC,EAAE,SAAS,GAAG;IAAE,QAAQ,CAAC,aAAa,EAAE,YAAY,EAAE,EAAE,CAAC;IAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,EAC1F,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,MAAM,GACxB,IAAI,CA0BN"}
@@ -1,129 +1,109 @@
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;
5
- return c > 3 && r && Object.defineProperty(target, key, r), r;
6
- };
7
- import { command, Graphics2D, property, withdraw, } from "@motionscript/sdk";
1
+ import { Graphics2D, Types, } from "@motionscript/sdk";
2
+ import { createBoundedCache } from "./cache.js";
3
+ import { omit, PAINT, PAINT_COMMANDS } from "./component.js";
8
4
  import { fieldParams, parseField } from "./field.js";
9
- import { boundsOfRuns, runsToPath, stated } from "./geometry.js";
10
- import { Mark } from "./mark.js";
5
+ import { runsToPath } from "./geometry.js";
6
+ import { PLANE_ENTRY } from "./graph.js";
7
+ import { drawMark } from "./mark.js";
11
8
  import { fillAt, lerpFillScale, readFillScale } from "./scale.js";
12
9
  import { lerpParams, lerpSource, readSource, scopeFor } from "./source.js";
13
- import { FILL_PAINT, OUTLINE_TRIM } from "./withdrawn.js";
14
10
  /** How many shades the strength fills are drawn in: each is one path. */
15
11
  const SHADES = 12;
16
- /**
17
- * A mark drawn from a vector field, `(P(x, y), Q(x, y))`: arrows, or the lines
18
- * that follow it, all in one stroke. Without strength fills it is one path in
19
- * the stroke's paint; with them, what it draws is sorted by the field's
20
- * strength into a few shades.
21
- */
22
- let FieldMark = class FieldMark extends Mark {
12
+ /** A field mark's entries. It is only strokes, revealed its own way: it has no fill and trims no outline. */
13
+ export const FIELD_STATE = {
14
+ ...omit(PAINT, "fill", "start", "end"),
15
+ expression: Types.custom("", { resolve: readSource, lerp: lerpSource, kind: "fieldEquation" }),
16
+ /** The equation's named values: any name in it that is not `x`, `y`, a function or a constant. */
17
+ params: Types.custom({}, { lerp: lerpParams }),
18
+ /** Paints by the field's strength, weakest first. Empty draws everything in the stroke's own paint. */
19
+ strengthFills: Types.custom([], { resolve: readFillScale, lerp: lerpFillScale, kind: "vector" }),
20
+ /** The strength the last paint stands for; zero takes the strongest the field is where it is drawn. */
21
+ maxMagnitude: Types.number(0, { min: 0, step: 0.1 }),
22
+ graph: PLANE_ENTRY,
23
+ };
24
+ export const FIELD_COMMANDS = {
25
+ ...omit(PAINT_COMMANDS, "fillTo", "progressTo", "flash"),
23
26
  /** Change the field, each vector turning from the one into the other. */
24
- morphTo(args) {
25
- return this.to({ data: stated(args.data), duration: args.duration, easing: args.easing });
26
- }
27
+ morphTo: { args: ["expression"] },
27
28
  /** Animate the equation's named values. */
28
- paramsTo(args) {
29
- return this.to({ data: stated(args.data), duration: args.duration, easing: args.easing });
30
- }
31
- trace(map) {
32
- const { area } = map;
33
- if (!Number.isFinite(area.maxX - area.minX))
34
- return [];
35
- const { source, blend } = this.expression;
36
- const shift = this.shift();
37
- const key = [source, blend?.from, blend?.t, map.revision, JSON.stringify(this.params), shift.x, shift.y, this.own()].join("|");
38
- if (key !== this._key) {
39
- this._key = key;
40
- const field = this._sampler(shift);
41
- this._drawn = field ? this.strokes(map, field) : [];
42
- this._runs = this._drawn.flatMap((stroke) => stroke.runs);
43
- }
44
- return this._runs;
45
- }
46
- renderInk(ctx) {
47
- const scale = this.strengthFills;
48
- const stroke = this.stroke;
49
- const ink = scale.length > 0 && stroke.length > 0 ? boundsOfRuns(this._runs) : null;
50
- if (!ink) {
51
- super.renderInk(ctx);
52
- return;
53
- }
54
- const top = this.maxMagnitude > 0 ? this.maxMagnitude : this._drawn.reduce((most, drawn) => Math.max(most, drawn.magnitude), 0);
55
- const shades = Array.from({ length: SHADES }, () => []);
56
- for (const drawn of this._drawn) {
57
- const share = top > 0 ? Math.min(1, drawn.magnitude / top) : 0;
58
- shades[Math.min(SHADES - 1, Math.floor(share * SHADES))].push(...drawn.runs);
59
- }
60
- shades.forEach((runs, index) => {
61
- if (runs.length === 0)
62
- return;
63
- const fill = fillAt(scale, (index + 0.5) / SHADES);
64
- ctx.draw(new Graphics2D()
65
- .path({ data: runsToPath(runs), centerBounds: [ink.minX, ink.minY, ink.maxX, ink.maxY], start: this.start, end: this.end })
66
- .shadow(this.shadow)
67
- .stroke(stroke.map((layer) => ({ ...layer, fill }))));
68
- });
69
- }
70
- _key = "";
71
- _drawn = [];
72
- _runs = [];
73
- /** The field at a graph point, measured from this mark's own shift, mid-morph a blend of two. */
74
- _sampler(shift) {
75
- const { source, blend } = this.expression;
76
- const to = this._field(source, shift);
77
- if (!to || !blend)
78
- return to;
79
- const from = this._field(blend.from, shift);
80
- if (!from)
81
- return to;
82
- const start = { x: 0, y: 0 };
83
- return (x, y, out) => {
84
- if (!from(x, y, start) || !to(x, y, out))
85
- return false;
86
- out.x = start.x + (out.x - start.x) * blend.t;
87
- out.y = start.y + (out.y - start.y) * blend.t;
88
- return true;
89
- };
90
- }
91
- _field(source, shift) {
92
- const names = fieldParams(source);
93
- const field = parseField(source, names);
94
- if (field instanceof Error)
95
- return null;
96
- const params = scopeFor(names, this.params);
97
- const { x, y } = field;
98
- return (gx, gy, out) => {
99
- const vx = x(gx - shift.x, gy - shift.y, params);
100
- const vy = y(gx - shift.x, gy - shift.y, params);
101
- out.x = vx;
102
- out.y = vy;
103
- return Number.isFinite(vx) && Number.isFinite(vy);
104
- };
105
- }
29
+ paramsTo: { args: ["params"] },
106
30
  };
107
- __decorate([
108
- property({ default: "", mapper: readSource, tween: lerpSource, kind: "fieldEquation" })
109
- ], FieldMark.prototype, "expression", void 0);
110
- __decorate([
111
- property({ default: {}, tween: lerpParams })
112
- ], FieldMark.prototype, "params", void 0);
113
- __decorate([
114
- property({ default: [], mapper: readFillScale, tween: lerpFillScale, kind: "vector" })
115
- ], FieldMark.prototype, "strengthFills", void 0);
116
- __decorate([
117
- property({ default: 0, min: 0, step: 0.1 })
118
- ], FieldMark.prototype, "maxMagnitude", void 0);
119
- __decorate([
120
- command({ args: ["expression"] })
121
- ], FieldMark.prototype, "morphTo", null);
122
- __decorate([
123
- command({ args: ["params"] })
124
- ], FieldMark.prototype, "paramsTo", null);
125
- FieldMark = __decorate([
126
- withdraw(...FILL_PAINT, ...OUTLINE_TRIM)
127
- ], FieldMark);
128
- export { FieldMark };
31
+ const traces = createBoundedCache(64);
32
+ const EMPTY = { drawn: [], runs: [] };
33
+ /** What a field mark of `kind` draws through `read`: each stroke with its strength, and all their runs. */
34
+ export function traceField(kind, drawing, s, { map, shift }) {
35
+ const { area } = map;
36
+ if (!Number.isFinite(area.maxX - area.minX))
37
+ return EMPTY;
38
+ const { source, blend } = s.expression;
39
+ const key = [kind, source, blend?.from, blend?.t, map.revision, JSON.stringify(s.params), shift.x, shift.y, drawing.own(s)].join("|");
40
+ const known = traces.get(key);
41
+ if (known)
42
+ return known;
43
+ const field = sampler(s, shift);
44
+ const drawn = field ? drawing.strokes(s, map, field) : [];
45
+ const traced = { drawn, runs: drawn.flatMap((stroke) => stroke.runs) };
46
+ traces.set(key, traced);
47
+ return traced;
48
+ }
49
+ /** A field mark's paint: one stroke, or a shade per strength when it has strength fills. */
50
+ export function drawField(ctx, s, { drawn, runs }) {
51
+ const scale = s.strengthFills;
52
+ const stroke = s.stroke;
53
+ const shaded = scale.length > 0 && stroke.length > 0;
54
+ drawMark(ctx, s, runs, {
55
+ ink: shaded
56
+ ? (ctx, ink) => {
57
+ const top = s.maxMagnitude > 0 ? s.maxMagnitude : drawn.reduce((most, d) => Math.max(most, d.magnitude), 0);
58
+ const shades = Array.from({ length: SHADES }, () => []);
59
+ for (const d of drawn) {
60
+ const share = top > 0 ? Math.min(1, d.magnitude / top) : 0;
61
+ shades[Math.min(SHADES - 1, Math.floor(share * SHADES))].push(...d.runs);
62
+ }
63
+ shades.forEach((shade, index) => {
64
+ if (shade.length === 0)
65
+ return;
66
+ const fill = fillAt(scale, (index + 0.5) / SHADES);
67
+ ctx.draw(new Graphics2D()
68
+ .path({ data: runsToPath(shade), centerBounds: [ink.minX, ink.minY, ink.maxX, ink.maxY], start: s.start ?? 0, end: s.end ?? 1 })
69
+ .shadow(s.shadow)
70
+ .stroke(stroke.map((layer) => ({ ...layer, fill }))));
71
+ });
72
+ }
73
+ : undefined,
74
+ });
75
+ }
76
+ /** The field at a graph point, measured from the mark's own shift, mid-morph a blend of two. */
77
+ function sampler(s, shift) {
78
+ const { source, blend } = s.expression;
79
+ const to = fieldOf(source, s.params, shift);
80
+ if (!to || !blend)
81
+ return to;
82
+ const from = fieldOf(blend.from, s.params, shift);
83
+ if (!from)
84
+ return to;
85
+ const start = { x: 0, y: 0 };
86
+ return (x, y, out) => {
87
+ if (!from(x, y, start) || !to(x, y, out))
88
+ return false;
89
+ out.x = start.x + (out.x - start.x) * blend.t;
90
+ out.y = start.y + (out.y - start.y) * blend.t;
91
+ return true;
92
+ };
93
+ }
94
+ function fieldOf(source, params, shift) {
95
+ const names = fieldParams(source);
96
+ const field = parseField(source, names);
97
+ if (field instanceof Error)
98
+ return null;
99
+ const scope = scopeFor(names, params);
100
+ const { x, y } = field;
101
+ return (gx, gy, out) => {
102
+ const vx = x(gx - shift.x, gy - shift.y, scope);
103
+ const vy = y(gx - shift.x, gy - shift.y, scope);
104
+ out.x = vx;
105
+ out.y = vy;
106
+ return Number.isFinite(vx) && Number.isFinite(vy);
107
+ };
108
+ }
129
109
  //# sourceMappingURL=field-mark.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"field-mark.js","sourceRoot":"","sources":["../../src/kit/field-mark.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n command,\r\n Graphics2D,\r\n property,\r\n withdraw,\r\n type Command,\r\n type CommandArgs,\r\n type Fill,\r\n type FillResolved,\r\n type PaintProps,\r\n type RenderContext2D,\r\n type StrokeResolved,\r\n type Vector2,\r\n} from \"@motionscript/sdk\";\r\nimport type { CoordinateMap } from \"./coords\";\r\nimport type { ExpressionScope } from \"./expression\";\r\nimport { fieldParams, parseField } from \"./field\";\r\nimport { boundsOfRuns, runsToPath, stated } from \"./geometry\";\r\nimport { Mark } from \"./mark\";\r\nimport { fillAt, lerpFillScale, readFillScale } from \"./scale\";\r\nimport { lerpParams, lerpSource, readSource, scopeFor, type PlotSource } from \"./source\";\r\nimport { FILL_PAINT, OUTLINE_TRIM } from \"./withdrawn\";\r\n\r\nexport interface FieldProps extends PaintProps {\r\n expression?: string | PlotSource;\r\n params?: ExpressionScope;\r\n strengthFills?: Fill[];\r\n maxMagnitude?: number;\r\n}\r\n\r\n/** A field's vector at a graph point, written into `out`; `false` where it has none. */\r\nexport type FieldSampler = (x: number, y: number, out: Vector2) => boolean;\r\n\r\n/** One thing a field draws, and how strong the field is there: what it is coloured by. */\r\nexport interface FieldStroke {\r\n runs: Vector2[][];\r\n magnitude: number;\r\n}\r\n\r\n/** How many shades the strength fills are drawn in: each is one path. */\r\nconst SHADES = 12;\r\n\r\n/**\r\n * A mark drawn from a vector field, `(P(x, y), Q(x, y))`: arrows, or the lines\r\n * that follow it, all in one stroke. Without strength fills it is one path in\r\n * the stroke's paint; with them, what it draws is sorted by the field's\r\n * strength into a few shades.\r\n */\r\n@withdraw(...FILL_PAINT, ...OUTLINE_TRIM)\r\nexport abstract class FieldMark<P extends FieldProps = FieldProps> extends Mark<P> {\r\n @property({ default: \"\", mapper: readSource, tween: lerpSource, kind: \"fieldEquation\" })\r\n declare expression: PlotSource;\r\n\r\n /** The equation's named values: any name in it that is not `x`, `y`, a function or a constant. */\r\n @property({ default: {}, tween: lerpParams }) declare params: ExpressionScope;\r\n\r\n /** Paints by the field's strength, weakest first. Empty draws everything in the stroke's own paint. */\r\n @property({ default: [], mapper: readFillScale, tween: lerpFillScale, kind: \"vector\" }) declare strengthFills: Fill[];\r\n /** The strength the last paint stands for; zero takes the strongest the field is where it is drawn. */\r\n @property({ default: 0, min: 0, step: 0.1 }) declare maxMagnitude: number;\r\n\r\n /** Change the field, each vector turning from the one into the other. */\r\n @command({ args: [\"expression\"] })\r\n morphTo(args: CommandArgs<{ expression: string }> & { duration: number }): Command<P> {\r\n return this.to({ data: stated(args.data) as Partial<P>, duration: args.duration, easing: args.easing });\r\n }\r\n\r\n /** Animate the equation's named values. */\r\n @command({ args: [\"params\"] })\r\n paramsTo(args: CommandArgs<{ params: ExpressionScope }> & { duration: number }): Command<P> {\r\n return this.to({ data: stated(args.data) as Partial<P>, duration: args.duration, easing: args.easing });\r\n }\r\n\r\n /** What is drawn of `field` through `map`. */\r\n protected abstract strokes(map: CoordinateMap, field: FieldSampler): FieldStroke[];\r\n\r\n /** The props of its own that change what {@link strokes} returns. */\r\n protected abstract own(): string;\r\n\r\n protected trace(map: CoordinateMap): Vector2[][] {\r\n const { area } = map;\r\n if (!Number.isFinite(area.maxX - area.minX)) return [];\r\n const { source, blend } = this.expression;\r\n const shift = this.shift();\r\n const key = [source, blend?.from, blend?.t, map.revision, JSON.stringify(this.params), shift.x, shift.y, this.own()].join(\"|\");\r\n if (key !== this._key) {\r\n this._key = key;\r\n const field = this._sampler(shift);\r\n this._drawn = field ? this.strokes(map, field) : [];\r\n this._runs = this._drawn.flatMap((stroke) => stroke.runs);\r\n }\r\n return this._runs;\r\n }\r\n\r\n protected override renderInk(ctx: RenderContext2D): void {\r\n const scale = this.strengthFills as unknown as FillResolved[][];\r\n const stroke = this.stroke as StrokeResolved[];\r\n const ink = scale.length > 0 && stroke.length > 0 ? boundsOfRuns(this._runs) : null;\r\n if (!ink) {\r\n super.renderInk(ctx);\r\n return;\r\n }\r\n const top = this.maxMagnitude > 0 ? this.maxMagnitude : this._drawn.reduce((most, drawn) => Math.max(most, drawn.magnitude), 0);\r\n const shades: Vector2[][][] = Array.from({ length: SHADES }, () => []);\r\n for (const drawn of this._drawn) {\r\n const share = top > 0 ? Math.min(1, drawn.magnitude / top) : 0;\r\n shades[Math.min(SHADES - 1, Math.floor(share * SHADES))].push(...drawn.runs);\r\n }\r\n shades.forEach((runs, index) => {\r\n if (runs.length === 0) return;\r\n const fill = fillAt(scale, (index + 0.5) / SHADES);\r\n ctx.draw(\r\n new Graphics2D()\r\n .path({ data: runsToPath(runs), centerBounds: [ink.minX, ink.minY, ink.maxX, ink.maxY], start: this.start, end: this.end })\r\n .shadow(this.shadow)\r\n .stroke(stroke.map((layer) => ({ ...layer, fill }))),\r\n );\r\n });\r\n }\r\n\r\n private _key = \"\";\r\n private _drawn: FieldStroke[] = [];\r\n private _runs: Vector2[][] = [];\r\n\r\n /** The field at a graph point, measured from this mark's own shift, mid-morph a blend of two. */\r\n private _sampler(shift: Vector2): FieldSampler | null {\r\n const { source, blend } = this.expression;\r\n const to = this._field(source, shift);\r\n if (!to || !blend) return to;\r\n const from = this._field(blend.from, shift);\r\n if (!from) return to;\r\n const start: Vector2 = { x: 0, y: 0 };\r\n return (x, y, out) => {\r\n if (!from(x, y, start) || !to(x, y, out)) return false;\r\n out.x = start.x + (out.x - start.x) * blend.t;\r\n out.y = start.y + (out.y - start.y) * blend.t;\r\n return true;\r\n };\r\n }\r\n\r\n private _field(source: string, shift: Vector2): FieldSampler | null {\r\n const names = fieldParams(source);\r\n const field = parseField(source, names);\r\n if (field instanceof Error) return null;\r\n const params = scopeFor(names, this.params);\r\n const { x, y } = field;\r\n return (gx, gy, out) => {\r\n const vx = x(gx - shift.x, gy - shift.y, params);\r\n const vy = y(gx - shift.x, gy - shift.y, params);\r\n out.x = vx;\r\n out.y = vy;\r\n return Number.isFinite(vx) && Number.isFinite(vy);\r\n };\r\n }\r\n}\r\n"]}
1
+ {"version":3,"file":"field-mark.js","sourceRoot":"","sources":["../../src/kit/field-mark.ts"],"names":[],"mappings":"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","sourcesContent":["import {\r\n Graphics2D,\r\n Types,\r\n type Fill,\r\n type FillResolved,\r\n type PaintProps,\r\n type RenderContext,\r\n type StrokeResolved,\r\n type Vector2,\r\n // Named so the emitted declaration reaches these through the sdk, not core.\r\n type Shadow as _Shadow,\r\n type ShadowResolved as _ShadowResolved,\r\n type Stroke as _Stroke,\r\n} from \"@motionscript/sdk\";\r\nimport { createBoundedCache } from \"./cache\";\r\nimport { omit, PAINT, PAINT_COMMANDS } from \"./component\";\r\nimport type { CoordinateMap } from \"./coords\";\r\nimport type { ExpressionScope } from \"./expression\";\r\nimport { fieldParams, parseField } from \"./field\";\r\nimport { runsToPath } from \"./geometry\";\r\nimport { PLANE_ENTRY } from \"./graph\";\r\nimport { drawMark, type MarkPaint, type MarkReading } from \"./mark\";\r\nimport { fillAt, lerpFillScale, readFillScale } from \"./scale\";\r\nimport { lerpParams, lerpSource, readSource, scopeFor, type PlotSource } from \"./source\";\r\n\r\n/**\r\n * What a mark drawn from a vector field, `(P(x, y), Q(x, y))`, shares: arrows,\r\n * or the lines that follow it, all in one stroke. Without strength fills it is\r\n * one path in the stroke's paint; with them, what it draws is sorted by the\r\n * field's strength into a few shades.\r\n */\r\n\r\nexport interface FieldProps extends PaintProps {\r\n expression?: string | PlotSource;\r\n params?: ExpressionScope;\r\n strengthFills?: Fill[];\r\n maxMagnitude?: number;\r\n}\r\n\r\n/** A field's vector at a graph point, written into `out`; `false` where it has none. */\r\nexport type FieldSampler = (x: number, y: number, out: Vector2) => boolean;\r\n\r\n/** One thing a field draws, and how strong the field is there: what it is coloured by. */\r\nexport interface FieldStroke {\r\n runs: Vector2[][];\r\n magnitude: number;\r\n}\r\n\r\n/** How many shades the strength fills are drawn in: each is one path. */\r\nconst SHADES = 12;\r\n\r\n/** A field mark's entries. It is only strokes, revealed its own way: it has no fill and trims no outline. */\r\nexport const FIELD_STATE = {\r\n ...omit(PAINT, \"fill\", \"start\", \"end\"),\r\n expression: Types.custom<string | PlotSource, PlotSource>(\"\", { resolve: readSource, lerp: lerpSource, kind: \"fieldEquation\" }),\r\n /** The equation's named values: any name in it that is not `x`, `y`, a function or a constant. */\r\n params: Types.custom<ExpressionScope>({}, { lerp: lerpParams }),\r\n /** Paints by the field's strength, weakest first. Empty draws everything in the stroke's own paint. */\r\n strengthFills: Types.custom<Fill[], FillResolved[][]>([], { resolve: readFillScale, lerp: lerpFillScale, kind: \"vector\" }),\r\n /** The strength the last paint stands for; zero takes the strongest the field is where it is drawn. */\r\n maxMagnitude: Types.number(0, { min: 0, step: 0.1 }),\r\n graph: PLANE_ENTRY,\r\n};\r\n\r\nexport const FIELD_COMMANDS = {\r\n ...omit(PAINT_COMMANDS, \"fillTo\", \"progressTo\", \"flash\"),\r\n /** Change the field, each vector turning from the one into the other. */\r\n morphTo: { args: [\"expression\"] as const },\r\n /** Animate the equation's named values. */\r\n paramsTo: { args: [\"params\"] as const },\r\n};\r\n\r\n/** What a field mark is drawn from. */\r\nexport interface FieldValues {\r\n readonly expression: PlotSource;\r\n readonly params: ExpressionScope;\r\n}\r\n\r\n/** What one kind of field mark draws of `field` through `map`, and the entries of its own that change it. */\r\nexport interface FieldDrawing<S> {\r\n strokes(s: S, map: CoordinateMap, field: FieldSampler): FieldStroke[];\r\n /** The entries of its own that change what `strokes` returns, as a key. */\r\n own(s: S): string;\r\n}\r\n\r\ninterface Traced {\r\n readonly drawn: FieldStroke[];\r\n readonly runs: Vector2[][];\r\n}\r\n\r\nconst traces = createBoundedCache<Traced>(64);\r\nconst EMPTY: Traced = { drawn: [], runs: [] };\r\n\r\n/** What a field mark of `kind` draws through `read`: each stroke with its strength, and all their runs. */\r\nexport function traceField<S extends FieldValues>(kind: string, drawing: FieldDrawing<S>, s: S, { map, shift }: MarkReading): Traced {\r\n const { area } = map;\r\n if (!Number.isFinite(area.maxX - area.minX)) return EMPTY;\r\n const { source, blend } = s.expression;\r\n const key = [kind, source, blend?.from, blend?.t, map.revision, JSON.stringify(s.params), shift.x, shift.y, drawing.own(s)].join(\"|\");\r\n const known = traces.get(key);\r\n if (known) return known;\r\n const field = sampler(s, shift);\r\n const drawn = field ? drawing.strokes(s, map, field) : [];\r\n const traced = { drawn, runs: drawn.flatMap((stroke) => stroke.runs) };\r\n traces.set(key, traced);\r\n return traced;\r\n}\r\n\r\n/** A field mark's paint: one stroke, or a shade per strength when it has strength fills. */\r\nexport function drawField(\r\n ctx: RenderContext,\r\n s: MarkPaint & { readonly strengthFills: FillResolved[][]; readonly maxMagnitude: number },\r\n { drawn, runs }: Traced,\r\n): void {\r\n const scale = s.strengthFills;\r\n const stroke = s.stroke as StrokeResolved[];\r\n const shaded = scale.length > 0 && stroke.length > 0;\r\n drawMark(ctx, s, runs, {\r\n ink: shaded\r\n ? (ctx, ink) => {\r\n const top = s.maxMagnitude > 0 ? s.maxMagnitude : drawn.reduce((most, d) => Math.max(most, d.magnitude), 0);\r\n const shades: Vector2[][][] = Array.from({ length: SHADES }, () => []);\r\n for (const d of drawn) {\r\n const share = top > 0 ? Math.min(1, d.magnitude / top) : 0;\r\n shades[Math.min(SHADES - 1, Math.floor(share * SHADES))].push(...d.runs);\r\n }\r\n shades.forEach((shade, index) => {\r\n if (shade.length === 0) return;\r\n const fill = fillAt(scale, (index + 0.5) / SHADES);\r\n ctx.draw(\r\n new Graphics2D()\r\n .path({ data: runsToPath(shade), centerBounds: [ink.minX, ink.minY, ink.maxX, ink.maxY], start: s.start ?? 0, end: s.end ?? 1 })\r\n .shadow(s.shadow)\r\n .stroke(stroke.map((layer) => ({ ...layer, fill }))),\r\n );\r\n });\r\n }\r\n : undefined,\r\n });\r\n}\r\n\r\n/** The field at a graph point, measured from the mark's own shift, mid-morph a blend of two. */\r\nfunction sampler(s: FieldValues, shift: Vector2): FieldSampler | null {\r\n const { source, blend } = s.expression;\r\n const to = fieldOf(source, s.params, shift);\r\n if (!to || !blend) return to;\r\n const from = fieldOf(blend.from, s.params, shift);\r\n if (!from) return to;\r\n const start: Vector2 = { x: 0, y: 0 };\r\n return (x, y, out) => {\r\n if (!from(x, y, start) || !to(x, y, out)) return false;\r\n out.x = start.x + (out.x - start.x) * blend.t;\r\n out.y = start.y + (out.y - start.y) * blend.t;\r\n return true;\r\n };\r\n}\r\n\r\nfunction fieldOf(source: string, params: ExpressionScope, shift: Vector2): FieldSampler | null {\r\n const names = fieldParams(source);\r\n const field = parseField(source, names);\r\n if (field instanceof Error) return null;\r\n const scope = scopeFor(names, params);\r\n const { x, y } = field;\r\n return (gx, gy, out) => {\r\n const vx = x(gx - shift.x, gy - shift.y, scope);\r\n const vy = y(gx - shift.x, gy - shift.y, scope);\r\n out.x = vx;\r\n out.y = vy;\r\n return Number.isFinite(vx) && Number.isFinite(vy);\r\n };\r\n}\r\n"]}
@@ -1,4 +1,4 @@
1
- import { Graphics2D, PaintNode, type BoxBounds, type Command, type CommandArgs, type Node2D, type PaintProps, type PathCommand, type Size2D, type Vector2 } from "@motionscript/sdk";
1
+ import { type BoxBounds, type NodeView, type PaintProps, type PathCommand, type RenderContext, type Vector2, type Shadow as _Shadow, type ShadowResolved as _ShadowResolved, type Stroke as _Stroke, type StrokeResolved as _StrokeResolved } from "@motionscript/sdk";
2
2
  /** A node with parts that can be pointed at by name: a formula's terms. */
3
3
  export interface Parted {
4
4
  /** The box of `part`, y-up from the node's centre, or `null` when it has no such part. */
@@ -15,50 +15,88 @@ export interface Retarget extends Target {
15
15
  from?: Target | null;
16
16
  t: number;
17
17
  }
18
- /** A target's four corners in its mark's own frame, y-up: top left, top right, bottom right, bottom left. */
19
- export type Quad = [Vector2, Vector2, Vector2, Vector2];
20
- /**
21
- * The node a mark is drawn on: the one `on` names, or, naming none, the nearest
22
- * node with parts the mark sits inside. Putting a box in a formula is how it is
23
- * told which.
24
- */
25
- export declare function followed(mark: Node2D, on: string): Node2D | null;
26
- /** Where `target` is, as `mark` sees it; `null` when it names no node or part. */
27
- export declare function quadOf(mark: Node2D, target: Target): Quad | null;
28
18
  export interface FollowProps extends PaintProps {
29
19
  on?: string;
30
20
  part?: string;
31
21
  occurrence?: number;
32
22
  retarget?: Retarget | null;
33
23
  }
24
+ /** A target's four corners in its mark's own frame, y-up: top left, top right, bottom right, bottom left. */
25
+ export type Quad = [Vector2, Vector2, Vector2, Vector2];
34
26
  /**
35
27
  * A mark drawn on another node, or on one part of a formula: a brace, a box,
36
28
  * an underline. It has no size of its own and takes no place in a layout; it
37
29
  * is drawn where its target is, wherever the two are in the tree, and its
38
- * selection box is its ink.
30
+ * selection box is its ink. Its entries, and what it draws on.
39
31
  */
40
- export declare abstract class FollowMark<P extends FollowProps = FollowProps> extends PaintNode<P> {
32
+ export declare const FOLLOW_STATE: {
41
33
  /** The node this mark is drawn on, by id. Left empty, it is the formula the mark sits inside. */
42
- on: string;
34
+ on: import("@motionscript/sdk").Type<string, NodeView<import("@motionscript/sdk").Element<string, unknown, unknown>> | null, false>;
43
35
  /** One part of that node, by its source, where it has parts: `x^2` of a formula. */
44
- part: string;
36
+ part: import("@motionscript/sdk").Type<string, string, false>;
45
37
  /** Which of the places the part is written, counted from 1. */
46
- occurrence: number;
38
+ occurrence: import("@motionscript/sdk").Type<number, number, false>;
47
39
  /** Where a `retargetTo` has taken the mark, and how far along it is. Not an author's to state. */
48
- retarget: Retarget | null;
49
- /** Move the mark onto another node, or another part. */
50
- retargetTo(args: CommandArgs<Partial<Target>> & {
51
- duration: number;
52
- }): Command<P>;
53
- /** The outline to draw around `quad`, in the mark's own frame, y-up. */
54
- protected abstract outline(quad: Quad): PathCommand[];
55
- /** The target's corners now: its resting one, or part-way to where a `retargetTo` is taking it. */
56
- protected quad(): Quad | null;
57
- measure(): Partial<Size2D>;
58
- protected shapeGraphics(): Graphics2D | null;
59
- _localBounds(): BoxBounds;
60
- private _outline;
40
+ retarget: import("@motionscript/sdk").Type<Retarget | null, Retarget | null, false>;
41
+ /** The nodes the retarget names, there and where it set out from, read as nodes. */
42
+ retargetOn: import("@motionscript/sdk").Type<string, NodeView<import("@motionscript/sdk").Element<string, unknown, unknown>> | null, true>;
43
+ retargetFrom: import("@motionscript/sdk").Type<string, NodeView<import("@motionscript/sdk").Element<string, unknown, unknown>> | null, true>;
44
+ start: import("@motionscript/sdk").Type<number, number, false>;
45
+ end: import("@motionscript/sdk").Type<number, number, false>;
46
+ stroke: import("@motionscript/sdk").Attribute<_Stroke, _StrokeResolved[]>;
47
+ shadow: import("@motionscript/sdk").Attribute<_Shadow, _ShadowResolved[]>;
48
+ };
49
+ export declare const FOLLOW_COMMANDS: {
50
+ retargetTo: {
51
+ readonly args: {
52
+ readonly on: import("@motionscript/sdk").Type<string | undefined, string | undefined, false>;
53
+ readonly part: import("@motionscript/sdk").Type<string | undefined, string | undefined, false>;
54
+ readonly occurrence: import("@motionscript/sdk").Type<number, number, false>;
55
+ };
56
+ run(timeline: any, state: any, children: any): import("@motionscript/sdk").Piece;
57
+ };
58
+ strokeTo: {
59
+ readonly args: readonly ["stroke"];
60
+ readonly run?: undefined;
61
+ };
62
+ shadowTo: {
63
+ readonly args: readonly ["shadow"];
64
+ readonly run?: undefined;
65
+ };
66
+ progressTo: {
67
+ readonly args: readonly ["start", "end"];
68
+ readonly run?: undefined;
69
+ };
70
+ flash: {
71
+ readonly args: {
72
+ readonly portion: import("@motionscript/sdk").Type<number, number, false>;
73
+ };
74
+ run(timeline: any, state: any, children: any): import("@motionscript/sdk").Piece;
75
+ };
76
+ };
77
+ /** What a follow mark reads of its state. */
78
+ export interface FollowValues {
79
+ readonly on: NodeView | null;
80
+ readonly part: string;
81
+ readonly occurrence: number;
82
+ readonly retarget: Retarget | null;
83
+ readonly retargetOn: NodeView | null;
84
+ readonly retargetFrom: NodeView | null;
61
85
  }
86
+ /**
87
+ * The formula a follow mark sits in, as its render last found it: what a mark
88
+ * naming no node is drawn on. Its bounds and handles read it from there, where
89
+ * there is no context to ask.
90
+ */
91
+ export declare function container(ctx: RenderContext | null, s: object): NodeView | null;
92
+ /** The node the mark rests on: the one `on` names, or the formula it sits in. */
93
+ export declare function resting(s: FollowValues, parted: NodeView | null): NodeView | null;
94
+ /** The target's corners now: its resting one, or part-way to where a `retargetTo` is taking it. */
95
+ export declare function followedQuad(s: FollowValues, parted: NodeView | null): Quad | null;
96
+ /** The box of an outline, as a follow mark's bounds: it has no size of its own, so its ink is what is selected. */
97
+ export declare function outlineBounds(outline: readonly PathCommand[]): BoxBounds;
98
+ /** Every drawn point's centre frame: the mark's own centre, so its outline is where it says. */
99
+ export declare const OWN_FRAME: [number, number, number, number];
62
100
  export declare const add: (a: Vector2, b: Vector2, k?: number) => Vector2;
63
101
  export declare const between: (a: Vector2, b: Vector2, t?: number) => Vector2;
64
102
  /** The unit vector from `a` to `b`, and its length; a zero one points right. */
@@ -1 +1 @@
1
- {"version":3,"file":"follow.d.ts","sourceRoot":"","sources":["../../src/kit/follow.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"follow.d.ts","sourceRoot":"","sources":["../../src/kit/follow.ts"],"names":[],"mappings":"AAAA,OAAO,EAIH,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,WAAW,EAChB,KAAK,aAAa,EAClB,KAAK,OAAO,EAEZ,KAAK,MAAM,IAAI,OAAO,EACtB,KAAK,cAAc,IAAI,eAAe,EACtC,KAAK,MAAM,IAAI,OAAO,EACtB,KAAK,cAAc,IAAI,eAAe,EACzC,MAAM,mBAAmB,CAAC;AAO3B,2EAA2E;AAC3E,MAAM,WAAW,MAAM;IACnB,0FAA0F;IAC1F,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;CACnE;AAYD,oFAAoF;AACpF,MAAM,WAAW,MAAM;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qGAAqG;AACrG,MAAM,WAAW,QAAS,SAAQ,MAAM;IACpC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAY,SAAQ,UAAU;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC9B;AAED,6GAA6G;AAC7G,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAYxD;;;;;GAKG;AACH,eAAO,MAAM,YAAY;IAGrB,iGAAiG;;IAEjG,oFAAoF;;IAEpF,+DAA+D;;IAE/D,kGAAkG;;IAElG,oFAAoF;;;;;;;CAGvF,CAAC;AAEF,eAAO,MAAM,eAAe;;;;;;;;;;;oBA1DrB,CAAC;;;;oBAG2C,CAAC;;;;oBAOgD,CAAC;;;;;;;;CA4EpG,CAAC;AAEF,6CAA6C;AAC7C,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,EAAE,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,UAAU,EAAE,QAAQ,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,YAAY,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC1C;AAQD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,aAAa,GAAG,IAAI,EAAE,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAM/E;AAED,iFAAiF;AACjF,wBAAgB,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,QAAQ,GAAG,IAAI,CAEjF;AAED,mGAAmG;AACnG,wBAAgB,YAAY,CAAC,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAQlF;AA4BD,mHAAmH;AACnH,wBAAgB,aAAa,CAAC,OAAO,EAAE,SAAS,WAAW,EAAE,GAAG,SAAS,CAIxE;AAED,gGAAgG;AAChG,eAAO,MAAM,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAkB,CAAC;AAI1E,eAAO,MAAM,GAAG,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,UAAK,KAAG,OAAmD,CAAC;AACxG,eAAO,MAAM,OAAO,GAAI,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,UAAO,KAAG,OAAmE,CAAC;AAE9H,gFAAgF;AAChF,wBAAgB,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAKjF;AAED,sEAAsE;AACtE,wBAAgB,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAUlD"}