ProCraft for Android: An Android native painting app written in Rust
Rust
feat(ui): our own icons for the Transform toolbar
Josh65c0cd2be8ef
diff --git a/ATTRIBUTION.md b/ATTRIBUTION.mdindex 891a2a9..d9c669c 100644--- a/ATTRIBUTION.md+++ b/ATTRIBUTION.md@@ -13,7 +13,7 @@ them.| `apps/procraft-android/android/app/src/main/assets/fonts/Inter-{Regular,Medium,SemiBold,Bold}.ttf` | Inter 4.1 (interface font) | The Inter Project Authors | <https://github.com/rsms/inter/releases/tag/v4.1> (`Inter-4.1.zip`, `extras/ttf/`; `SOURCE.md` beside them) | SIL OFL 1.1, `Inter-OFL.txt` || `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` (the icons listed below as Phosphor) | Phosphor icons, @phosphor-icons/core 2.1.1, Fill weight | Phosphor Icons | <https://github.com/phosphor-icons/core>; each icon's paths moved and scaled into the frame it is shown in, at the size shown | MIT, [`LICENSE-phosphor.txt`](apps/procraft-android/android/app/src/main/assets/icons/LICENSE-phosphor.txt) || `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/LucideIcons.kt` (the same icons as Lucide draws them, kept beside them) | Lucide icons, lucide-static 1.63.0 | Lucide Icons and Contributors (those derived from Feather: Cole Bemis) | <https://github.com/lucide-icons/lucide>; each icon's paths moved and scaled into the frame it is shown in, at the size shown | ISC (Feather-derived also MIT), [`LICENSE-lucide.txt`](apps/procraft-android/android/app/src/main/assets/icons/LICENSE-lucide.txt) |-| `assets/icons/procraft/*.svg`, and in `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` the bar's icons (`Actions`, `Adjustments`, `Selection`, `Transform`, `Brush`, `Smudge`, `Erase`, `Layers`, `Undo`, `Redo`) and the Actions panel's tabs (`TabAdd`, `TabCanvas`, `TabShare`, `TabVideo`, `TabPrefs`, `TabHelp`) and the Selection toolbar's (`SelectCopyPaste`, `Automatic`, `Freehand`, `RectangleShape`, `EllipseShape`, `SelectAdd`, `SelectRemove`, `Invert`, `Feather`, `SaveLoad`, `ColorFill`, `ClearSelection`) | ProCraft's own interface icons | ProCraft contributors | Original work, drawn from the idea to [`docs/icons/STYLE_GUIDE.md`](docs/icons/STYLE_GUIDE.md) by `tools/icons/draw_icons.py`; placed by the measured slots in `assets/icons/slots.tsv` | MIT OR Apache-2.0 |+| `assets/icons/procraft/*.svg`, and in `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` the bar's icons (`Actions`, `Adjustments`, `Selection`, `Transform`, `Brush`, `Smudge`, `Erase`, `Layers`, `Undo`, `Redo`) and the Actions panel's tabs (`TabAdd`, `TabCanvas`, `TabShare`, `TabVideo`, `TabPrefs`, `TabHelp`) and the Selection toolbar's (`SelectCopyPaste`, `Automatic`, `Freehand`, `RectangleShape`, `EllipseShape`, `SelectAdd`, `SelectRemove`, `Invert`, `Feather`, `SaveLoad`, `ColorFill`, `ClearSelection`) and the Transform toolbar's (`Freeform`, `Uniform`, `Distort`, `Warp`, `Snapping`, `FlipHorizontal`, `FlipVertical`, `Rotate45`, `FitToCanvas`, `Interpolation`, `TransformReset`) | ProCraft's own interface icons | ProCraft contributors | Original work, drawn from the idea to [`docs/icons/STYLE_GUIDE.md`](docs/icons/STYLE_GUIDE.md) by `tools/icons/draw_icons.py`; placed by the measured slots in `assets/icons/slots.tsv` | MIT OR Apache-2.0 || `apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt` (every other icon) | Interface icons | ProCraft contributors | Original work, on a 24-unit grid | MIT OR Apache-2.0 || `apps/procraft-android/android/app/src/main/assets/environments/*.hdr` | 3D view light panoramas (11), halved to 512 x 256 and scaled by `tools/env/make_env.py` | Sergej Majboroda, Greg Zaal, Andreas Mischok, Rico Cilliers (per file in the folder's `README.md`) | <https://polyhaven.com> | CC0 1.0 || `assets/app-icon/procraft-{1024,512}.png`, `apps/procraft-android/android/app/src/main/res/drawable-*dpi/ic_launcher_{foreground,monochrome}.png`, `apps/procraft-android/android/app/src/main/res/drawable-nodpi/procraft_mark.png`, `apps/procraft-android/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml` | App icon: a paintbrush in a warm-to-cool blend on black | ProCraft contributors | Original work, drawn in code by `tools/app-icon/make_icon.py`; see [`assets/app-icon/README.md`](assets/app-icon/README.md) | MIT OR Apache-2.0 |@@ -25,7 +25,6 @@ them.Each with the Phosphor icon it is (Fill weight):- `FullScreen`: `arrows-out-simple`-- `TransformReset`: `arrow-counter-clockwise`- `StudioShape`: `shapes`- `GestureCopyPaste`: `clipboard`- `MenuNewBrush`: `paint-brush`@@ -79,16 +78,6 @@ Each with the Phosphor icon it is (Fill weight):- `CardCompact`: `rows`- `CardStack`: `cards`- `FolderFill`: `folder`-- `Freeform`: `arrows-out-line-horizontal`-- `Uniform`: `arrows-out`-- `Distort`: `bounding-box`-- `Warp`: `bezier-curve`-- `Snapping`: `magnet`-- `FlipHorizontal`: `flip-horizontal`-- `FlipVertical`: `flip-vertical`-- `Rotate45`: `arrow-clockwise`-- `FitToCanvas`: `corners-out`-- `Interpolation`: `frame-corners`- `AdjustHsb`: `sun-dim`- `AdjustBlur`: `drop`- `AdjustBalance`: `scales`diff --git a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.ktindex b35e02d..eec9cfd 100644--- a/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt+++ b/apps/procraft-android/android/app/src/main/java/io/github/artcraftandroid/procraft/ui/Icons.kt@@ -28,7 +28,7 @@ object PcIcons {val Layers by lazy { ours("layers", 44f, "M22.42 11.53L22 11.45L21.79 11.47L21.39 11.62L12.74 16.96L12.56 17.1L12.4 17.28L12.29 17.49L12.22 17.71L12.19 17.94L12.22 18.18L12.29 18.4L12.4 18.61L12.56 18.78L12.74 18.93L21.39 24.26L21.79 24.42L22 24.44L22.21 24.42L22.61 24.26L31.26 18.93L31.44 18.78L31.6 18.61L31.71 18.4L31.78 18.18L31.81 17.94L31.78 17.71L31.71 17.49L31.6 17.28L31.44 17.1L31.26 16.96ZM21.47 32.5L21.67 32.56L22.11 32.6L22.33 32.56L22.73 32.39L33.35 25.82L33.52 25.69L33.8 25.36L33.97 24.96L34 24.74L33.96 24.31L33.8 23.91L33.51 23.58L33.14 23.36L32.72 23.26L32.5 23.26L32.08 23.36L22 29.59L11.92 23.36L11.5 23.26L11.06 23.29L10.66 23.45L10.33 23.73L10.2 23.91L10.04 24.31L10 24.74L10.1 25.16L10.32 25.53L10.48 25.69Z") }val Undo by lazy { ours("undo", 50f, "M14.5 24.13L14.66 24.34L14.89 24.48L15.28 24.49L20.48 23.1L20.72 22.98L20.89 22.78L20.98 22.53L20.96 22.26L20.84 22.03L20.64 21.85L18.99 20.9L19.6 19.98L19.96 19.56L20.76 18.8L21.66 18.15L22.14 17.88L22.63 17.64L23.68 17.28L24.76 17.06L25.86 17L26.96 17.1L28.03 17.35L29.06 17.75L30.02 18.29L30.9 18.96L31.67 19.75L32.01 20.18L32.6 21.12L33.05 22.13L33.35 23.19L33.45 23.73L33.52 24.83L33.5 25.38L33.34 26.48L33.02 27.53L32.81 28.04L32.28 29.01L31.62 29.89L30.84 30.67L29.95 31.34L28.99 31.87L27.95 32.26L26.88 32.49L25.77 32.58L25.22 32.56L24.13 32.41L22.72 32.02L22.13 32.02L21.84 32.09L21.31 32.36L20.89 32.78L20.62 33.3L20.53 33.89L20.62 34.47L20.89 35L21.31 35.42L21.84 35.69L23.29 36.1L24.09 36.24L25.04 36.34L26.55 36.33L27.5 36.23L28.97 35.9L29.75 35.64L30.63 35.27L31.95 34.55L32.73 34.01L33.36 33.49L33.96 32.92L34.95 31.79L35.49 31L36.22 29.68L36.58 28.8L36.84 28.02L37.17 26.55L37.27 25.61L37.28 24.1L37.19 23.15L36.88 21.68L36.63 20.9L36.32 20.13L35.9 19.28L35.1 18L34.51 17.25L33.46 16.18L32.72 15.57L32.05 15.1L30.74 14.36L29.86 13.98L28.42 13.54L27.62 13.37L26.67 13.26L25.85 13.22L24.35 13.3L23.41 13.45L22.61 13.65L21.83 13.9L20.45 14.5L19.73 14.9L18.94 15.42L17.78 16.39L17.11 17.07L16.59 17.7L15.75 18.95L17.35 19.95L14.06 18.05L13.67 17.96L13.3 18.1L13.07 18.42L13.06 18.81Z") }val Redo by lazy { ours("redo", 50f, "M35.76 24.13L35.59 24.34L35.36 24.48L34.97 24.49L29.78 23.1L29.55 22.98L29.37 22.78L29.29 22.53L29.3 22.27L29.42 22.03L29.62 21.86L31.27 20.9L30.66 19.99L30.3 19.57L29.5 18.81L28.61 18.16L28.13 17.89L27.63 17.66L26.59 17.29L25.51 17.08L24.41 17.02L23.31 17.11L22.24 17.36L21.21 17.76L20.25 18.3L19.38 18.97L18.61 19.76L18.27 20.19L17.68 21.12L17.23 22.13L16.93 23.19L16.84 23.73L16.76 24.83L16.79 25.38L16.95 26.47L17.26 27.53L17.47 28.04L18 29L18.67 29.88L19.44 30.66L20.33 31.32L21.29 31.85L22.32 32.24L23.4 32.48L24.5 32.57L25.05 32.55L26.14 32.4L27.55 32.01L28.14 32.01L28.43 32.08L28.95 32.34L29.37 32.76L29.64 33.29L29.73 33.87L29.64 34.45L29.37 34.98L28.95 35.4L28.43 35.67L26.98 36.08L26.18 36.22L25.23 36.32L23.72 36.31L22.78 36.21L21.31 35.88L20.53 35.62L19.65 35.26L18.34 34.53L17.55 33.99L16.92 33.47L16.32 32.91L15.34 31.77L14.8 30.99L14.07 29.67L13.71 28.8L13.45 28.02L13.12 26.55L13.02 25.6L13.01 24.1L13.1 23.15L13.41 21.68L13.66 20.9L13.96 20.14L14.38 19.29L15.18 18.01L15.77 17.27L16.83 16.19L17.56 15.59L18.23 15.11L19.54 14.38L20.41 14L21.85 13.56L22.65 13.39L23.6 13.28L24.42 13.24L25.92 13.32L26.86 13.47L27.65 13.67L28.43 13.92L29.81 14.51L30.53 14.91L31.32 15.44L31.97 15.94L33.05 16.98L33.67 17.71L34.51 18.96L32.91 19.96L36.2 18.06L36.58 17.97L36.95 18.11L37.18 18.43L37.19 18.82Z") }- val TransformReset by lazy { phosphor("transformreset", 44f, "M 32,22 a 9.18,9.18 0 0,1-9.06,9.18 L 22.82,31.18 A 9.13,9.13 0 0,1 16.51,28.68 a 0.77,0.77 0 0,1 1.05,-1.11 A 7.65,7.65 0 1,0 17.4,16.58 a 0.29,0.29 0 0,1-0.02,0.02 L 16.37,17.53 l 1.63,1.63 A 0.77,0.77 0 0,1 17.46,20.47 L 12.87,20.47 a 0.77,0.77 0 0,1-0.77,-0.77 L 12.1,15.11 A 0.77,0.77 0 0,1 13.41,14.57 L 15.29,16.45 L 16.33,15.49 A 9.18,9.18 0 0,1 32,22 Z") }+ val TransformReset by lazy { ours("transformreset", 44f, "M24.48 21.75L24.35 21.25L24.23 21.01L24.09 20.8L23.72 20.43L23.27 20.17L23.03 20.09L22.77 20.04L22.25 20.04L21.75 20.17L21.52 20.29L21.3 20.43L20.93 20.8L20.68 21.25L20.59 21.49L20.54 21.75L20.54 22.27L20.59 22.52L20.79 23L21.11 23.41L21.3 23.59L21.75 23.85L22 23.93L22.25 23.98L22.77 23.98L23.03 23.93L23.51 23.73L23.72 23.59L24.09 23.22L24.35 22.77L24.43 22.52L24.48 22.27ZM13.34 21.56L13.6 21.75L13.93 21.76L18.19 20.62L18.39 20.52L18.53 20.36L18.6 20.15L18.59 19.93L18.49 19.74L18.33 19.59L16.97 18.81L17.48 18.06L17.77 17.71L18.43 17.08L19.16 16.56L19.56 16.33L19.97 16.14L20.82 15.84L21.71 15.66L22.62 15.61L23.52 15.69L24.4 15.9L25.25 16.22L26.04 16.67L26.76 17.22L27.39 17.87L27.67 18.22L28.15 18.99L28.52 19.82L28.77 20.69L28.85 21.14L28.91 22.04L28.89 22.5L28.76 23.39L28.5 24.26L28.33 24.68L27.89 25.48L27.35 26.2L26.7 26.84L25.98 27.39L25.18 27.82L24.34 28.14L23.45 28.34L22.55 28.41L22.09 28.39L21.2 28.27L20.03 27.95L19.55 27.95L19.31 28L18.88 28.22L18.54 28.57L18.31 29L18.24 29.48L18.31 29.96L18.54 30.39L18.88 30.74L19.31 30.96L20.5 31.3L21.17 31.42L21.95 31.5L23.18 31.49L23.96 31.4L25.17 31.13L25.81 30.92L26.53 30.62L27.62 30.03L28.26 29.58L28.78 29.15L29.27 28.69L30.08 27.76L30.53 27.11L31.13 26.03L31.43 25.3L31.64 24.66L31.91 23.46L31.99 22.68L32 21.44L31.92 20.66L31.67 19.45L31.46 18.81L31.21 18.18L30.87 17.48L30.21 16.43L29.72 15.82L28.86 14.93L28.25 14.43L27.7 14.05L26.63 13.44L25.91 13.13L24.72 12.76L24.06 12.63L23.29 12.53L22.61 12.5L21.38 12.57L20.6 12.7L19.95 12.86L19.31 13.06L18.17 13.55L17.58 13.88L16.93 14.31L15.98 15.1L15.43 15.67L15 16.18L14.31 17.21L15.62 18.03L12.92 16.47L12.6 16.4L12.3 16.51L12.11 16.77L12.1 17.1L13.24 21.37Z") }val SelectCopyPaste by lazy { ours("selectcopypaste", 44f, "M25.06 14.66L24.82 14.37L24.52 14.13L24.19 13.95L23.83 13.84L23.45 13.8L15.73 13.8L15.36 13.84L15 13.95L14.66 14.13L14.37 14.37L14.13 14.66L13.95 14.99L13.84 15.35L13.8 15.73L13.8 23.45L13.84 23.82L13.95 24.19L14.13 24.52L14.37 24.81L14.66 25.05L15 25.23L15.36 25.34L15.73 25.38L17.47 25.38L17.47 23.45L15.93 23.45L15.82 23.41L15.74 23.29L15.73 15.92L15.79 15.79L15.93 15.73L23.3 15.73L23.42 15.82L23.45 15.92L23.45 17.47L25.38 17.47L25.38 15.73L25.34 15.35L25.23 14.99ZM30.17 20.18L30.06 19.81L29.88 19.48L29.64 19.19L29.35 18.95L29.01 18.77L28.65 18.66L28.28 18.62L20.56 18.62L20.18 18.66L19.82 18.77L19.49 18.95L19.19 19.19L18.95 19.48L18.78 19.81L18.67 20.18L18.63 20.55L18.63 28.27L18.67 28.65L18.78 29.01L18.95 29.34L19.19 29.63L19.49 29.87L19.82 30.05L20.18 30.16L20.56 30.2L28.28 30.2L28.65 30.16L29.01 30.05L29.35 29.87L29.64 29.63L29.88 29.34L30.06 29.01L30.17 28.65L30.2 28.27L30.2 20.55Z") }/** A plus. */val PlusMedium by lazy { icon("plus-medium", Part("M20.5 8.6v22.8", 2.3f, false), Part("M9.1 20h22.8", 2.3f, false), viewport = 41f, viewportHeight = 40f) }@@ -538,16 +538,16 @@ object PcIcons {val Clip by lazy { outline("clip", 1.7f, "M8 4v9a4 4 0 0 0 4 4h6", "M15 14l3 3-3 3") }// the transform toolbar: its four ways (shown 30 across) and its buttons- val Freeform by lazy { phosphor("freeform", 44f, "M 20.26,21.99 a 0.58,0.58 0 0,1-0.58,0.58 L 16.78,22.57 l 0,1.74 a 0.58,0.58 0 0,1-0.99,0.41 l-2.32,-2.32 a 0.58,0.58 0 0,1 0,-0.82 l 2.32,-2.32 A 0.58,0.58 0 0,1 16.78,19.67 l 0,1.74 L 19.68,21.41 A 0.58,0.58 0 0,1 20.26,21.99 Z m 10.27,-0.41 l-2.32,-2.32 A 0.58,0.58 0 0,0 27.22,19.67 l 0,1.74 L 24.32,21.41 a 0.58,0.58 0 0,0 0,1.16 l 2.9,0 l 0,1.74 a 0.58,0.58 0 0,0 0.99,0.41 l 2.32,-2.32 A 0.58,0.58 0 0,0 30.53,21.58 Z M 22,15.03 a 0.58,0.58 0 0,0-0.58,0.58 L 21.42,28.37 a 0.58,0.58 0 0,0 1.16,0 L 22.58,15.61 A 0.58,0.58 0 0,0 22,15.03 Z") }- val Uniform by lazy { phosphor("uniform", 44f, "M 20.43,23.57 a 0.69,0.69 0 0,1 0,0.97 L 18.17,26.8 l 1.57,1.57 A 0.69,0.69 0 0,1 19.25,29.55 L 15.14,29.55 a 0.69,0.69 0 0,1-0.69,-0.69 L 14.45,24.75 a 0.69,0.69 0 0,1 1.17,-0.49 L 17.2,25.83 l 2.26,-2.26 A 0.69,0.69 0 0,1 20.43,23.57 Z M 18.17,17.2 l 1.57,-1.57 A 0.69,0.69 0 0,0 19.25,14.45 L 15.14,14.45 a 0.69,0.69 0 0,0-0.69,0.69 L 14.45,19.25 a 0.69,0.69 0 0,0 1.17,0.49 L 17.2,18.17 l 2.26,2.26 a 0.69,0.69 0 0,0 0.97,-0.97 Z M 28.86,14.45 L 24.75,14.45 a 0.69,0.69 0 0,0-0.49,1.17 L 25.83,17.2 L 23.57,19.46 a 0.69,0.69 0 0,0 0.97,0.97 L 26.8,18.17 l 1.57,1.57 A 0.69,0.69 0 0,0 29.55,19.25 L 29.55,15.14 A 0.69,0.69 0 0,0 28.86,14.45 Z m 0.26,9.66 a 0.69,0.69 0 0,0-0.75,0.15 L 26.8,25.83 l-2.26,-2.26 a 0.69,0.69 0 0,0-0.97,0.97 L 25.83,26.8 l-1.57,1.57 A 0.69,0.69 0 0,0 24.75,29.55 l 4.12,0 a 0.69,0.69 0 0,0 0.69,-0.69 L 29.55,24.75 A 0.69,0.69 0 0,0 29.13,24.11 Z") }- val Distort by lazy { phosphor("distort", 44f, "M 28.28,19.47 a 1.26,1.26 0 0,0 1.26,-1.26 L 29.53,15.71 a 1.26,1.26 0 0,0-1.26,-1.26 L 25.77,14.45 a 1.26,1.26 0 0,0-1.26,1.26 l 0,0.63 L 19.49,16.33 L 19.49,15.71 A 1.26,1.26 0 0,0 18.23,14.45 L 15.72,14.45 A 1.26,1.26 0 0,0 14.47,15.71 L 14.47,18.22 A 1.26,1.26 0 0,0 15.72,19.47 l 0.63,0 l 0,5.02 L 15.72,24.49 a 1.26,1.26 0 0,0-1.26,1.26 l 0,2.51 a 1.26,1.26 0 0,0 1.26,1.26 L 18.23,29.52 a 1.26,1.26 0 0,0 1.26,-1.26 l 0,-0.63 l 5.02,0 l 0,0.63 a 1.26,1.26 0 0,0 1.26,1.26 l 2.51,0 a 1.26,1.26 0 0,0 1.26,-1.26 L 29.53,25.75 a 1.26,1.26 0 0,0-1.26,-1.26 l-0.63,0 L 27.65,19.47 Z m-1.88,5.02 l-0.63,0 a 1.26,1.26 0 0,0-1.26,1.26 l 0,0.63 L 19.49,26.38 l 0,-0.63 a 1.26,1.26 0 0,0-1.26,-1.26 L 17.61,24.49 L 17.61,19.47 l 0.63,0 A 1.26,1.26 0 0,0 19.49,18.22 L 19.49,17.59 l 5.02,0 l 0,0.63 a 1.26,1.26 0 0,0 1.26,1.26 l 0.63,0 Z") }- val Warp by lazy { phosphor("warp", 44f, "M 29.75,23.37 A 8.03,8.03 0 0,0 26.41,18.66 l 4.92,0 a 0.67,0.67 0 0,0 0,-1.33 L 24.58,17.33 a 2.67,2.67 0 0,0-5.17,0 L 12.65,17.33 a 0.67,0.67 0 0,0 0,1.33 L 17.57,18.66 A 8.03,8.03 0 0,0 14.24,23.37 A 2.67,2.67 0 1,0 17.24,26.67 L 26.75,26.67 a 2.67,2.67 0 1,0 3,-3.3 Z M 14.65,27.34 a 1.33,1.33 0 1,1 1.33,-1.33 A 1.33,1.33 0 0,1 14.65,27.34 Z M 21.99,16.66 a 1.33,1.33 0 1,1-1.33,1.33 A 1.33,1.33 0 0,1 21.99,16.66 Z m 7.34,10.67 a 1.33,1.33 0 1,1 1.33,-1.33 A 1.33,1.33 0 0,1 29.33,27.34 Z") }- val Snapping by lazy { phosphor("snapping", 44f, "M 29.68,14.47 A 8.08,8.08 0 0,0 23.91,12.04 l-0.03,0 A 8.09,8.09 0 0,0 18.12,14.43 L 12.45,20.17 a 1.48,1.48 0 0,0 0.01,2.09 l 2.65,2.65 a 1.47,1.47 0 0,0 1.05,0.43 l 0.01,0 a 1.48,1.48 0 0,0 1.05,-0.45 L 22.84,19.13 a 1.49,1.49 0 0,1 2.07,-0.02 a 1.44,1.44 0 0,1 0.44,1.03 a 1.56,1.56 0 0,1-0.45,1.11 L 19.14,26.82 a 1.48,1.48 0 0,0-0.02,2.11 l 2.65,2.65 a 1.48,1.48 0 0,0 2.08,0.01 L 29.57,26 C 32.75,22.81 32.8,17.64 29.68,14.47 Z M 16.15,23.86 L 13.5,21.21 L 16.22,18.46 L 18.85,21.09 Z M 22.82,30.53 l-2.65,-2.65 l 2.79,-2.69 l 2.63,2.63 Z") }- val FlipHorizontal by lazy { phosphor("fliphorizontal", 50f, "M 23.77,17.75 L 23.77,32.52 a 1.48,1.48 0 0,1-1.48,1.48 L 16.38,34 a 1.48,1.48 0 0,1-1.36,-2.04 l 5.91,-14.76 l 0.01,-0.01 A 1.48,1.48 0 0,1 23.77,17.75 Z M 33.86,33.34 A 1.48,1.48 0 0,1 32.63,34 L 26.72,34 a 1.48,1.48 0 0,1-1.48,-1.48 L 25.24,17.75 a 1.48,1.48 0 0,1 2.84,-0.58 l 0.01,0.01 l 5.91,14.76 A 1.48,1.48 0 0,1 33.86,33.34 Z M 32.63,32.52 l-0.01,-0.01 L 26.72,17.75 L 26.72,32.52 Z") }- val FlipVertical by lazy { phosphor("flipvertical", 50f, "M 16.67,24.39 L 31.42,24.39 a 1.47,1.47 0 0,0 0.57,-2.83 l-0.01,-0.01 l-14.74,-5.9 A 1.47,1.47 0 0,0 15.2,17.01 l 0,5.9 A 1.47,1.47 0 0,0 16.67,24.39 Z m 0,-7.37 l 0.01,0.01 L 31.42,22.91 L 16.67,22.91 l 0,-5.9 Z M 32.87,27.04 a 1.46,1.46 0 0,1-0.87,1.65 l-0.01,0.01 l-14.74,5.9 A 1.47,1.47 0 0,1 15.2,33.24 L 15.2,27.34 a 1.47,1.47 0 0,1 1.47,-1.47 L 31.42,25.86 A 1.46,1.46 0 0,1 32.87,27.04 Z") }- val Rotate45 by lazy { phosphor("rotate45", 44f, "M 30.76,15.7 l 0,4.04 a 0.67,0.67 0 0,1-0.67,0.67 L 26.04,20.41 a 0.67,0.67 0 0,1-0.48,-1.15 l 1.43,-1.43 l-0.89,-0.81 l-0.02,-0.02 a 6.73,6.73 0 1,0-0.14,9.66 a 0.67,0.67 0 1,1 0.93,0.98 A 8.03,8.03 0 0,1 21.33,29.83 l-0.11,0 A 8.08,8.08 0 1,1 27.03,16.03 l 0.92,0.84 L 29.61,15.22 A 0.67,0.67 0 0,1 30.76,15.7 Z") }- val FitToCanvas by lazy { phosphor("fittocanvas", 44f, "M 19.12,28.31 A 0.68,0.68 0 0,1 18.64,29.47 L 15.24,29.47 a 0.68,0.68 0 0,1-0.68,-0.68 L 14.56,25.4 a 0.68,0.68 0 0,1 1.16,-0.48 Z M 18.64,14.53 L 15.24,14.53 a 0.68,0.68 0 0,0-0.68,0.68 L 14.56,18.6 a 0.68,0.68 0 0,0 1.16,0.48 l 3.4,-3.4 A 0.68,0.68 0 0,0 18.64,14.53 Z M 29.09,24.77 a 0.68,0.68 0 0,0-0.74,0.15 l-3.4,3.4 A 0.68,0.68 0 0,0 25.44,29.47 l 3.4,0 a 0.68,0.68 0 0,0 0.68,-0.68 L 29.51,25.4 A 0.68,0.68 0 0,0 29.09,24.77 Z M 28.83,14.53 L 25.44,14.53 a 0.68,0.68 0 0,0-0.48,1.16 l 3.4,3.4 A 0.68,0.68 0 0,0 29.51,18.6 L 29.51,15.2 A 0.68,0.68 0 0,0 28.83,14.53 Z") }- val Interpolation by lazy { phosphor("interpolation", 44f, "M 30.46,13.51 L 13.53,13.51 A 1.54,1.54 0 0,0 11.99,15.05 L 11.99,28.9 a 1.54,1.54 0 0,0 1.54,1.54 L 30.46,30.44 a 1.54,1.54 0 0,0 1.54,-1.54 L 32,15.05 A 1.54,1.54 0 0,0 30.46,13.51 Z M 18.15,28.13 L 15.07,28.13 a 0.77,0.77 0 0,1-0.77,-0.77 L 14.3,24.29 a 0.77,0.77 0 0,1 1.54,0 l 0,2.31 L 18.15,26.6 a 0.77,0.77 0 0,1 0,1.54 Z m 11.54,-8.47 a 0.77,0.77 0 0,1-1.54,0 L 28.15,17.36 L 25.84,17.36 a 0.77,0.77 0 0,1 0,-1.54 l 3.08,0 a 0.77,0.77 0 0,1 0.77,0.77 Z") }+ val Freeform by lazy { ours("freeform", 44f, "M30.57 16.6L30.42 16.31L30.22 16.06L29.97 15.86L29.68 15.7L29.37 15.61L29.05 15.58L14.95 15.58L14.63 15.61L14.32 15.7L14.03 15.86L13.78 16.06L13.58 16.31L13.43 16.6L13.33 16.91L13.3 17.23L13.3 26.75L13.33 27.07L13.43 27.38L13.58 27.67L13.78 27.92L14.03 28.12L14.32 28.28L14.63 28.37L14.95 28.4L29.05 28.4L29.37 28.37L29.68 28.28L29.97 28.12L30.22 27.92L30.42 27.67L30.57 27.38L30.67 27.07L30.7 26.75L30.7 17.23L30.67 16.91ZM29.05 26.6L29 26.7L28.87 26.75L15.13 26.75L15.03 26.72L14.96 26.64L14.95 26.57L14.95 17.41L14.98 17.31L15.03 17.26L15.13 17.23L28.87 17.23L28.97 17.26L29.04 17.34L29.05 17.41ZM17.21 21.83L17.17 21.96L17.18 22.09L17.29 22.24L19.54 23.97L19.72 24.04L19.91 23.99L20 23.9L20.05 23.78L20.06 22.91L23.94 22.91L23.94 23.72L23.97 23.85L24.09 23.99L24.21 24.04L24.34 24.03L24.46 23.97L26.71 22.24L26.79 22.15L26.83 22.02L26.82 21.89L26.71 21.74L24.46 20.01L24.28 19.94L24.09 19.99L24 20.08L23.95 20.2L23.94 21.07L20.06 21.07L20.06 20.26L20.03 20.13L19.96 20.03L19.85 19.96L19.66 19.95L19.54 20.01L17.29 21.74Z") }+ val Uniform by lazy { ours("uniform", 44f, "M29.44 15.38L29.3 15.12L29.11 14.89L28.88 14.7L28.62 14.56L28.33 14.48L28.04 14.45L15.96 14.45L15.67 14.48L15.38 14.56L15.12 14.7L14.89 14.89L14.7 15.12L14.56 15.38L14.48 15.67L14.45 15.96L14.45 28.04L14.48 28.33L14.56 28.62L14.7 28.88L14.89 29.11L15.12 29.3L15.38 29.44L15.67 29.52L15.96 29.55L28.04 29.55L28.33 29.52L28.62 29.44L28.88 29.3L29.11 29.11L29.3 28.88L29.44 28.62L29.52 28.33L29.55 28.04L29.55 15.96L29.52 15.67ZM28.04 27.9L27.99 27.99L27.87 28.04L16.13 28.04L16.01 27.99L15.96 27.87L15.96 16.13L16.01 16.01L16.13 15.96L27.87 15.96L27.99 16.01L28.04 16.13ZM25.8 18.4L25.7 18.25L25.6 18.2L25.48 18.19L22.9 18.53L22.74 18.6L22.65 18.75L22.65 18.87L22.7 18.98L23.26 19.55L19.55 23.26L19.03 22.73L18.93 22.67L18.81 22.65L18.7 22.67L18.57 22.79L18.53 22.9L18.19 25.48L18.2 25.6L18.25 25.7L18.35 25.78L18.52 25.81L21.1 25.47L21.26 25.4L21.35 25.25L21.35 25.13L21.3 25.02L20.74 24.45L24.45 20.74L24.97 21.27L25.07 21.33L25.19 21.35L25.3 21.33L25.43 21.21L25.47 21.1L25.81 18.52Z") }+ val Distort by lazy { ours("distort", 44f, "M18.71 15.8L18.52 15.32L18.24 14.95L17.87 14.67L17.45 14.5L17.22 14.45L16.76 14.45L16.31 14.57L16.1 14.67L15.91 14.8L15.59 15.13L15.35 15.53L15.23 15.97L15.22 16.21L15.23 16.44L15.35 16.88L15.59 17.28L15.74 17.46L15.91 17.61L16.11 17.74L15.34 24.13L14.95 24.29L14.76 24.42L14.43 24.75L14.2 25.15L14.08 25.59L14.08 26.06L14.13 26.28L14.2 26.5L14.43 26.9L14.58 27.08L14.95 27.36L15.38 27.54L15.84 27.6L16.29 27.54L16.72 27.36L17.09 27.08L17.32 26.78L25.27 28.16L25.36 28.43L25.46 28.63L25.74 29L26.11 29.28L26.54 29.46L27 29.52L27.23 29.5L27.67 29.39L28.07 29.15L28.25 29L28.53 28.63L28.71 28.21L28.77 27.75L28.71 27.29L28.53 26.86L28.25 26.5L28.07 26.35L27.88 26.22L28.64 19.83L29.03 19.66L29.4 19.38L29.68 19.01L29.86 18.59L29.92 18.13L29.9 17.9L29.79 17.45L29.55 17.05L29.4 16.88L29.03 16.6L28.61 16.42L28.38 16.37L27.92 16.37L27.47 16.49L27.07 16.72L26.9 16.88L26.67 17.17ZM17.67 17.84L18.07 17.61L18.24 17.46L18.47 17.16L26.43 18.54L26.51 18.81L26.75 19.21L27.07 19.53L27.27 19.66L26.5 26.05L26.11 26.22L25.92 26.35L25.74 26.5L25.51 26.79L17.56 25.42L17.47 25.15L17.24 24.75L16.91 24.42L16.72 24.29L17.48 17.9Z") }+ val Warp by lazy { ours("warp", 44f, "M29.23 15.19L29.03 14.95L28.79 14.76L28.52 14.61L28.22 14.52L27.92 14.49L16.07 14.49L15.76 14.52L15.46 14.61L15.19 14.76L14.95 14.95L14.75 15.19L14.61 15.47L14.52 15.76L14.49 16.07L14.49 27.92L14.52 28.23L14.61 28.52L14.75 28.8L14.95 29.04L15.19 29.23L15.46 29.38L15.76 29.47L16.07 29.5L27.92 29.5L28.22 29.47L28.52 29.38L28.79 29.23L29.03 29.04L29.23 28.8L29.37 28.52L29.46 28.23L29.5 27.92L29.5 16.07L29.46 15.76L29.37 15.47ZM17.14 19.83L18.78 19.43L19.9 19.23L20.01 19.86L20.13 20.93L20.16 21.46L20.16 22.5L19.08 22.66L18.48 22.78L17.33 23.05L15.91 23.44L15.91 20.18ZM20.03 23.95L19.7 25.75L19.42 26.84L19.07 28.08L16.07 28.08L15.95 28.03L15.91 27.92L15.91 24.92L17.69 24.42L19.32 24.06ZM20.55 28.08L20.94 26.64L21.21 25.51L21.32 24.91L21.49 23.82L22.52 23.82L23.06 23.85L24.12 23.97L24.76 24.08L24.66 24.67L24.44 25.75L24.16 26.84L23.81 28.08ZM21.59 22.01L21.55 20.81L21.49 20.22L21.33 19.09L21.99 19.07L23.06 19.11L23.59 19.16L24.66 19.32L24.82 20.4L24.87 20.93L24.91 22L24.89 22.66L23.76 22.49L23.18 22.44L22.56 22.4L21.59 22.4ZM26.16 19.65L28.07 20.18L28.07 23.44L26.3 22.96L26.33 22.01L26.32 21.39L26.29 20.81ZM28.07 18.7L25.87 18.12L25.68 17.34L25.29 15.91L27.92 15.91L28.03 15.96L28.07 16.07ZM24.32 17.83L23.18 17.7L22.59 17.66L21.98 17.65L21.02 17.68L20.55 15.91L23.81 15.91L24.16 17.15ZM19.07 15.91L19.6 17.84L19.06 17.92L17.9 18.17L15.91 18.7L15.91 16.07L15.95 15.96L16.07 15.91ZM28.06 27.98L28 28.05L27.92 28.08L25.29 28.08L25.82 26.08L26.06 24.93L26.15 24.39L28.07 24.92Z") }+ val Snapping by lazy { ours("snapping", 44f, "M13.32 23.47L13.38 24.32L13.51 25.16L13.73 25.98L14.03 26.78L14.3 27.36L14.85 28.27L15.36 28.95L15.94 29.57L16.41 30L17.09 30.52L18.01 31.07L18.78 31.42L19.59 31.7L20.42 31.89L21.05 31.99L21.9 32.04L22.96 31.99L23.8 31.85L24.63 31.63L25.43 31.34L26.19 30.96L26.92 30.52L27.6 30L28.07 29.57L28.65 28.95L29.16 28.27L29.61 27.55L29.98 26.78L30.28 25.98L30.5 25.16L30.66 24.1L30.69 23.36L30.69 17.57L26.29 17.57L26.29 23.3L26.27 23.78L26.1 24.6L25.78 25.38L25.57 25.74L25.03 26.39L24.72 26.67L24.02 27.13L23.25 27.46L22.42 27.62L22 27.64L21.17 27.56L20.37 27.31L19.99 27.13L19.29 26.67L18.7 26.07L18.23 25.38L17.91 24.6L17.74 23.78L17.72 17.57L13.32 17.57ZM30.69 12.01L26.29 12.01L26.29 16.18L30.69 16.18ZM17.72 12.01L13.32 12.01L13.32 16.18L17.72 16.18Z") }+ val FlipHorizontal by lazy { ours("fliphorizontal", 50f, "M23.1 17.66L23.06 17.55L22.94 17.36L22.75 17.23L22.53 17.17L22.3 17.21L22.2 17.26L22.1 17.33L21.97 17.52L14.93 32.25L14.87 32.48L14.91 32.72L15.04 32.92L15.23 33.06L15.47 33.11L22.51 33.11L22.74 33.06L22.84 33L23.01 32.84L23.06 32.74L23.11 32.51ZM26.91 17.33L26.81 17.26L26.6 17.18L26.48 17.17L26.26 17.23L26.07 17.36L26 17.45L25.91 17.66L25.9 17.77L25.9 32.51L25.95 32.74L26 32.84L26.17 33L26.27 33.06L26.5 33.11L33.54 33.11L33.78 33.06L33.97 32.92L34.1 32.72L34.14 32.48L34.08 32.25L27.04 17.52ZM27.9 31.11L27.9 23.94L31.32 31.11Z") }+ val FlipVertical by lazy { ours("flipvertical", 50f, "M31.86 23.65L31.97 23.62L32.17 23.49L32.31 23.29L32.35 23.18L32.36 23.06L32.32 22.82L32.2 22.62L32.01 22.48L16.63 15.13L16.39 15.07L16.14 15.11L15.93 15.24L15.79 15.45L15.74 15.69L15.74 23.04L15.78 23.28L15.84 23.39L16.02 23.56L16.12 23.62L16.36 23.67ZM32.2 27.63L32.32 27.43L32.35 27.31L32.36 27.19L32.31 26.96L32.17 26.76L32.08 26.69L31.97 26.63L31.74 26.58L16.36 26.58L16.12 26.63L16.02 26.69L15.84 26.86L15.78 26.97L15.74 27.21L15.74 34.56L15.79 34.8L15.93 35.01L16.14 35.14L16.39 35.18L16.63 35.12L32.01 27.77ZM17.82 28.67L25.3 28.67L17.82 32.24Z") }+ val Rotate45 by lazy { ours("rotate45", 44f, "M15.97 20.69L16.48 19.92L17.1 19.24L17.79 18.63L18.3 18.29L18.83 17.99L19.68 17.63L20.57 17.39L21.48 17.26L22.4 17.26L23.01 17.33L23.61 17.45L24.2 17.62L24.77 17.85L25.32 18.12L25.84 18.44L26.33 18.81L26.79 19.22L27.4 19.9L26.52 20.59L26.41 20.72L26.36 20.87L26.37 21.03L26.43 21.18L26.55 21.29L26.71 21.35L30.01 21.92L30.19 21.91L30.41 21.77L30.51 21.53L30.76 18.1L30.66 17.88L30.54 17.77L30.38 17.73L30.14 17.77L28.3 19.2L29.18 18.48L28.39 17.61L27.75 17.03L26.8 16.35L26.08 15.95L25.34 15.62L24.91 15.46L24.13 15.23L23.33 15.08L22.57 14.99L21.75 14.97L20.94 15.03L20.49 15.09L19.74 15.24L18.96 15.47L18.53 15.63L17.83 15.95L17.12 16.34L16.74 16.59L16.12 17.05L15.52 17.6L14.96 18.19L14.67 18.55L14.2 19.22L13.8 19.92L13.45 20.66L13.26 21.23L13.26 21.58L13.37 21.92L13.58 22.21L13.71 22.33L14.03 22.49L14.21 22.53L14.56 22.53L14.9 22.42L15.05 22.33L15.3 22.07L15.4 21.92L15.69 21.23ZM26.2 24.58L26.27 24.45L26.33 24.16L26.27 23.87L26.1 23.63L22.49 20.01L22.24 19.84L21.95 19.79L21.66 19.84L21.41 20.01L17.8 23.63L17.63 23.87L17.57 24.16L17.63 24.45L17.8 24.7L21.41 28.31L21.66 28.48L21.95 28.54L22.24 28.48L22.49 28.31Z") }+ val FitToCanvas by lazy { ours("fittocanvas", 44f, "M14.71 14.54L14.6 14.63L14.56 14.73L14.55 14.83L15.26 18.55L15.33 18.69L15.47 18.76L15.57 18.76L15.66 18.72L16.59 17.8L19.26 20.45L19.5 20.56L19.84 20.59L20.17 20.49L20.37 20.34L20.53 20.13L20.63 19.8L20.59 19.46L20.48 19.23L17.84 16.56L18.76 15.63L18.8 15.53L18.8 15.43L18.72 15.3L18.59 15.22L14.86 14.52ZM29.5 14.68L29.44 14.59L29.36 14.54L29.21 14.52L25.48 15.22L25.35 15.3L25.27 15.43L25.27 15.53L25.31 15.63L26.23 16.56L23.59 19.23L23.48 19.46L23.44 19.8L23.54 20.13L23.7 20.34L23.9 20.49L24.23 20.59L24.57 20.56L24.81 20.45L27.48 17.8L28.41 18.72L28.5 18.76L28.6 18.76L28.74 18.69L28.81 18.55L29.52 14.83ZM20.43 24.84L20.56 24.62L20.63 24.37L20.61 24.11L20.53 23.87L20.37 23.66L20.17 23.51L19.92 23.42L19.67 23.41L19.34 23.51L19.13 23.66L16.59 26.2L15.66 25.28L15.52 25.23L15.37 25.28L15.3 25.35L15.26 25.45L14.55 29.17L14.56 29.27L14.6 29.37L14.71 29.46L14.86 29.48L18.59 28.78L18.68 28.74L18.76 28.66L18.8 28.57L18.8 28.47L18.76 28.37L17.84 27.44ZM24.88 23.6L24.65 23.47L24.4 23.41L24.15 23.42L23.9 23.51L23.7 23.66L23.54 23.87L23.46 24.11L23.44 24.37L23.54 24.7L23.7 24.9L26.23 27.44L25.31 28.37L25.27 28.52L25.31 28.66L25.39 28.74L25.48 28.78L29.21 29.48L29.31 29.48L29.4 29.44L29.5 29.32L29.52 29.17L28.81 25.45L28.77 25.35L28.7 25.28L28.6 25.24L28.5 25.24L28.41 25.28L27.48 26.2Z") }+ val Interpolation by lazy { ours("interpolation", 44f, "M20.83 12.39L20.77 12.28L20.59 12.09L20.35 11.99L20.22 11.98L12.67 11.98L12.41 12.03L12.2 12.18L12.05 12.39L12 12.65L12 20.2L12.05 20.45L12.2 20.67L12.41 20.81L12.67 20.86L20.22 20.86L20.47 20.81L20.69 20.67L20.83 20.45L20.88 20.2L20.88 12.65ZM31.9 15.56L31.65 14.72L31.24 13.95L30.69 13.28L30.02 12.73L29.25 12.32L28.41 12.07L27.55 11.98L26.68 12.07L25.85 12.32L25.08 12.73L24.41 13.28L23.85 13.95L23.44 14.72L23.19 15.56L23.11 16.42L23.19 17.29L23.44 18.12L23.85 18.89L24.41 19.56L25.08 20.12L25.85 20.53L26.68 20.78L27.55 20.86L28.41 20.78L29.25 20.53L30.02 20.12L30.69 19.56L31.24 18.89L31.65 18.12L31.9 17.29L31.99 16.42ZM20.83 23.5L20.77 23.38L20.59 23.2L20.35 23.1L20.22 23.09L12.67 23.09L12.41 23.14L12.2 23.28L12.05 23.5L12 23.75L12 31.3L12.05 31.56L12.2 31.77L12.41 31.92L12.67 31.97L20.22 31.97L20.47 31.92L20.69 31.77L20.83 31.56L20.88 31.3L20.88 23.75ZM31.94 23.5L31.88 23.38L31.69 23.2L31.58 23.14L31.32 23.09L23.77 23.09L23.52 23.14L23.3 23.28L23.16 23.5L23.11 23.75L23.11 31.3L23.16 31.56L23.3 31.77L23.52 31.92L23.77 31.97L31.32 31.97L31.58 31.92L31.79 31.77L31.94 31.56L31.99 31.3L31.99 23.75Z") }val AdvancedMesh by lazy { icon("advanced-mesh", Part(MESH_CELLS, 0.6f, true)) }/** The advanced mesh icon's cells: four across, three down, with thin gaps. */diff --git a/assets/icons/procraft/distort.svg b/assets/icons/procraft/distort.svgnew file mode 100644index 0000000..81b8799--- /dev/null+++ b/assets/icons/procraft/distort.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft distort icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M7.24 3.97L6.99 3.35L6.63 2.87L6.15 2.51L5.6 2.28L5.3 2.22L4.7 2.22L4.12 2.38L3.85 2.51L3.6 2.68L3.18 3.1L2.88 3.62L2.72 4.2L2.7 4.5L2.72 4.8L2.88 5.38L3.18 5.9L3.37 6.13L3.6 6.32L3.85 6.49L2.86 14.79L2.35 15.01L2.1 15.18L1.68 15.6L1.38 16.12L1.22 16.7L1.22 17.3L1.28 17.6L1.38 17.88L1.68 18.4L1.87 18.63L2.35 18.99L2.9 19.22L3.5 19.3L4.1 19.22L4.65 18.99L5.13 18.63L5.43 18.25L15.76 20.03L15.88 20.38L16.01 20.65L16.37 21.13L16.85 21.49L17.4 21.72L18 21.8L18.3 21.78L18.88 21.62L19.4 21.32L19.63 21.13L19.99 20.65L20.22 20.1L20.3 19.5L20.22 18.9L19.99 18.35L19.63 17.87L19.4 17.68L19.15 17.51L20.14 9.21L20.65 8.99L21.13 8.63L21.49 8.15L21.72 7.6L21.8 7L21.78 6.7L21.62 6.12L21.32 5.6L21.13 5.37L20.65 5.01L20.1 4.78L19.8 4.72L19.2 4.72L18.62 4.88L18.1 5.18L17.87 5.37L17.57 5.75ZM5.88 6.62L6.4 6.32L6.63 6.13L6.93 5.75L17.26 7.53L17.38 7.88L17.68 8.4L18.1 8.82L18.35 8.99L17.36 17.29L16.85 17.51L16.6 17.68L16.37 17.87L16.07 18.25L5.74 16.47L5.62 16.12L5.32 15.6L4.9 15.18L4.65 15.01L5.64 6.71Z"/>+</svg>diff --git a/assets/icons/procraft/fittocanvas.svg b/assets/icons/procraft/fittocanvas.svgnew file mode 100644index 0000000..75a3009--- /dev/null+++ b/assets/icons/procraft/fittocanvas.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft fittocanvas icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M3.66 3.5L3.53 3.61L3.48 3.72L3.48 3.83L4.28 8.07L4.37 8.23L4.52 8.31L4.64 8.31L4.75 8.27L5.8 7.22L8.84 10.23L9.11 10.36L9.5 10.4L9.87 10.28L10.11 10.11L10.28 9.87L10.4 9.5L10.36 9.11L10.23 8.84L7.22 5.8L8.27 4.75L8.31 4.64L8.31 4.52L8.23 4.37L8.07 4.28L3.83 3.48ZM20.5 3.66L20.44 3.56L20.34 3.5L20.17 3.48L15.93 4.28L15.77 4.37L15.69 4.52L15.69 4.64L15.73 4.75L16.78 5.8L13.77 8.84L13.64 9.11L13.6 9.5L13.72 9.87L13.89 10.11L14.13 10.28L14.5 10.4L14.89 10.36L15.16 10.23L18.2 7.22L19.25 8.27L19.36 8.31L19.48 8.31L19.63 8.23L19.72 8.07L20.52 3.83ZM10.17 15.23L10.32 14.98L10.4 14.7L10.38 14.4L10.28 14.13L10.11 13.89L9.87 13.72L9.6 13.62L9.3 13.6L8.93 13.72L8.69 13.89L5.8 16.78L4.75 15.73L4.58 15.68L4.41 15.73L4.33 15.82L4.28 15.93L3.48 20.17L3.48 20.28L3.53 20.39L3.66 20.5L3.83 20.52L8.07 19.72L8.18 19.67L8.27 19.59L8.31 19.48L8.31 19.36L8.27 19.25L7.22 18.2ZM15.23 13.83L14.98 13.68L14.7 13.6L14.4 13.62L14.13 13.72L13.89 13.89L13.72 14.13L13.62 14.4L13.6 14.7L13.72 15.07L13.89 15.31L16.78 18.2L15.73 19.25L15.68 19.42L15.73 19.59L15.82 19.67L15.93 19.72L20.17 20.52L20.28 20.52L20.39 20.47L20.5 20.34L20.52 20.17L19.72 15.93L19.67 15.82L19.59 15.73L19.48 15.69L19.36 15.69L19.25 15.73L18.2 16.78Z"/>+</svg>diff --git a/assets/icons/procraft/fliphorizontal.svg b/assets/icons/procraft/fliphorizontal.svgnew file mode 100644index 0000000..1fd99e1--- /dev/null+++ b/assets/icons/procraft/fliphorizontal.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft fliphorizontal icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M10.59 5.53L10.56 5.42L10.43 5.23L10.24 5.1L10.02 5.05L9.79 5.08L9.69 5.14L9.6 5.2L9.46 5.39L2.41 20.14L2.35 20.37L2.39 20.61L2.52 20.82L2.72 20.95L2.95 21L10 21L10.23 20.95L10.33 20.9L10.5 20.73L10.55 20.63L10.6 20.4ZM14.4 5.2L14.31 5.14L14.1 5.06L13.98 5.05L13.76 5.1L13.57 5.23L13.5 5.32L13.41 5.53L13.4 5.65L13.4 20.4L13.45 20.63L13.5 20.73L13.67 20.9L13.77 20.95L14 21L21.05 21L21.28 20.95L21.48 20.82L21.61 20.61L21.65 20.37L21.59 20.14L14.54 5.39ZM15.4 19L15.4 11.83L18.83 19Z"/>+</svg>diff --git a/assets/icons/procraft/flipvertical.svg b/assets/icons/procraft/flipvertical.svgnew file mode 100644index 0000000..87600a8--- /dev/null+++ b/assets/icons/procraft/flipvertical.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft flipvertical icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M18.47 10.59L18.58 10.56L18.77 10.43L18.9 10.24L18.94 10.13L18.95 10.02L18.92 9.79L18.8 9.6L18.61 9.46L3.86 2.41L3.63 2.35L3.39 2.39L3.18 2.52L3.05 2.72L3 2.95L3 10L3.05 10.23L3.1 10.33L3.27 10.5L3.37 10.55L3.6 10.6ZM18.8 14.4L18.92 14.21L18.94 14.1L18.95 13.98L18.9 13.76L18.77 13.57L18.68 13.5L18.58 13.44L18.35 13.4L3.6 13.4L3.37 13.45L3.27 13.5L3.1 13.67L3.05 13.77L3 14L3 21.05L3.05 21.28L3.18 21.48L3.39 21.61L3.63 21.65L3.86 21.59L18.61 14.54ZM5 15.4L12.17 15.4L5 18.83Z"/>+</svg>diff --git a/assets/icons/procraft/freeform.svg b/assets/icons/procraft/freeform.svgnew file mode 100644index 0000000..52db99c--- /dev/null+++ b/assets/icons/procraft/freeform.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft freeform icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M21.36 6.11L21.2 5.8L20.97 5.53L20.7 5.3L20.39 5.14L20.05 5.03L19.7 5L4.3 5L3.95 5.03L3.61 5.14L3.3 5.3L3.03 5.53L2.8 5.8L2.64 6.11L2.53 6.45L2.5 6.8L2.5 17.2L2.53 17.55L2.64 17.89L2.8 18.2L3.03 18.47L3.3 18.7L3.61 18.86L3.95 18.97L4.3 19L19.7 19L20.05 18.97L20.39 18.86L20.7 18.7L20.97 18.47L21.2 18.2L21.36 17.89L21.47 17.55L21.5 17.2L21.5 6.8L21.47 6.45ZM19.7 17.04L19.64 17.14L19.5 17.2L4.5 17.2L4.39 17.17L4.32 17.08L4.3 17L4.3 7L4.33 6.89L4.39 6.83L4.5 6.8L19.5 6.8L19.61 6.83L19.68 6.92L19.7 7ZM6.77 11.83L6.73 11.96L6.74 12.11L6.86 12.28L9.32 14.17L9.51 14.24L9.72 14.19L9.82 14.09L9.87 13.96L9.88 13L14.12 13L14.12 13.89L14.15 14.03L14.28 14.19L14.42 14.24L14.56 14.23L14.68 14.17L17.14 12.28L17.23 12.17L17.27 12.04L17.26 11.89L17.14 11.72L14.68 9.83L14.49 9.76L14.28 9.81L14.18 9.91L14.13 10.04L14.12 11L9.88 11L9.88 10.11L9.85 9.97L9.77 9.86L9.65 9.78L9.44 9.77L9.32 9.83L6.86 11.72Z"/>+</svg>diff --git a/assets/icons/procraft/interpolation.svg b/assets/icons/procraft/interpolation.svgnew file mode 100644index 0000000..4484541--- /dev/null+++ b/assets/icons/procraft/interpolation.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft interpolation icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M10.95 3.37L10.9 3.27L10.73 3.1L10.52 3.01L10.4 3L3.6 3L3.37 3.05L3.18 3.18L3.05 3.37L3 3.6L3 10.4L3.05 10.63L3.18 10.82L3.37 10.95L3.6 11L10.4 11L10.63 10.95L10.82 10.82L10.95 10.63L11 10.4L11 3.6ZM20.92 6.22L20.7 5.47L20.33 4.78L19.83 4.17L19.22 3.67L18.53 3.3L17.78 3.08L17 3L16.22 3.08L15.47 3.3L14.78 3.67L14.17 4.17L13.67 4.78L13.3 5.47L13.08 6.22L13 7L13.08 7.78L13.3 8.53L13.67 9.22L14.17 9.83L14.78 10.33L15.47 10.7L16.22 10.92L17 11L17.78 10.92L18.53 10.7L19.22 10.33L19.83 9.83L20.33 9.22L20.7 8.53L20.92 7.78L21 7ZM10.95 13.37L10.9 13.27L10.73 13.1L10.52 13.01L10.4 13L3.6 13L3.37 13.05L3.18 13.18L3.05 13.37L3 13.6L3 20.4L3.05 20.63L3.18 20.82L3.37 20.95L3.6 21L10.4 21L10.63 20.95L10.82 20.82L10.95 20.63L11 20.4L11 13.6ZM20.95 13.37L20.9 13.27L20.73 13.1L20.63 13.05L20.4 13L13.6 13L13.37 13.05L13.18 13.18L13.05 13.37L13 13.6L13 20.4L13.05 20.63L13.18 20.82L13.37 20.95L13.6 21L20.4 21L20.63 20.95L20.82 20.82L20.95 20.63L21 20.4L21 13.6Z"/>+</svg>diff --git a/assets/icons/procraft/rotate45.svg b/assets/icons/procraft/rotate45.svgnew file mode 100644index 0000000..c1a3d4d--- /dev/null+++ b/assets/icons/procraft/rotate45.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft rotate45 icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M4.69 10.33L5.23 9.53L5.88 8.8L6.61 8.17L7.15 7.8L7.71 7.48L8.6 7.1L9.54 6.85L10.5 6.72L11.47 6.72L12.12 6.79L12.75 6.91L13.37 7.1L13.97 7.33L14.55 7.62L15.1 7.96L15.62 8.35L16.11 8.78L16.75 9.51L15.82 10.23L15.71 10.36L15.65 10.53L15.66 10.7L15.73 10.85L15.86 10.97L16.02 11.03L19.51 11.63L19.7 11.62L19.93 11.48L20.04 11.22L20.3 7.6L20.2 7.37L20.06 7.26L19.9 7.21L19.65 7.25L17.7 8.77L18.63 8.01L17.8 7.09L17.12 6.48L16.11 5.76L15.36 5.34L14.58 4.98L14.13 4.82L13.3 4.58L12.46 4.41L11.65 4.32L10.79 4.3L9.94 4.36L9.46 4.42L8.67 4.59L7.84 4.83L7.39 5L6.65 5.33L5.9 5.75L5.5 6.01L4.85 6.5L4.21 7.07L3.62 7.7L3.32 8.08L2.82 8.78L2.39 9.53L2.03 10.31L1.83 10.91L1.83 11.28L1.94 11.64L2.16 11.94L2.31 12.06L2.64 12.23L2.82 12.28L3.2 12.28L3.56 12.16L3.72 12.06L3.98 11.8L4.08 11.64L4.39 10.91ZM15.48 14.44L15.56 14.31L15.62 14L15.56 13.69L15.38 13.43L11.57 9.62L11.31 9.44L11 9.38L10.69 9.44L10.43 9.62L6.62 13.43L6.44 13.69L6.38 14L6.44 14.31L6.62 14.57L10.43 18.38L10.69 18.56L11 18.62L11.31 18.56L11.57 18.38Z"/>+</svg>diff --git a/assets/icons/procraft/snapping.svg b/assets/icons/procraft/snapping.svgnew file mode 100644index 0000000..bb92dde--- /dev/null+++ b/assets/icons/procraft/snapping.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft snapping icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M4.5 12.89L4.55 13.63L4.66 14.35L4.85 15.07L5.11 15.76L5.34 16.25L5.82 17.04L6.26 17.63L6.76 18.17L7.17 18.54L7.76 18.98L8.55 19.46L9.22 19.76L9.91 20L10.63 20.17L11.17 20.25L11.91 20.3L12.83 20.25L13.55 20.14L14.27 19.95L14.96 19.69L15.62 19.37L16.24 18.98L16.83 18.54L17.24 18.17L17.74 17.63L18.18 17.04L18.57 16.42L18.89 15.76L19.15 15.07L19.34 14.35L19.47 13.44L19.5 12.8L19.5 7.8L15.7 7.8L15.7 12.75L15.68 13.16L15.54 13.87L15.26 14.54L15.07 14.85L14.61 15.41L14.35 15.66L13.74 16.06L13.07 16.34L12.36 16.48L12 16.5L11.28 16.43L10.58 16.22L10.26 16.06L9.65 15.66L9.14 15.15L8.74 14.54L8.46 13.87L8.32 13.16L8.3 7.8L4.5 7.8ZM19.5 3L15.7 3L15.7 6.6L19.5 6.6ZM8.3 3L4.5 3L4.5 6.6L8.3 6.6Z"/>+</svg>diff --git a/assets/icons/procraft/transformreset.svg b/assets/icons/procraft/transformreset.svgnew file mode 100644index 0000000..99ae206--- /dev/null+++ b/assets/icons/procraft/transformreset.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft transformreset icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M14.59 12.79L14.48 12.39L14.39 12.2L14.27 12.03L13.97 11.73L13.61 11.52L13.41 11.45L13.21 11.41L12.79 11.41L12.39 11.52L12.2 11.61L12.03 11.73L11.73 12.03L11.52 12.39L11.45 12.59L11.41 12.79L11.41 13.21L11.45 13.41L11.61 13.8L11.87 14.13L12.03 14.27L12.39 14.48L12.59 14.55L12.79 14.59L13.21 14.59L13.41 14.55L13.8 14.39L13.97 14.27L14.27 13.97L14.48 13.61L14.55 13.41L14.59 13.21ZM5.62 12.64L5.83 12.79L6.09 12.8L9.53 11.88L9.68 11.8L9.8 11.67L9.86 11.51L9.84 11.33L9.77 11.17L9.63 11.06L8.54 10.43L8.95 9.82L9.18 9.54L9.71 9.04L10.3 8.61L10.62 8.43L10.95 8.28L11.64 8.03L12.36 7.89L13.08 7.85L13.81 7.92L14.52 8.08L15.2 8.35L15.84 8.7L16.42 9.15L16.93 9.67L17.15 9.96L17.54 10.57L17.84 11.24L18.04 11.94L18.1 12.3L18.15 13.03L18.13 13.39L18.03 14.11L17.82 14.81L17.68 15.15L17.33 15.79L16.89 16.37L16.37 16.89L15.79 17.33L15.15 17.68L14.47 17.94L13.76 18.09L13.03 18.15L12.66 18.14L11.94 18.04L11.01 17.78L10.62 17.78L10.42 17.83L10.08 18L9.8 18.28L9.62 18.63L9.56 19.01L9.62 19.4L9.8 19.75L10.08 20.03L10.42 20.2L11.38 20.48L11.92 20.57L12.54 20.64L13.54 20.63L14.17 20.56L15.14 20.34L15.65 20.17L16.24 19.93L17.11 19.45L17.63 19.09L18.05 18.75L18.44 18.38L19.09 17.63L19.45 17.11L19.93 16.24L20.17 15.65L20.34 15.14L20.56 14.17L20.63 13.54L20.64 12.54L20.57 11.92L20.37 10.94L20.2 10.43L20 9.92L19.73 9.36L19.19 8.51L18.8 8.02L18.11 7.31L17.62 6.9L17.18 6.59L16.31 6.1L15.73 5.85L14.78 5.56L14.25 5.45L13.62 5.38L13.08 5.35L12.09 5.41L11.46 5.51L10.94 5.63L10.42 5.8L9.51 6.19L9.03 6.46L8.51 6.81L7.74 7.44L7.3 7.9L6.96 8.31L6.4 9.14L7.46 9.8L5.28 8.54L5.03 8.48L4.78 8.58L4.63 8.79L4.62 9.05L5.54 12.48Z"/>+</svg>diff --git a/assets/icons/procraft/uniform.svg b/assets/icons/procraft/uniform.svgnew file mode 100644index 0000000..1983f97--- /dev/null+++ b/assets/icons/procraft/uniform.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft uniform icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M20.86 4.11L20.7 3.8L20.47 3.53L20.2 3.3L19.89 3.14L19.55 3.03L19.2 3L4.8 3L4.45 3.03L4.11 3.14L3.8 3.3L3.53 3.53L3.3 3.8L3.14 4.11L3.03 4.45L3 4.8L3 19.2L3.03 19.55L3.14 19.89L3.3 20.2L3.53 20.47L3.8 20.7L4.11 20.86L4.45 20.97L4.8 21L19.2 21L19.55 20.97L19.89 20.86L20.2 20.7L20.47 20.47L20.7 20.2L20.86 19.89L20.97 19.55L21 19.2L21 4.8L20.97 4.45ZM19.2 19.04L19.14 19.14L19 19.2L5 19.2L4.86 19.14L4.8 19L4.8 5L4.86 4.86L5 4.8L19 4.8L19.14 4.86L19.2 5ZM16.53 7.71L16.42 7.53L16.29 7.47L16.15 7.46L13.08 7.86L12.89 7.95L12.78 8.13L12.78 8.27L12.83 8.4L13.5 9.08L9.08 13.5L8.45 12.87L8.34 12.8L8.2 12.77L8.06 12.8L7.91 12.94L7.86 13.08L7.46 16.15L7.47 16.29L7.53 16.42L7.64 16.5L7.85 16.54L10.92 16.14L11.11 16.05L11.22 15.87L11.22 15.73L11.17 15.6L10.5 14.92L14.92 10.5L15.55 11.13L15.66 11.2L15.8 11.23L15.94 11.2L16.09 11.06L16.14 10.92L16.54 7.85Z"/>+</svg>diff --git a/assets/icons/procraft/warp.svg b/assets/icons/procraft/warp.svgnew file mode 100644index 0000000..05ef8d3--- /dev/null+++ b/assets/icons/procraft/warp.svg@@ -0,0 +1,4 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">+ <!-- ProCraft warp icon: original, drawn by tools/icons/draw_icons.py. MIT OR Apache-2.0. -->+ <path fill="currentColor" fill-rule="evenodd" d="M21.16 3.39L20.91 3.09L20.61 2.84L20.27 2.65L19.89 2.54L19.5 2.5L4.5 2.5L4.11 2.54L3.73 2.65L3.39 2.84L3.09 3.09L2.84 3.39L2.65 3.73L2.54 4.11L2.5 4.5L2.5 19.5L2.54 19.89L2.65 20.27L2.84 20.61L3.09 20.91L3.39 21.16L3.73 21.35L4.11 21.46L4.5 21.5L19.5 21.5L19.89 21.46L20.27 21.35L20.61 21.16L20.91 20.91L21.16 20.61L21.35 20.27L21.46 19.89L21.5 19.5L21.5 4.5L21.46 4.11L21.35 3.73ZM5.86 9.26L7.93 8.75L9.36 8.5L9.5 9.3L9.65 10.65L9.69 11.33L9.69 12.64L8.31 12.84L7.55 12.99L6.1 13.33L4.3 13.83L4.3 9.7ZM9.52 14.48L9.1 16.75L8.74 18.14L8.3 19.7L4.5 19.7L4.36 19.64L4.3 19.5L4.3 15.7L6.56 15.07L8.62 14.62ZM10.17 19.7L10.67 17.88L11.01 16.45L11.16 15.69L11.36 14.31L12.67 14.31L13.35 14.35L14.7 14.5L15.5 14.64L15.38 15.38L15.1 16.75L14.74 18.14L14.3 19.7ZM11.5 12.02L11.44 10.5L11.37 9.76L11.16 8.32L12 8.3L13.35 8.35L14.02 8.42L15.38 8.62L15.58 9.98L15.65 10.65L15.7 12L15.68 12.84L14.24 12.63L13.5 12.56L12.73 12.51L11.49 12.51ZM17.28 9.03L19.7 9.7L19.7 13.83L17.46 13.22L17.5 12.02L17.48 11.24L17.44 10.5ZM19.7 7.83L16.91 7.09L16.67 6.1L16.17 4.3L19.5 4.3L19.64 4.36L19.7 4.5ZM14.95 6.72L13.5 6.56L12.76 6.52L11.98 6.5L10.78 6.54L10.17 4.3L14.3 4.3L14.74 5.86ZM8.3 4.3L8.97 6.73L8.29 6.85L6.83 7.15L4.3 7.83L4.3 4.5L4.36 4.36L4.5 4.3ZM19.68 19.58L19.61 19.67L19.5 19.7L16.17 19.7L16.85 17.17L17.15 15.71L17.27 15.03L19.7 15.7Z"/>+</svg>diff --git a/docs/icons/STYLE_GUIDE.md b/docs/icons/STYLE_GUIDE.mdindex d9a4218..fcd4140 100644--- a/docs/icons/STYLE_GUIDE.md+++ b/docs/icons/STYLE_GUIDE.md@@ -50,3 +50,44 @@ by one.| Erase | an eraser block with a band, on a line || Layers | two stacked sheets, the top one solid || Undo / Redo | a curved arrow turning back / forward |++## The Actions panel's tabs++| Tab | Idea |+|---|---|+| Add | a plus |+| Canvas | a canvas's frame with a stroke across it |+| Share | a tray with an arrow rising out of it |+| Video | a camera, its body and its lens |+| Preferences | a switch, turned on |+| Help | a question mark in a ring |++## The Selection toolbar++| Control | Idea |+|---|---|+| Automatic | the Adjustments wand |+| Freehand | a lasso's loop with its tail |+| Rectangle / Ellipse | a dashed rectangle / ellipse |+| Add / Subtract | a plus / minus cut out of a disc |+| Invert | a disc, one half solid, the other its outline |+| Copy and paste | two sheets, the front one solid |+| Feather | a feather, its vane split by the shaft |+| Save and load | a tray with an arrow coming down into it |+| Colour fill | a tipped bucket and a drop falling from it |+| Clear | a cross |++## The Transform toolbar++| Control | Idea |+|---|---|+| Freeform | a frame stretched across: a two-headed arrow inside |+| Uniform | a square frame scaled corner to corner |+| Distort | a skewed four-sided frame with a handle at each corner |+| Warp | a frame whose inner lines bend |+| Snapping | an upright magnet, its poles cut off |+| Flip horizontal / vertical | a solid triangle facing its hollow mirror image |+| Rotate | a tilted square with an arrow turning over it |+| Fit to canvas | four arrows pointing out to the corners |+| Interpolation | three square pixels and a round one |+| Reset | a turning arrow back, round a dot |diff --git a/tools/icons/draw_icons.py b/tools/icons/draw_icons.pyindex 8d48eb7..df3ba85 100644--- a/tools/icons/draw_icons.py+++ b/tools/icons/draw_icons.py@@ -279,6 +279,104 @@ def cross():return unary_union([capsule((5.5, 5.5), (18.5, 18.5), 1.3), capsule((18.5, 5.5), (5.5, 18.5), 1.3)])+def double_arrow(a, b, r=1.1, head=3.2):+ """A line from a to b with an arrowhead at each end."""+ dx, dy = b[0] - a[0], b[1] - a[1]+ n = math.hypot(dx, dy)+ ux, uy = dx / n, dy / n+ px, py = -uy, ux+ parts = [capsule((a[0] + ux * head * 0.8, a[1] + uy * head * 0.8), (b[0] - ux * head * 0.8, b[1] - uy * head * 0.8), r)]+ for (tx, ty), s_ in ((a, 1), (b, -1)):+ bx, by = tx + s_ * ux * head * 1.3, ty + s_ * uy * head * 1.3+ parts.append(soft(Polygon([(tx, ty), (bx + px * head, by + py * head), (bx - px * head, by - py * head)]), 0.35))+ return unary_union(parts)+++def freeform():+ """Freeform: a frame stretched across."""+ return unary_union([frame(2.5, 5, 21.5, 19, 1.8, 1.8), double_arrow((6.5, 12), (17.5, 12), 1.0, 2.6)])+++def uniform():+ """Uniform: a square frame scaled corner to corner."""+ return unary_union([frame(3, 3, 21, 21, 1.8, 1.8), double_arrow((7.4, 16.6), (16.6, 7.4), 1.0, 2.6)])+++def distort():+ """Distort: a skewed four-sided frame with a handle at each corner."""+ corners = [(5.0, 4.5), (19.5, 7.0), (18.0, 19.5), (3.5, 17.0)]+ edges = LineString(corners + [corners[0]]).buffer(0.9)+ return unary_union([edges] + [Point(c).buffer(2.3, quad_segs=12) for c in corners])+++def warp():+ """Warp: a frame whose inner lines bend."""+ bends = []+ for x in (9.0, 15.0):+ bends.append(LineString([(x + 1.6 * math.sin(t * math.pi), 3.5 + 17 * t) for t in [i / 24 for i in range(25)]]).buffer(0.9))+ for y in (9.0, 15.0):+ bends.append(LineString([(3.5 + 17 * t, y - 1.6 * math.sin(t * math.pi)) for t in [i / 24 for i in range(25)]]).buffer(0.9))+ return unary_union([frame(2.5, 2.5, 21.5, 21.5, 1.8, 2.0)] + bends)+++def magnet():+ """Snapping: a magnet, its poles cut off."""+ arc = [(12 - 5.6 * math.cos(math.pi * t), 12.8 + 5.6 * math.sin(math.pi * t)) for t in [i / 32 for i in range(33)]]+ body = LineString([(6.4, 3.0)] + arc + [(17.6, 3.0)]).buffer(1.9, cap_style='flat', join_style='round')+ return body.difference(box(0, 6.6, 24, 7.8))+++def flip(vertical):+ """Flip: a solid triangle facing its hollow mirror image."""+ left = soft(Polygon([(10.6, 3.0), (10.6, 21.0), (2.0, 21.0)]), 0.6)+ right = soft(Polygon([(13.4, 3.0), (13.4, 21.0), (22.0, 21.0)]), 0.6)+ right = right.difference(right.buffer(-2.0, join_style='mitre'))+ shape = unary_union([left, right])+ return rotate(shape, 90, origin=(12, 12)) if vertical else shape+++def arc_arrow(cx, cy, r, a0, a1, w=1.2, head=3.4):+ """An arc from angle a0 to a1 (degrees, clockwise on screen) with an arrowhead at a1."""+ angles = [math.radians(a0 + (a1 - a0) * i / 48) for i in range(49)]+ arc = LineString([(cx + r * math.cos(a), cy + r * math.sin(a)) for a in angles]).buffer(w, cap_style='flat')+ arc = arc.union(Point(cx + r * math.cos(angles[0]), cy + r * math.sin(angles[0])).buffer(w, quad_segs=10))+ a = angles[-1]+ ex, ey = cx + r * math.cos(a), cy + r * math.sin(a)+ ahead, out = (-math.sin(a), math.cos(a)), (math.cos(a), math.sin(a))+ tip = (ex + ahead[0] * head * 1.1, ey + ahead[1] * head * 1.1)+ return unary_union([arc, soft(Polygon([tip, (ex + out[0] * head, ey + out[1] * head), (ex - out[0] * head, ey - out[1] * head)]), 0.45)])+++def rotate_step():+ """Rotate: a tilted square with an arrow turning over it."""+ square = rotate(soft(box(7.5, 10.5, 14.5, 17.5), 0.8), 45, origin=(11, 14))+ return unary_union([square, arc_arrow(11, 14, 8.5, -160, -38)])+++def fit_to_canvas():+ """Fit to canvas: four arrows pointing out to the corners."""+ arrows = []+ for dx, dy in ((1, 1), (-1, 1), (1, -1), (-1, -1)):+ a = (12 + dx * 2.6, 12 + dy * 2.6)+ b = (12 + dx * 8.6, 12 + dy * 8.6)+ ux, uy = dx * SQ2, dy * SQ2+ px, py = -uy, ux+ head = soft(Polygon([b, (b[0] - ux * 4.4 + px * 3.0, b[1] - uy * 4.4 + py * 3.0), (b[0] - ux * 4.4 - px * 3.0, b[1] - uy * 4.4 - py * 3.0)]), 0.3)+ arrows += [capsule(a, (b[0] - ux * 2.5, b[1] - uy * 2.5), 1.0), head]+ return unary_union(arrows)+++def interpolation():+ """Interpolation: square pixels turning into a smooth round one."""+ cells = [soft(box(3, 3, 11, 11), 0.6), soft(box(3, 13, 11, 21), 0.6), soft(box(13, 13, 21, 21), 0.6)]+ return unary_union(cells + [Point(17, 7).buffer(4.0, quad_segs=16)])+++def reset_transform():+ """Reset: a turning arrow back, round a dot."""+ return unary_union([turning_arrow(False), Point(13.0, 13.0).buffer(1.6, quad_segs=12)])++DRAWINGS = {'actions': wrench, 'adjustments': wand, 'selection': selection, 'transform': arrow,'brush': paintbrush, 'smudge': fingertip, 'erase': eraser, 'layers': layers,@@ -289,6 +387,9 @@ DRAWINGS = {'selectadd': lambda: sign_in_disc(False), 'selectremove': lambda: sign_in_disc(True), 'invert': invert,'selectcopypaste': copy_paste, 'feather': feather, 'saveload': save_load, 'colorfill': paint_bucket,'clearselection': cross,+ 'freeform': freeform, 'uniform': uniform, 'distort': distort, 'warp': warp, 'snapping': magnet,+ 'fliphorizontal': lambda: flip(False), 'flipvertical': lambda: flip(True), 'rotate45': rotate_step,+ 'fittocanvas': fit_to_canvas, 'interpolation': interpolation, 'transformreset': reset_transform,}