js-draw 0.18.2 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (227) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/dist/bundle.js +2 -2
  3. package/dist/bundledStyles.js +1 -0
  4. package/dist/cjs/src/Color4.d.ts +8 -0
  5. package/dist/cjs/src/Color4.js +67 -0
  6. package/dist/cjs/src/Editor.d.ts +2 -2
  7. package/dist/cjs/src/Editor.js +2 -2
  8. package/dist/cjs/src/SVGLoader.js +8 -5
  9. package/dist/cjs/src/components/AbstractComponent.d.ts +2 -2
  10. package/dist/cjs/src/components/AbstractComponent.js +3 -3
  11. package/dist/cjs/src/components/ImageBackground.js +1 -1
  12. package/dist/cjs/src/components/RestylableComponent.d.ts +21 -2
  13. package/dist/cjs/src/components/Stroke.d.ts +35 -0
  14. package/dist/cjs/src/components/Stroke.js +36 -2
  15. package/dist/cjs/src/components/TextComponent.d.ts +26 -4
  16. package/dist/cjs/src/components/TextComponent.js +22 -0
  17. package/dist/cjs/src/components/lib.d.ts +3 -2
  18. package/dist/cjs/src/lib.d.ts +30 -0
  19. package/dist/cjs/src/lib.js +30 -0
  20. package/dist/cjs/src/rendering/RenderingStyle.d.ts +4 -4
  21. package/dist/cjs/src/rendering/TextRenderingStyle.d.ts +10 -10
  22. package/dist/cjs/src/rendering/lib.d.ts +2 -0
  23. package/dist/cjs/src/rendering/renderers/AbstractRenderer.d.ts +2 -2
  24. package/dist/cjs/src/rendering/renderers/CanvasRenderer.d.ts +2 -2
  25. package/dist/cjs/src/rendering/renderers/DummyRenderer.d.ts +2 -2
  26. package/dist/cjs/src/rendering/renderers/SVGRenderer.d.ts +2 -2
  27. package/dist/cjs/src/rendering/renderers/TextOnlyRenderer.d.ts +2 -2
  28. package/dist/cjs/src/toolbar/IconProvider.d.ts +2 -2
  29. package/dist/cjs/src/toolbar/localization.js +1 -1
  30. package/dist/cjs/src/toolbar/widgets/BaseWidget.js +1 -1
  31. package/dist/cjs/src/tools/SoundUITool.d.ts +24 -0
  32. package/dist/cjs/src/tools/SoundUITool.js +164 -0
  33. package/dist/cjs/src/tools/TextTool.d.ts +2 -2
  34. package/dist/cjs/src/tools/ToolController.js +6 -1
  35. package/dist/cjs/src/tools/lib.d.ts +1 -0
  36. package/dist/cjs/src/tools/lib.js +3 -1
  37. package/dist/cjs/src/tools/localization.d.ts +3 -0
  38. package/dist/cjs/src/tools/localization.js +3 -0
  39. package/dist/mjs/src/Color4.d.ts +8 -0
  40. package/dist/mjs/src/Color4.mjs +64 -0
  41. package/dist/mjs/src/Editor.d.ts +2 -2
  42. package/dist/mjs/src/Editor.mjs +2 -2
  43. package/dist/mjs/src/SVGLoader.mjs +8 -5
  44. package/dist/mjs/src/components/AbstractComponent.d.ts +2 -2
  45. package/dist/mjs/src/components/AbstractComponent.mjs +3 -3
  46. package/dist/mjs/src/components/ImageBackground.mjs +1 -1
  47. package/dist/mjs/src/components/RestylableComponent.d.ts +21 -2
  48. package/dist/mjs/src/components/Stroke.d.ts +35 -0
  49. package/dist/mjs/src/components/Stroke.mjs +36 -2
  50. package/dist/mjs/src/components/TextComponent.d.ts +26 -4
  51. package/dist/mjs/src/components/TextComponent.mjs +22 -0
  52. package/dist/mjs/src/components/lib.d.ts +3 -2
  53. package/dist/mjs/src/lib.d.ts +30 -0
  54. package/dist/mjs/src/lib.mjs +30 -0
  55. package/dist/mjs/src/rendering/RenderingStyle.d.ts +4 -4
  56. package/dist/mjs/src/rendering/TextRenderingStyle.d.ts +10 -10
  57. package/dist/mjs/src/rendering/lib.d.ts +2 -0
  58. package/dist/mjs/src/rendering/renderers/AbstractRenderer.d.ts +2 -2
  59. package/dist/mjs/src/rendering/renderers/CanvasRenderer.d.ts +2 -2
  60. package/dist/mjs/src/rendering/renderers/DummyRenderer.d.ts +2 -2
  61. package/dist/mjs/src/rendering/renderers/SVGRenderer.d.ts +2 -2
  62. package/dist/mjs/src/rendering/renderers/TextOnlyRenderer.d.ts +2 -2
  63. package/dist/mjs/src/toolbar/IconProvider.d.ts +2 -2
  64. package/dist/mjs/src/toolbar/localization.mjs +1 -1
  65. package/dist/mjs/src/toolbar/widgets/BaseWidget.mjs +1 -1
  66. package/dist/mjs/src/tools/SoundUITool.d.ts +24 -0
  67. package/dist/mjs/src/tools/SoundUITool.mjs +158 -0
  68. package/dist/mjs/src/tools/TextTool.d.ts +2 -2
  69. package/dist/mjs/src/tools/ToolController.mjs +6 -1
  70. package/dist/mjs/src/tools/lib.d.ts +1 -0
  71. package/dist/mjs/src/tools/lib.mjs +1 -0
  72. package/dist/mjs/src/tools/localization.d.ts +3 -0
  73. package/dist/mjs/src/tools/localization.mjs +3 -0
  74. package/package.json +6 -4
  75. package/src/Editor.css +2 -2
  76. package/src/tools/SoundUITool.css +15 -0
  77. package/src/tools/tools.css +4 -0
  78. package/src/Color4.test.ts +0 -40
  79. package/src/Color4.ts +0 -236
  80. package/src/Editor.loadFrom.test.ts +0 -24
  81. package/src/Editor.toSVG.test.ts +0 -111
  82. package/src/Editor.ts +0 -1122
  83. package/src/EditorImage.test.ts +0 -120
  84. package/src/EditorImage.ts +0 -603
  85. package/src/EventDispatcher.test.ts +0 -123
  86. package/src/EventDispatcher.ts +0 -71
  87. package/src/Pointer.ts +0 -127
  88. package/src/SVGLoader.test.ts +0 -114
  89. package/src/SVGLoader.ts +0 -511
  90. package/src/UndoRedoHistory.test.ts +0 -33
  91. package/src/UndoRedoHistory.ts +0 -102
  92. package/src/Viewport.ts +0 -319
  93. package/src/bundle/bundled.ts +0 -7
  94. package/src/commands/Command.ts +0 -45
  95. package/src/commands/Duplicate.ts +0 -48
  96. package/src/commands/Erase.ts +0 -74
  97. package/src/commands/SerializableCommand.ts +0 -49
  98. package/src/commands/UnresolvedCommand.ts +0 -37
  99. package/src/commands/invertCommand.ts +0 -51
  100. package/src/commands/lib.ts +0 -16
  101. package/src/commands/localization.ts +0 -47
  102. package/src/commands/uniteCommands.test.ts +0 -23
  103. package/src/commands/uniteCommands.ts +0 -135
  104. package/src/components/AbstractComponent.transformBy.test.ts +0 -22
  105. package/src/components/AbstractComponent.ts +0 -364
  106. package/src/components/ImageBackground.test.ts +0 -35
  107. package/src/components/ImageBackground.ts +0 -176
  108. package/src/components/ImageComponent.ts +0 -171
  109. package/src/components/RestylableComponent.ts +0 -142
  110. package/src/components/SVGGlobalAttributesObject.ts +0 -81
  111. package/src/components/Stroke.test.ts +0 -139
  112. package/src/components/Stroke.ts +0 -245
  113. package/src/components/TextComponent.test.ts +0 -99
  114. package/src/components/TextComponent.ts +0 -315
  115. package/src/components/UnknownSVGObject.test.ts +0 -10
  116. package/src/components/UnknownSVGObject.ts +0 -60
  117. package/src/components/builders/ArrowBuilder.ts +0 -107
  118. package/src/components/builders/FreehandLineBuilder.ts +0 -212
  119. package/src/components/builders/LineBuilder.ts +0 -77
  120. package/src/components/builders/PressureSensitiveFreehandLineBuilder.ts +0 -454
  121. package/src/components/builders/RectangleBuilder.ts +0 -74
  122. package/src/components/builders/types.ts +0 -15
  123. package/src/components/lib.ts +0 -25
  124. package/src/components/localization.ts +0 -22
  125. package/src/components/util/StrokeSmoother.ts +0 -293
  126. package/src/components/util/describeComponentList.ts +0 -18
  127. package/src/lib.ts +0 -37
  128. package/src/localization.ts +0 -34
  129. package/src/localizations/de.ts +0 -98
  130. package/src/localizations/en.ts +0 -8
  131. package/src/localizations/es.ts +0 -74
  132. package/src/localizations/getLocalizationTable.test.ts +0 -27
  133. package/src/localizations/getLocalizationTable.ts +0 -55
  134. package/src/math/LineSegment2.test.ts +0 -99
  135. package/src/math/LineSegment2.ts +0 -160
  136. package/src/math/Mat33.test.ts +0 -244
  137. package/src/math/Mat33.ts +0 -437
  138. package/src/math/Path.fromString.test.ts +0 -223
  139. package/src/math/Path.test.ts +0 -198
  140. package/src/math/Path.toString.test.ts +0 -77
  141. package/src/math/Path.ts +0 -790
  142. package/src/math/Rect2.test.ts +0 -204
  143. package/src/math/Rect2.ts +0 -315
  144. package/src/math/Triangle.ts +0 -29
  145. package/src/math/Vec2.test.ts +0 -30
  146. package/src/math/Vec2.ts +0 -18
  147. package/src/math/Vec3.test.ts +0 -44
  148. package/src/math/Vec3.ts +0 -218
  149. package/src/math/lib.ts +0 -15
  150. package/src/math/rounding.test.ts +0 -65
  151. package/src/math/rounding.ts +0 -156
  152. package/src/rendering/Display.ts +0 -249
  153. package/src/rendering/RenderingStyle.test.ts +0 -68
  154. package/src/rendering/RenderingStyle.ts +0 -55
  155. package/src/rendering/TextRenderingStyle.ts +0 -45
  156. package/src/rendering/caching/CacheRecord.test.ts +0 -49
  157. package/src/rendering/caching/CacheRecord.ts +0 -77
  158. package/src/rendering/caching/CacheRecordManager.ts +0 -71
  159. package/src/rendering/caching/RenderingCache.test.ts +0 -44
  160. package/src/rendering/caching/RenderingCache.ts +0 -66
  161. package/src/rendering/caching/RenderingCacheNode.ts +0 -405
  162. package/src/rendering/caching/testUtils.ts +0 -35
  163. package/src/rendering/caching/types.ts +0 -34
  164. package/src/rendering/lib.ts +0 -6
  165. package/src/rendering/localization.ts +0 -20
  166. package/src/rendering/renderers/AbstractRenderer.ts +0 -222
  167. package/src/rendering/renderers/CanvasRenderer.ts +0 -296
  168. package/src/rendering/renderers/DummyRenderer.test.ts +0 -42
  169. package/src/rendering/renderers/DummyRenderer.ts +0 -136
  170. package/src/rendering/renderers/SVGRenderer.ts +0 -354
  171. package/src/rendering/renderers/TextOnlyRenderer.ts +0 -70
  172. package/src/testing/beforeEachFile.ts +0 -8
  173. package/src/testing/createEditor.ts +0 -11
  174. package/src/testing/global.d.ts +0 -17
  175. package/src/testing/lib.ts +0 -3
  176. package/src/testing/loadExpectExtensions.ts +0 -25
  177. package/src/testing/sendPenEvent.ts +0 -31
  178. package/src/testing/sendTouchEvent.ts +0 -78
  179. package/src/toolbar/HTMLToolbar.ts +0 -492
  180. package/src/toolbar/IconProvider.ts +0 -736
  181. package/src/toolbar/lib.ts +0 -4
  182. package/src/toolbar/localization.ts +0 -106
  183. package/src/toolbar/makeColorInput.ts +0 -145
  184. package/src/toolbar/types.ts +0 -5
  185. package/src/toolbar/widgets/ActionButtonWidget.ts +0 -39
  186. package/src/toolbar/widgets/BaseToolWidget.ts +0 -56
  187. package/src/toolbar/widgets/BaseWidget.ts +0 -377
  188. package/src/toolbar/widgets/DocumentPropertiesWidget.ts +0 -167
  189. package/src/toolbar/widgets/EraserToolWidget.ts +0 -85
  190. package/src/toolbar/widgets/HandToolWidget.ts +0 -250
  191. package/src/toolbar/widgets/InsertImageWidget.ts +0 -223
  192. package/src/toolbar/widgets/OverflowWidget.ts +0 -92
  193. package/src/toolbar/widgets/PenToolWidget.ts +0 -288
  194. package/src/toolbar/widgets/SelectionToolWidget.ts +0 -190
  195. package/src/toolbar/widgets/TextToolWidget.ts +0 -145
  196. package/src/toolbar/widgets/lib.ts +0 -13
  197. package/src/tools/BaseTool.ts +0 -76
  198. package/src/tools/Eraser.test.ts +0 -103
  199. package/src/tools/Eraser.ts +0 -139
  200. package/src/tools/FindTool.ts +0 -152
  201. package/src/tools/PanZoom.test.ts +0 -310
  202. package/src/tools/PanZoom.ts +0 -520
  203. package/src/tools/PasteHandler.ts +0 -95
  204. package/src/tools/Pen.test.ts +0 -194
  205. package/src/tools/Pen.ts +0 -226
  206. package/src/tools/PipetteTool.ts +0 -55
  207. package/src/tools/SelectionTool/SelectAllShortcutHandler.ts +0 -28
  208. package/src/tools/SelectionTool/Selection.ts +0 -607
  209. package/src/tools/SelectionTool/SelectionHandle.ts +0 -108
  210. package/src/tools/SelectionTool/SelectionTool.test.ts +0 -261
  211. package/src/tools/SelectionTool/SelectionTool.ts +0 -480
  212. package/src/tools/SelectionTool/TransformMode.ts +0 -114
  213. package/src/tools/SelectionTool/types.ts +0 -11
  214. package/src/tools/TextTool.ts +0 -326
  215. package/src/tools/ToolController.ts +0 -178
  216. package/src/tools/ToolEnabledGroup.ts +0 -14
  217. package/src/tools/ToolSwitcherShortcut.ts +0 -39
  218. package/src/tools/ToolbarShortcutHandler.ts +0 -34
  219. package/src/tools/UndoRedoShortcut.test.ts +0 -56
  220. package/src/tools/UndoRedoShortcut.ts +0 -25
  221. package/src/tools/lib.ts +0 -21
  222. package/src/tools/localization.ts +0 -66
  223. package/src/types.ts +0 -234
  224. package/src/util/assertions.ts +0 -55
  225. package/src/util/fileToBase64.ts +0 -18
  226. package/src/util/untilNextAnimationFrame.ts +0 -9
  227. package/src/util/waitForTimeout.ts +0 -9
@@ -1,204 +0,0 @@
1
-
2
- import Rect2 from './Rect2';
3
- import { Vec2 } from './Vec2';
4
- import Mat33 from './Mat33';
5
-
6
- describe('Rect2', () => {
7
- it('width, height should always be positive', () => {
8
- expect(new Rect2(-1, -2, -3, 4)).objEq(new Rect2(-4, -2, 3, 4));
9
- expect(new Rect2(0, 0, 0, 0).size).objEq(Vec2.zero);
10
- expect(Rect2.fromCorners(
11
- Vec2.of(-3, -3),
12
- Vec2.of(-1, -1)
13
- )).objEq(new Rect2(
14
- -3, -3,
15
- 2, 2
16
- ));
17
- });
18
-
19
- it('bounding boxes should be correctly computed', () => {
20
- expect(Rect2.bboxOf([
21
- Vec2.zero,
22
- ])).objEq(Rect2.empty);
23
-
24
- expect(Rect2.bboxOf([
25
- Vec2.of(-1, -1),
26
- Vec2.of(1, 2),
27
- Vec2.of(3, 4),
28
- Vec2.of(1, -4),
29
- ])).objEq(new Rect2(
30
- -1, -4,
31
- 4, 8
32
- ));
33
-
34
- expect(Rect2.bboxOf([
35
- Vec2.zero,
36
- ], 10)).objEq(new Rect2(
37
- -10, -10,
38
- 20, 20
39
- ));
40
- });
41
-
42
- it('"union"s should contain both composite rectangles.', () => {
43
- expect(new Rect2(0, 0, 1, 1).union(new Rect2(1, 1, 2, 2))).objEq(
44
- new Rect2(0, 0, 3, 3)
45
- );
46
- expect(Rect2.empty.union(Rect2.empty)).objEq(Rect2.empty);
47
- });
48
-
49
- it('should handle empty unions', () => {
50
- expect(Rect2.union()).toStrictEqual(Rect2.empty);
51
- });
52
-
53
- it('should correctly union multiple rectangles', () => {
54
- expect(Rect2.union(new Rect2(0, 0, 1, 1), new Rect2(1, 1, 2, 2))).objEq(
55
- new Rect2(0, 0, 3, 3)
56
- );
57
-
58
- expect(
59
- Rect2.union(new Rect2(-1, 0, 1, 1), new Rect2(1, 1, 2, 2), new Rect2(1, 10, 1, 0.1))
60
- ).objEq(
61
- new Rect2(-1, 0, 4, 10.1)
62
- );
63
-
64
- expect(
65
- Rect2.union(new Rect2(-1, 0, 1, 1), new Rect2(1, -11.1, 2, 2), new Rect2(1, 10, 1, 0.1))
66
- ).objEq(
67
- new Rect2(-1, -11.1, 4, 21.2)
68
- );
69
- });
70
-
71
- it('should contain points that are within a rectangle', () => {
72
- expect(new Rect2(-1, -1, 2, 2).containsPoint(Vec2.zero)).toBe(true);
73
- expect(new Rect2(-1, -1, 0, 0).containsPoint(Vec2.zero)).toBe(false);
74
- expect(new Rect2(1, 2, 3, 4).containsRect(Rect2.empty)).toBe(false);
75
- expect(new Rect2(1, 2, 3, 4).containsRect(new Rect2(1, 2, 1, 2))).toBe(true);
76
- expect(new Rect2(-2, -2, 4, 4).containsRect(new Rect2(-1, 0, 1, 1))).toBe(true);
77
- expect(new Rect2(-2, -2, 4, 4).containsRect(new Rect2(-1, 0, 10, 1))).toBe(false);
78
- });
79
-
80
- describe('containsRect', () => {
81
- it('a rectangle should contain itself', () => {
82
- const rect = new Rect2(1 / 3, 1 / 4, 1 / 5, 1 / 6);
83
- expect(rect.containsRect(rect)).toBe(true);
84
- });
85
-
86
- it('empty rect should not contain a larger rect', () => {
87
- expect(Rect2.empty.containsRect(new Rect2(-1, -1, 3, 3))).toBe(false);
88
- });
89
-
90
- it('should correctly contain rectangles', () => {
91
- const testRect = new Rect2(4, -10, 50, 100);
92
- expect(testRect.containsRect(new Rect2(4.1, 0, 1, 1))).toBe(true);
93
- expect(testRect.containsRect(new Rect2(48, 0, 1, 1))).toBe(true);
94
- expect(testRect.containsRect(new Rect2(48, -9, 1, 1))).toBe(true);
95
- expect(testRect.containsRect(new Rect2(48, -9, 1, 91))).toBe(true);
96
- });
97
- });
98
-
99
- it('intersecting rectangles should be identified as intersecting', () => {
100
- expect(new Rect2(-1, -1, 2, 2).intersects(Rect2.empty)).toBe(true);
101
- expect(new Rect2(-1, -1, 2, 2).intersects(new Rect2(0, 0, 1, 1))).toBe(true);
102
- expect(new Rect2(-1, -1, 2, 2).intersects(new Rect2(0, 0, 10, 10))).toBe(true);
103
- expect(new Rect2(-1, -1, 2, 2).intersects(new Rect2(3, 3, 10, 10))).toBe(false);
104
- expect(new Rect2(-1, -1, 2, 2).intersects(new Rect2(0.2, 0.1, 0, 0))).toBe(true);
105
- expect(new Rect2(-100, -1, 200, 2).intersects(new Rect2(-5, -5, 10, 30))).toBe(true);
106
- expect(new Rect2(-100, -1, 200, 2).intersects(new Rect2(-5, 50, 10, 30))).toBe(false);
107
- });
108
-
109
- it('intersecting rectangles should have their intersections correctly computed', () => {
110
- expect(new Rect2(-1, -1, 2, 2).intersection(Rect2.empty)).objEq(Rect2.empty);
111
- expect(new Rect2(-1, -1, 2, 2).intersection(new Rect2(0, 0, 3, 3))).objEq(
112
- new Rect2(0, 0, 1, 1)
113
- );
114
- expect(new Rect2(-2, 0, 1, 2).intersection(new Rect2(-3, 0, 2, 2))).objEq(
115
- new Rect2(-2, 0, 1, 2)
116
- );
117
- expect(new Rect2(-1, -1, 2, 2).intersection(new Rect2(3, 3, 10, 10))).toBe(null);
118
- });
119
-
120
- it('A transformed bounding box', () => {
121
- const rotationMat = Mat33.zRotation(Math.PI / 4);
122
- const rect = Rect2.unitSquare.translatedBy(Vec2.of(-0.5, -0.5));
123
- const transformedBBox = rect.transformedBoundingBox(rotationMat);
124
- expect(transformedBBox.containsPoint(Vec2.of(0.5, 0.5)));
125
- expect(transformedBBox.containsRect(rect)).toBe(true);
126
- });
127
-
128
- describe('should correctly expand to include a given point', () => {
129
- it('Growing an empty rectange to include (1, 0)', () => {
130
- const originalRect = Rect2.empty;
131
- const grownRect = originalRect.grownToPoint(Vec2.unitX);
132
- expect(grownRect).objEq(new Rect2(0, 0, 1, 0));
133
- });
134
-
135
- it('Growing the unit rectangle to include (-5, 1), with a margin', () => {
136
- const originalRect = Rect2.unitSquare;
137
- const grownRect = originalRect.grownToPoint(Vec2.of(-5, 1), 4);
138
- expect(grownRect).objEq(new Rect2(-9, -3, 10, 8));
139
- });
140
-
141
- it('Growing to include a point just above', () => {
142
- const original = Rect2.unitSquare;
143
- const grown = original.grownToPoint(Vec2.of(-1, -1));
144
- expect(grown).objEq(new Rect2(-1, -1, 2, 2));
145
- });
146
-
147
- it('Growing to include a point just below', () => {
148
- const original = Rect2.unitSquare;
149
- const grown = original.grownToPoint(Vec2.of(2, 2));
150
- expect(grown).objEq(new Rect2(0, 0, 2, 2));
151
- });
152
- });
153
-
154
- describe('divideIntoGrid', () => {
155
- it('division of unit square', () => {
156
- expect(Rect2.unitSquare.divideIntoGrid(2, 2)).toMatchObject(
157
- [
158
- new Rect2(0, 0, 0.5, 0.5), new Rect2(0.5, 0, 0.5, 0.5),
159
- new Rect2(0, 0.5, 0.5, 0.5), new Rect2(0.5, 0.5, 0.5, 0.5),
160
- ]
161
- );
162
- expect(Rect2.unitSquare.divideIntoGrid(0, 0).length).toBe(0);
163
- expect(Rect2.unitSquare.divideIntoGrid(100, 0).length).toBe(0);
164
- expect(Rect2.unitSquare.divideIntoGrid(4, 1)).toMatchObject(
165
- [
166
- new Rect2(0, 0, 0.25, 1), new Rect2(0.25, 0, 0.25, 1),
167
- new Rect2(0.5, 0, 0.25, 1), new Rect2(0.75, 0, 0.25, 1),
168
- ]
169
- );
170
- });
171
- it('division of translated square', () => {
172
- expect(new Rect2(3, -3, 4, 4).divideIntoGrid(2, 1)).toMatchObject(
173
- [
174
- new Rect2(3, -3, 2, 4), new Rect2(5, -3, 2, 4),
175
- ]
176
- );
177
- });
178
- it('division of empty square', () => {
179
- expect(Rect2.empty.divideIntoGrid(1000, 10000).length).toBe(1);
180
- });
181
-
182
- it('division of rectangle', () => {
183
- expect(new Rect2(0, 0, 2, 1).divideIntoGrid(2, 2)).toMatchObject(
184
- [
185
- new Rect2(0, 0, 1, 0.5), new Rect2(1, 0, 1, 0.5),
186
- new Rect2(0, 0.5, 1, 0.5), new Rect2(1, 0.5, 1, 0.5),
187
- ]
188
- );
189
- });
190
- });
191
-
192
- describe('should correctly return the closest point on the edge of a rectangle', () => {
193
- it('with the unit square', () => {
194
- const rect = Rect2.unitSquare;
195
- expect(rect.getClosestPointOnBoundaryTo(Vec2.zero)).objEq(Vec2.zero);
196
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(-1, -1))).objEq(Vec2.zero);
197
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(-1, 0.5))).objEq(Vec2.of(0, 0.5));
198
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(1, 0.5))).objEq(Vec2.of(1, 0.5));
199
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(0.6, 0.6))).objEq(Vec2.of(1, 0.6));
200
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(2, 0.5))).objEq(Vec2.of(1, 0.5));
201
- expect(rect.getClosestPointOnBoundaryTo(Vec2.of(0.6, 0.6))).objEq(Vec2.of(1, 0.6));
202
- });
203
- });
204
- });
package/src/math/Rect2.ts DELETED
@@ -1,315 +0,0 @@
1
- import LineSegment2 from './LineSegment2';
2
- import Mat33 from './Mat33';
3
- import { Point2, Vec2 } from './Vec2';
4
-
5
- /** An object that can be converted to a Rect2. */
6
- export interface RectTemplate {
7
- x: number;
8
- y: number;
9
- w?: number;
10
- h?: number;
11
- width?: number;
12
- height?: number;
13
- }
14
-
15
- // invariant: w ≥ 0, h ≥ 0.
16
- export default class Rect2 {
17
- // Derived state:
18
-
19
- // topLeft assumes up is -y
20
- public readonly topLeft: Point2;
21
- public readonly size: Vec2;
22
- public readonly bottomRight: Point2;
23
- public readonly center: Point2;
24
- public readonly area: number;
25
-
26
- public constructor(
27
- public readonly x: number,
28
- public readonly y: number,
29
- public readonly w: number,
30
- public readonly h: number
31
- ) {
32
- if (w < 0) {
33
- this.x += w;
34
- this.w = Math.abs(w);
35
- }
36
-
37
- if (h < 0) {
38
- this.y += h;
39
- this.h = Math.abs(h);
40
- }
41
-
42
- // Precompute/store vector forms.
43
- this.topLeft = Vec2.of(this.x, this.y);
44
- this.size = Vec2.of(this.w, this.h);
45
- this.bottomRight = this.topLeft.plus(this.size);
46
- this.center = this.topLeft.plus(this.size.times(0.5));
47
- this.area = this.w * this.h;
48
- }
49
-
50
- public translatedBy(vec: Vec2): Rect2 {
51
- return new Rect2(vec.x + this.x, vec.y + this.y, this.w, this.h);
52
- }
53
-
54
- // Returns a copy of this with the given size (but same top-left).
55
- public resizedTo(size: Vec2): Rect2 {
56
- return new Rect2(this.x, this.y, size.x, size.y);
57
- }
58
-
59
- public containsPoint(other: Point2): boolean {
60
- return this.x <= other.x && this.y <= other.y
61
- && this.x + this.w >= other.x && this.y + this.h >= other.y;
62
- }
63
-
64
- public containsRect(other: Rect2): boolean {
65
- return this.x <= other.x && this.y <= other.y
66
- && this.bottomRight.x >= other.bottomRight.x
67
- && this.bottomRight.y >= other.bottomRight.y;
68
- }
69
-
70
- public intersects(other: Rect2): boolean {
71
- // Project along x/y axes.
72
- const thisMinX = this.x;
73
- const thisMaxX = thisMinX + this.w;
74
- const otherMinX = other.x;
75
- const otherMaxX = other.x + other.w;
76
-
77
- if (thisMaxX < otherMinX || thisMinX > otherMaxX) {
78
- return false;
79
- }
80
-
81
-
82
- const thisMinY = this.y;
83
- const thisMaxY = thisMinY + this.h;
84
- const otherMinY = other.y;
85
- const otherMaxY = other.y + other.h;
86
-
87
- if (thisMaxY < otherMinY || thisMinY > otherMaxY) {
88
- return false;
89
- }
90
-
91
- return true;
92
- }
93
-
94
- // Returns the overlap of this and [other], or null, if no such
95
- // overlap exists
96
- public intersection(other: Rect2): Rect2|null {
97
- if (!this.intersects(other)) {
98
- return null;
99
- }
100
-
101
- const topLeft = this.topLeft.zip(other.topLeft, Math.max);
102
- const bottomRight = this.bottomRight.zip(other.bottomRight, Math.min);
103
-
104
- return Rect2.fromCorners(topLeft, bottomRight);
105
- }
106
-
107
- // Returns a new rectangle containing both [this] and [other].
108
- public union(other: Rect2): Rect2 {
109
- const topLeft = this.topLeft.zip(other.topLeft, Math.min);
110
- const bottomRight = this.bottomRight.zip(other.bottomRight, Math.max);
111
-
112
- return Rect2.fromCorners(
113
- topLeft,
114
- bottomRight
115
- );
116
- }
117
-
118
- // Returns a the subdivision of this into [columns] columns
119
- // and [rows] rows. For example,
120
- // Rect2.unitSquare.divideIntoGrid(2, 2)
121
- // -> [ Rect2(0, 0, 0.5, 0.5), Rect2(0.5, 0, 0.5, 0.5), Rect2(0, 0.5, 0.5, 0.5), Rect2(0.5, 0.5, 0.5, 0.5) ]
122
- // The rectangles are ordered in row-major order.
123
- public divideIntoGrid(columns: number, rows: number): Rect2[] {
124
- const result: Rect2[] = [];
125
- if (columns <= 0 || rows <= 0) {
126
- return result;
127
- }
128
-
129
- const eachRectWidth = this.w / columns;
130
- const eachRectHeight = this.h / rows;
131
-
132
- if (eachRectWidth === 0) {
133
- columns = 1;
134
- }
135
- if (eachRectHeight === 0) {
136
- rows = 1;
137
- }
138
-
139
- for (let j = 0; j < rows; j++) {
140
- for (let i = 0; i < columns; i++) {
141
- const x = eachRectWidth * i + this.x;
142
- const y = eachRectHeight * j + this.y;
143
- result.push(new Rect2(x, y, eachRectWidth, eachRectHeight));
144
- }
145
- }
146
- return result;
147
- }
148
-
149
- // Returns a rectangle containing this and [point].
150
- // [margin] is the minimum distance between the new point and the edge
151
- // of the resultant rectangle.
152
- public grownToPoint(point: Point2, margin: number = 0): Rect2 {
153
- const otherRect = new Rect2(
154
- point.x - margin, point.y - margin,
155
- margin * 2, margin * 2
156
- );
157
- return this.union(otherRect);
158
- }
159
-
160
- // Returns this grown by [margin] in both the x and y directions.
161
- public grownBy(margin: number): Rect2 {
162
- return new Rect2(
163
- this.x - margin, this.y - margin, this.w + margin * 2, this.h + margin * 2
164
- );
165
- }
166
-
167
- public getClosestPointOnBoundaryTo(target: Point2) {
168
- const closestEdgePoints = this.getEdges().map(edge => {
169
- return edge.closestPointTo(target);
170
- });
171
-
172
- let closest: Point2|null = null;
173
- let closestDist: number|null = null;
174
- for (const point of closestEdgePoints) {
175
- const dist = point.minus(target).length();
176
- if (closestDist === null || dist < closestDist) {
177
- closest = point;
178
- closestDist = dist;
179
- }
180
- }
181
- return closest!;
182
- }
183
-
184
- public get corners(): Point2[] {
185
- return [
186
- this.bottomRight,
187
- this.topRight,
188
- this.topLeft,
189
- this.bottomLeft,
190
- ];
191
- }
192
-
193
- public get maxDimension() {
194
- return Math.max(this.w, this.h);
195
- }
196
-
197
- public get topRight() {
198
- return this.bottomRight.plus(Vec2.of(0, -this.h));
199
- }
200
-
201
- public get bottomLeft() {
202
- return this.topLeft.plus(Vec2.of(0, this.h));
203
- }
204
-
205
- public get width() {
206
- return this.w;
207
- }
208
-
209
- public get height() {
210
- return this.h;
211
- }
212
-
213
- // Returns edges in the order
214
- // [ rightEdge, topEdge, leftEdge, bottomEdge ]
215
- public getEdges(): LineSegment2[] {
216
- const corners = this.corners;
217
- return [
218
- new LineSegment2(corners[0], corners[1]),
219
- new LineSegment2(corners[1], corners[2]),
220
- new LineSegment2(corners[2], corners[3]),
221
- new LineSegment2(corners[3], corners[0]),
222
- ];
223
- }
224
-
225
- // [affineTransform] is a transformation matrix that both scales and **translates**.
226
- // the bounding box of this' four corners after transformed by the given affine transformation.
227
- public transformedBoundingBox(affineTransform: Mat33): Rect2 {
228
- return Rect2.bboxOf(this.corners.map(corner => affineTransform.transformVec2(corner)));
229
- }
230
-
231
- /** @return true iff this is equal to [other] ± fuzz */
232
- public eq(other: Rect2, fuzz: number = 0): boolean {
233
- return this.topLeft.eq(other.topLeft, fuzz) && this.size.eq(other.size, fuzz);
234
- }
235
-
236
- public toString(): string {
237
- return `Rect(point(${this.x}, ${this.y}), size(${this.w}, ${this.h}))`;
238
- }
239
-
240
-
241
- public static fromCorners(corner1: Point2, corner2: Point2) {
242
- return new Rect2(
243
- Math.min(corner1.x, corner2.x),
244
- Math.min(corner1.y, corner2.y),
245
- Math.abs(corner1.x - corner2.x),
246
- Math.abs(corner1.y - corner2.y)
247
- );
248
- }
249
-
250
- // Returns a box that contains all points in [points] with at least [margin]
251
- // between each point and the edge of the box.
252
- public static bboxOf(points: Point2[], margin: number = 0) {
253
- let minX = 0;
254
- let minY = 0;
255
- let maxX = 0;
256
- let maxY = 0;
257
- let isFirst = true;
258
-
259
- for (const point of points) {
260
- if (isFirst) {
261
- minX = point.x;
262
- minY = point.y;
263
- maxX = point.x;
264
- maxY = point.y;
265
-
266
- isFirst = false;
267
- }
268
-
269
- minX = Math.min(minX, point.x);
270
- minY = Math.min(minY, point.y);
271
- maxX = Math.max(maxX, point.x);
272
- maxY = Math.max(maxY, point.y);
273
- }
274
-
275
- return Rect2.fromCorners(
276
- Vec2.of(minX - margin, minY - margin),
277
- Vec2.of(maxX + margin, maxY + margin)
278
- );
279
- }
280
-
281
- // @returns a rectangle that contains all of the given rectangles, the bounding box
282
- // of the given rectangles.
283
- public static union(...rects: Rect2[]): Rect2 {
284
- if (rects.length === 0) {
285
- return Rect2.empty;
286
- }
287
-
288
- const firstRect = rects[0];
289
- let minX: number = firstRect.topLeft.x;
290
- let minY: number = firstRect.topLeft.y;
291
- let maxX: number = firstRect.bottomRight.x;
292
- let maxY: number = firstRect.bottomRight.y;
293
-
294
- for (let i = 1; i < rects.length; i++) {
295
- const rect = rects[i];
296
- minX = Math.min(minX, rect.topLeft.x);
297
- minY = Math.min(minY, rect.topLeft.y);
298
- maxX = Math.max(maxX, rect.bottomRight.x);
299
- maxY = Math.max(maxY, rect.bottomRight.y);
300
- }
301
-
302
- return new Rect2(
303
- minX, minY, maxX - minX, maxY - minY,
304
- );
305
- }
306
-
307
- public static of(template: RectTemplate) {
308
- const width = template.width ?? template.w ?? 0;
309
- const height = template.height ?? template.h ?? 0;
310
- return new Rect2(template.x, template.y, width, height);
311
- }
312
-
313
- public static empty = new Rect2(0, 0, 0, 0);
314
- public static unitSquare = new Rect2(0, 0, 1, 1);
315
- }
@@ -1,29 +0,0 @@
1
- import Mat33 from './Mat33';
2
- import Vec3 from './Vec3';
3
-
4
- export default class Triangle {
5
- public constructor(
6
- public readonly vertex1: Vec3,
7
- public readonly vertex2: Vec3,
8
- public readonly vertex3: Vec3,
9
- ) {}
10
-
11
- public map(mapping: (vertex: Vec3)=>Vec3): Triangle {
12
- return new Triangle(
13
- mapping(this.vertex1),
14
- mapping(this.vertex2),
15
- mapping(this.vertex3),
16
- );
17
- }
18
-
19
- // Transform, treating this as composed of 2D points.
20
- public transformed2DBy(affineTransform: Mat33) {
21
- return this.map(affineTransform.transformVec2);
22
- }
23
-
24
- // Transforms this by a linear transform --- verticies are treated as
25
- // 3D points.
26
- public transformedBy(linearTransform: Mat33) {
27
- return this.map(linearTransform.transformVec3);
28
- }
29
- }
@@ -1,30 +0,0 @@
1
- import { Vec2 } from './Vec2';
2
- import Vec3 from './Vec3';
3
-
4
- describe('Vec2', () => {
5
- it('Magnitude', () => {
6
- expect(Vec2.of(3, 4).magnitude()).toBe(5);
7
- });
8
-
9
- it('Addition', () => {
10
- expect(Vec2.of(1, 2).plus(Vec2.of(3, 4))).objEq(Vec2.of(4, 6));
11
- });
12
-
13
- it('Multiplication', () => {
14
- expect(Vec2.of(1, -1).times(22)).objEq(Vec2.of(22, -22));
15
- });
16
-
17
- it('More complicated expressions', () => {
18
- expect((Vec2.of(1, 2).plus(Vec2.of(3, 4))).times(2)).objEq(Vec2.of(8, 12));
19
- });
20
-
21
- it('Angle', () => {
22
- expect(Vec2.of(-1, 1).angle()).toBeCloseTo(3 * Math.PI / 4);
23
- });
24
-
25
- it('Perpindicular', () => {
26
- const fuzz = 0.001;
27
- expect(Vec2.unitX.cross(Vec3.unitZ)).objEq(Vec2.unitY.times(-1), fuzz);
28
- expect(Vec2.unitX.orthog()).objEq(Vec2.unitY, fuzz);
29
- });
30
- });
package/src/math/Vec2.ts DELETED
@@ -1,18 +0,0 @@
1
- import Vec3 from './Vec3';
2
-
3
- export namespace Vec2 {
4
- export const of = (x: number, y: number): Vec2 => {
5
- return Vec3.of(x, y, 0);
6
- };
7
-
8
- export const ofXY = ({x, y}: { x: number, y: number }): Vec2 => {
9
- return Vec3.of(x, y, 0);
10
- };
11
-
12
- export const unitX = Vec2.of(1, 0);
13
- export const unitY = Vec2.of(0, 1);
14
- export const zero = Vec2.of(0, 0);
15
- }
16
-
17
- export type Point2 = Vec3;
18
- export type Vec2 = Vec3; // eslint-disable-line
@@ -1,44 +0,0 @@
1
-
2
- import Vec3 from './Vec3';
3
-
4
- describe('Vec3', () => {
5
- it('.xy should contain the x and y components', () => {
6
- const vec = Vec3.of(1, 2, 3);
7
- expect(vec.xy).toMatchObject({
8
- x: 1,
9
- y: 2,
10
- });
11
- });
12
-
13
- it('should be combinable with other vectors via .zip', () => {
14
- const vec1 = Vec3.unitX;
15
- const vec2 = Vec3.unitY;
16
- expect(vec1.zip(vec2, Math.min)).objEq(Vec3.zero);
17
- expect(vec1.zip(vec2, Math.max)).objEq(Vec3.of(1, 1, 0));
18
- });
19
-
20
- it('.cross should obey the right hand rule', () => {
21
- const vec1 = Vec3.unitX;
22
- const vec2 = Vec3.unitY;
23
- expect(vec1.cross(vec2)).objEq(Vec3.unitZ);
24
- expect(vec2.cross(vec1)).objEq(Vec3.unitZ.times(-1));
25
- });
26
-
27
- it('.orthog should return an orthogonal vector', () => {
28
- expect(Vec3.unitZ.orthog().dot(Vec3.unitZ)).toBe(0);
29
-
30
- // Should return some orthogonal vector, even if given the zero vector
31
- expect(Vec3.zero.orthog().dot(Vec3.zero)).toBe(0);
32
- });
33
-
34
- it('.minus should return the difference between two vectors', () => {
35
- expect(Vec3.of(1, 2, 3).minus(Vec3.of(4, 5, 6))).objEq(Vec3.of(1 - 4, 2 - 5, 3 - 6));
36
- });
37
-
38
- it('.orthog should return a unit vector', () => {
39
- expect(Vec3.zero.orthog().magnitude()).toBe(1);
40
- expect(Vec3.unitZ.orthog().magnitude()).toBe(1);
41
- expect(Vec3.unitX.orthog().magnitude()).toBe(1);
42
- expect(Vec3.unitY.orthog().magnitude()).toBe(1);
43
- });
44
- });