Colour vision modes: Protan, Deutan and Tritan in Preferences › Graphics (#778) (#1007)

Colour vision modes (Protan, Deutan, Tritan) in Preferences > Graphics, with palettes, shader and icon colours adapted per mode, translations and tests.

assets/icons/ui/source/glyphs.rs

@@ -100,7 +100,7 @@ pub(crate) fn brand_mark(p: &egui::Painter, c: Pos2) {
     let face = |col: Color32, pts: &[(f32, f32)]| {
         p.add(egui::Shape::convex_polygon(m(pts), col, Stroke::NONE));
     };
-    let (light, mid, dark) = (Color32::from_rgb(96, 158, 236), Color32::from_rgb(58, 136, 238), Color32::from_rgb(55, 108, 197));
+    let [light, mid, dark, edge_col] = crate::theme::Tokens::get().logo;
     face(light, &[(3.5, 105.9), (177.0, 5.8), (263.4, 55.6), (263.8, 156.0), (177.0, 406.4)]);
     face(light, &[(177.0, 206.1), (263.8, 156.0), (350.5, 206.2), (350.5, 306.3), (177.0, 406.4)]);
     face(mid, &[(3.5, 105.9), (177.0, 206.1), (177.0, 406.4)]);
@@ -111,7 +111,7 @@ pub(crate) fn brand_mark(p: &egui::Painter, c: Pos2) {
     face(dark, &[(177.0, 206.1), (177.0, 406.4), (350.5, 306.3)]);
     face(dark, &[(263.8, 55.9), (263.8, 156.0), (177.1, 105.9)]);
     // White edge lines.
-    let edge = Stroke::new(10.0 * s, Color32::WHITE);
+    let edge = Stroke::new(10.0 * s, edge_col);
     let line = |pts: &[(f32, f32)]| {
         p.add(egui::Shape::line(m(pts), edge));
     };

assets/icons/ui/source/icons.rs

@@ -3,13 +3,6 @@
 
 use egui::{Color32, Mesh, Painter, Pos2, Rect, Shape, Stroke, pos2, vec2};
 
-/// Surface sheets: a sheet, a second sheet beside it, a lighter sheet (an opening, a blend or
-/// round strip), and the iso lines and comb teeth drawn on sheets.
-const SHEET: Color32 = Color32::from_rgb(170, 200, 240);
-const SHEET_2: Color32 = Color32::from_rgb(150, 185, 235);
-const SHEET_LIGHT: Color32 = Color32::from_rgb(214, 229, 248);
-const SHEET_LINE: Color32 = Color32::from_rgb(127, 166, 218);
-
 /// `n + 1` points along the cubic Bézier curve with control points `c`.
 fn bezier(c: [(f32, f32); 4], n: usize) -> Vec<(f32, f32)> {
     (0..=n)
@@ -127,6 +120,12 @@ fn line_type_dot_radius(r: Rect) -> f32 {
 
 /// Paint the icon `name` into `r`. `accent` highlights the "action" part.
 pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, accent: Color32) {
+    paint_with(p, r, name, ink, fill, accent, &crate::theme::Tokens::get().icons);
+}
+
+/// [`paint`] with the colours an icon draws of its own given (`theme::IconColors`).
+pub(crate) fn paint_with(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, accent: Color32, ic: &crate::theme::IconColors) {
+    let ic = *ic;
     let pen = Pen { p, r, ink, fill, accent, w: (r.width() / 24.0 * 1.4).max(1.0) };
     let a = pen.accent;
     match name {
@@ -164,7 +163,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         "sphere" => {
             pen.circle(12.0, 12.0, 8.5, pen.fill, ink);
             pen.arc(12.0, 12.0, 8.5, 3.3, 6.1, ink.gamma_multiply(0.5));
-            p.circle_filled(pen.at(9.0, 8.5), 2.0 * pen.s(), Color32::from_white_alpha(160));
+            p.circle_filled(pen.at(9.0, 8.5), 2.0 * pen.s(), ic.glint);
         }
         "torus" => {
             let pts: Vec<Pos2> =
@@ -172,7 +171,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             p.add(Shape::convex_polygon(pts, pen.fill, Stroke::new(pen.w, ink)));
             let pts: Vec<Pos2> =
                 (0..40).map(|i| i as f32 / 40.0 * std::f32::consts::TAU).map(|t| pen.at(12.0 + 3.5 * t.cos(), 11.0 + 1.8 * t.sin())).collect();
-            p.add(Shape::convex_polygon(pts, Color32::WHITE, Stroke::new(pen.w, ink)));
+            p.add(Shape::convex_polygon(pts, ic.highlight, Stroke::new(pen.w, ink)));
         }
         "fillet" => {
             pen.poly(&[(4.0, 20.0), (4.0, 4.0), (10.0, 4.0), (10.0, 14.0), (20.0, 14.0), (20.0, 20.0)], pen.fill, Color32::TRANSPARENT);
@@ -214,7 +213,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             pen.poly(&[(3.0, 8.0), (21.0, 8.0), (21.0, 20.0), (3.0, 20.0)], pen.fill, ink);
             let pts: Vec<Pos2> =
                 (0..32).map(|i| i as f32 / 32.0 * std::f32::consts::TAU).map(|t| pen.at(12.0 + 5.0 * t.cos(), 8.0 + 2.0 * t.sin())).collect();
-            p.add(Shape::convex_polygon(pts, Color32::WHITE, Stroke::new(pen.w, a)));
+            p.add(Shape::convex_polygon(pts, ic.highlight, Stroke::new(pen.w, a)));
             pen.line(&[(7.0, 8.0), (7.0, 16.0)], a);
             pen.line(&[(17.0, 8.0), (17.0, 16.0)], a);
         }
@@ -231,7 +230,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         }
         "shell" => {
             pen.iso_box(3.0, 9.0, 10.0, 8.0, 9.0);
-            pen.poly(&[(6.0, 9.0), (13.0, 5.5), (18.0, 8.0), (11.0, 11.5)], Color32::WHITE, a);
+            pen.poly(&[(6.0, 9.0), (13.0, 5.5), (18.0, 8.0), (11.0, 11.5)], ic.highlight, a);
         }
         "draft" => {
             pen.poly(&[(4.0, 20.0), (20.0, 20.0), (17.0, 5.0), (7.0, 5.0)], pen.fill, ink);
@@ -478,7 +477,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         "c_coincident" => {
             pen.line(&[(3.0, 18.0), (12.0, 12.0)], ink);
             pen.line(&[(12.0, 12.0), (21.0, 16.0)], ink);
-            pen.circle(12.0, 12.0, 2.6, Color32::WHITE, a);
+            pen.circle(12.0, 12.0, 2.6, ic.highlight, a);
         }
         "c_tangent" => {
             pen.circle(12.0, 14.0, 6.0, Color32::TRANSPARENT, ink);
@@ -525,7 +524,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             pen.arrow((x1 + (x0 - x1) * 0.15, 9.0), (x1, 9.0), ink);
         }
         "new" => {
-            pen.poly(&[(6.0, 3.0), (15.0, 3.0), (19.0, 7.0), (19.0, 21.0), (6.0, 21.0)], Color32::WHITE, ink);
+            pen.poly(&[(6.0, 3.0), (15.0, 3.0), (19.0, 7.0), (19.0, 21.0), (6.0, 21.0)], ic.highlight, ink);
             pen.line(&[(15.0, 3.0), (15.0, 7.0), (19.0, 7.0)], ink);
         }
         "open" => {
@@ -533,7 +532,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         }
         "save" => {
             pen.poly(&[(4.0, 4.0), (17.0, 4.0), (20.0, 7.0), (20.0, 20.0), (4.0, 20.0)], pen.fill, ink);
-            pen.poly(&[(8.0, 4.0), (16.0, 4.0), (16.0, 9.0), (8.0, 9.0)], Color32::WHITE, ink);
+            pen.poly(&[(8.0, 4.0), (16.0, 4.0), (16.0, 9.0), (8.0, 9.0)], ic.highlight, ink);
         }
         "export" => {
             pen.poly(&[(4.0, 10.0), (4.0, 20.0), (16.0, 20.0), (16.0, 10.0)], pen.fill, ink);
@@ -572,7 +571,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             }
         }
         "zoom" => {
-            pen.circle(10.0, 10.0, 6.0, Color32::WHITE, ink);
+            pen.circle(10.0, 10.0, 6.0, ic.highlight, ink);
             pen.line(&[(14.5, 14.5), (20.0, 20.0)], ink);
         }
         "perspective" => {
@@ -590,13 +589,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             pen.iso_box(2.0, 13.0, 9.0, 6.0, 6.0);
             pen.iso_box(9.0, 6.0, 5.0, 4.0, 4.0);
         }
-        "folder" => pen.poly(&[(3.0, 7.0), (9.0, 7.0), (11.0, 9.0), (21.0, 9.0), (21.0, 19.0), (3.0, 19.0)], Color32::from_rgb(236, 200, 110), ink),
+        "folder" => pen.poly(&[(3.0, 7.0), (9.0, 7.0), (11.0, 9.0), (21.0, 9.0), (21.0, 19.0), (3.0, 19.0)], ic.folder, ink),
         "origin" => {
-            pen.arrow((6.0, 18.0), (20.0, 18.0), Color32::from_rgb(210, 60, 60));
-            pen.arrow((6.0, 18.0), (6.0, 4.0), Color32::from_rgb(60, 100, 220));
-            pen.arrow((6.0, 18.0), (15.0, 9.0), Color32::from_rgb(60, 160, 60));
+            pen.arrow((6.0, 18.0), (20.0, 18.0), ic.axes[0]);
+            pen.arrow((6.0, 18.0), (6.0, 4.0), ic.axes[2]);
+            pen.arrow((6.0, 18.0), (15.0, 9.0), ic.axes[1]);
         }
-        "plane" => pen.poly(&[(3.0, 15.0), (12.0, 8.0), (21.0, 11.0), (12.0, 18.0)], Color32::from_rgb(244, 214, 150), ink),
+        "plane" => pen.poly(&[(3.0, 15.0), (12.0, 8.0), (21.0, 11.0), (12.0, 18.0)], ic.plane, ink),
         "axis" => {
             pen.line(&[(4.0, 20.0), (20.0, 4.0)], ink);
             pen.circle(4.0, 20.0, 2.0, ink, ink);
@@ -825,8 +824,8 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             }
         }
         "accessibility" => {
-            pen.poly(&[(2.0, 20.0), (22.0, 20.0), (22.0, 15.0), (2.0, 15.0)], Color32::from_rgb(70, 180, 90), ink);
-            pen.poly(&[(8.0, 15.0), (16.0, 15.0), (16.0, 17.5), (8.0, 17.5)], Color32::from_rgb(220, 70, 60), Color32::TRANSPARENT);
+            pen.poly(&[(2.0, 20.0), (22.0, 20.0), (22.0, 15.0), (2.0, 15.0)], ic.access[0], ink);
+            pen.poly(&[(8.0, 15.0), (16.0, 15.0), (16.0, 17.5), (8.0, 17.5)], ic.access[1], Color32::TRANSPARENT);
             pen.poly(&[(6.0, 10.0), (18.0, 10.0), (18.0, 12.5), (6.0, 12.5)], pen.fill, ink);
             pen.arrow((4.0, 2.0), (4.0, 13.0), a);
             pen.arrow((20.0, 2.0), (20.0, 13.0), a);
@@ -834,10 +833,10 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         "environment_map" => {
             let pts: Vec<Pos2> =
                 (0..32).map(|i| i as f32 / 32.0 * std::f32::consts::TAU).map(|t| pen.at(12.0 + 9.0 * t.cos(), 12.0 + 9.0 * t.sin())).collect();
-            p.add(Shape::convex_polygon(pts, Color32::from_rgb(190, 205, 230), Stroke::new(pen.w, ink)));
-            pen.poly(&[(3.6, 13.0), (20.4, 13.0), (18.5, 17.5), (5.5, 17.5)], Color32::from_rgb(60, 62, 70), Color32::TRANSPARENT);
-            pen.line(&[(3.2, 12.6), (20.8, 12.6)], Color32::WHITE);
-            p.circle_filled(pen.at(9.0, 8.0), 2.2 * pen.s(), Color32::WHITE);
+            p.add(Shape::convex_polygon(pts, ic.sky, Stroke::new(pen.w, ink)));
+            pen.poly(&[(3.6, 13.0), (20.4, 13.0), (18.5, 17.5), (5.5, 17.5)], ic.floor, Color32::TRANSPARENT);
+            pen.line(&[(3.2, 12.6), (20.8, 12.6)], ic.highlight);
+            p.circle_filled(pen.at(9.0, 8.0), 2.2 * pen.s(), ic.highlight);
             pen.circle(12.0, 12.0, 9.0, Color32::TRANSPARENT, ink);
         }
         "zebra" | "draft_analysis" | "curvature_map" => {
@@ -845,27 +844,23 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
                 (0..32).map(|i| i as f32 / 32.0 * std::f32::consts::TAU).map(|t| pen.at(12.0 + 9.0 * t.cos(), 12.0 + 9.0 * t.sin())).collect();
             match name {
                 "zebra" => {
-                    p.add(Shape::convex_polygon(pts, Color32::WHITE, Stroke::new(pen.w, ink)));
+                    p.add(Shape::convex_polygon(pts, ic.highlight, Stroke::new(pen.w, ink)));
                     for k in 0..3 {
                         let y = 6.5 + k as f32 * 4.5;
                         let h = (81.0 - (y + 1.0 - 12.0) * (y + 1.0 - 12.0)).max(0.0).sqrt();
-                        pen.poly(
-                            &[(12.0 - h, y), (12.0 + h, y), (12.0 + h, y + 2.2), (12.0 - h, y + 2.2)],
-                            Color32::from_gray(30),
-                            Color32::TRANSPARENT,
-                        );
+                        pen.poly(&[(12.0 - h, y), (12.0 + h, y), (12.0 + h, y + 2.2), (12.0 - h, y + 2.2)], ic.stripe, Color32::TRANSPARENT);
                     }
                     pen.circle(12.0, 12.0, 9.0, Color32::TRANSPARENT, ink);
                 }
                 "draft_analysis" => {
-                    pen.poly(&[(4.0, 20.0), (20.0, 20.0), (17.0, 5.0), (7.0, 5.0)], Color32::from_rgb(70, 180, 90), ink);
-                    pen.poly(&[(7.0, 5.0), (17.0, 5.0), (16.0, 9.0), (8.0, 9.0)], Color32::from_rgb(235, 200, 50), Color32::TRANSPARENT);
+                    pen.poly(&[(4.0, 20.0), (20.0, 20.0), (17.0, 5.0), (7.0, 5.0)], ic.draft[0], ink);
+                    pen.poly(&[(7.0, 5.0), (17.0, 5.0), (16.0, 9.0), (8.0, 9.0)], ic.draft[1], Color32::TRANSPARENT);
                     pen.arrow((12.0, 16.0), (12.0, 1.5), a);
                 }
                 _ => {
-                    p.add(Shape::convex_polygon(pts, Color32::from_rgb(60, 110, 230), Stroke::new(pen.w, ink)));
-                    pen.circle(14.0, 10.0, 5.0, Color32::from_rgb(70, 190, 90), Color32::TRANSPARENT);
-                    pen.circle(15.5, 8.5, 2.2, Color32::from_rgb(225, 60, 45), Color32::TRANSPARENT);
+                    p.add(Shape::convex_polygon(pts, ic.curvature[0], Stroke::new(pen.w, ink)));
+                    pen.circle(14.0, 10.0, 5.0, ic.curvature[1], Color32::TRANSPARENT);
+                    pen.circle(15.5, 8.5, 2.2, ic.curvature[2], Color32::TRANSPARENT);
                 }
             }
         }
@@ -983,13 +978,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         }
         "patch" => {
             // A wire loop with a surface spanned across it.
-            pen.poly(&[(4.0, 16.0), (9.0, 6.0), (19.0, 5.0), (20.0, 15.0), (12.0, 20.0)], SHEET, ink);
+            pen.poly(&[(4.0, 16.0), (9.0, 6.0), (19.0, 5.0), (20.0, 15.0), (12.0, 20.0)], ic.sheet, ink);
             pen.line(&[(4.0, 16.0), (9.0, 6.0), (19.0, 5.0), (20.0, 15.0), (12.0, 20.0), (4.0, 16.0)], a);
         }
         "stitch" => {
             // Two surface patches sewn along their shared edge.
-            pen.poly(&[(3.0, 18.0), (11.0, 14.0), (11.0, 4.0), (3.0, 8.0)], SHEET, ink);
-            pen.poly(&[(13.0, 14.0), (21.0, 18.0), (21.0, 8.0), (13.0, 4.0)], SHEET_2, ink);
+            pen.poly(&[(3.0, 18.0), (11.0, 14.0), (11.0, 4.0), (3.0, 8.0)], ic.sheet, ink);
+            pen.poly(&[(13.0, 14.0), (21.0, 18.0), (21.0, 8.0), (13.0, 4.0)], ic.sheet_2, ink);
             for y in [6.0, 9.0, 12.0] {
                 pen.line(&[(10.0, y), (14.0, y + 1.5)], a);
             }
@@ -999,7 +994,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             let f = [(2.0, 12.5), (7.0, 9.5), (12.0, 15.5), (17.0, 12.5)];
             let b = [(6.4, 8.9), (11.4, 5.9), (16.4, 11.9), (21.4, 8.9)];
             let d = f.map(|(x, y)| (x, y + 6.0));
-            pen.band(&bezier(b, 16), &bezier(f, 16), SHEET);
+            pen.band(&bezier(b, 16), &bezier(f, 16), ic.sheet);
             pen.band(&bezier(f, 16), &bezier(d, 16), pen.fill.gamma_multiply(0.85));
             pen.poly(&[(17.0, 12.5), (21.4, 8.9), (21.4, 14.9), (17.0, 18.5)], pen.fill.gamma_multiply(0.7), ink);
             pen.line(&[(2.0, 12.5), (2.0, 18.5)], ink);
@@ -1042,7 +1037,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // An open profile (accent) pulled up into a sheet.
             let top = [(4.0, 11.0), (8.0, 8.0), (13.0, 14.0), (20.0, 10.0)];
             let bottom = [(4.0, 20.0), (8.0, 17.0), (13.0, 23.0), (20.0, 19.0)];
-            pen.band(&bezier(top, 16), &bezier(bottom, 16), SHEET);
+            pen.band(&bezier(top, 16), &bezier(bottom, 16), ic.sheet);
             pen.line(&[(4.0, 11.0), (4.0, 20.0)], ink);
             pen.line(&[(20.0, 10.0), (20.0, 19.0)], ink);
             pen.curve(top, ink);
@@ -1053,13 +1048,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // An open profile (accent) turned about the axis into a hollow band.
             let left = [(5.0, 6.0), (7.0, 10.0), (5.0, 14.0), (6.0, 18.0)];
             let right = [(19.0, 6.0), (17.0, 10.0), (19.0, 14.0), (18.0, 18.0)];
-            pen.band(&bezier(left, 16), &bezier(right, 16), SHEET);
+            pen.band(&bezier(left, 16), &bezier(right, 16), ic.sheet);
             let front = ellipse(12.0, 18.0, 6.0, 2.2, 0.0, std::f32::consts::PI, 16);
-            pen.poly(&front, SHEET, Color32::TRANSPARENT);
+            pen.poly(&front, ic.sheet, Color32::TRANSPARENT);
             // A closed fill takes each point once: a repeated end point spikes `poly`'s edge.
             let mut opening = ellipse(12.0, 6.0, 7.0, 2.2, 0.0, std::f32::consts::TAU, 32);
             opening.pop();
-            pen.poly(&opening, SHEET_LIGHT, ink);
+            pen.poly(&opening, ic.sheet_light, ink);
             pen.line(&front, ink);
             pen.curve(left, ink);
             pen.line(&[(12.0, 1.5), (12.0, 3.8)], ink);
@@ -1070,7 +1065,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // A straight profile (accent) carried along a curved path: a ribbon.
             let near = [(4.0, 13.0), (8.0, 5.0), (14.0, 5.0), (20.0, 9.0)];
             let far = [(4.0, 20.0), (8.0, 12.0), (14.0, 12.0), (20.0, 16.0)];
-            pen.band(&bezier(near, 16), &bezier(far, 16), SHEET);
+            pen.band(&bezier(near, 16), &bezier(far, 16), ic.sheet);
             pen.curve(near, ink);
             pen.curve(far, ink);
             pen.line(&[(4.0, 13.0), (4.0, 20.0)], a);
@@ -1080,7 +1075,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // Two open sections (accent) joined by a sheet.
             let top = [(5.0, 6.0), (9.0, 3.0), (14.0, 8.0), (19.0, 5.0)];
             let bottom = [(3.0, 19.0), (8.0, 15.0), (14.0, 22.0), (21.0, 18.0)];
-            pen.band(&bezier(top, 16), &bezier(bottom, 16), SHEET);
+            pen.band(&bezier(top, 16), &bezier(bottom, 16), ic.sheet);
             pen.line(&[(5.0, 6.0), (3.0, 19.0)], ink);
             pen.line(&[(19.0, 5.0), (21.0, 18.0)], ink);
             pen.curve(top, a);
@@ -1090,7 +1085,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // A wavy sheet and its offset copy (dashed), the distance shown by the arrow.
             let back = [(6.0, 14.0), (10.0, 11.0), (15.0, 17.0), (21.0, 14.0)];
             let front = [(3.0, 20.0), (7.0, 17.0), (12.0, 23.0), (18.0, 20.0)];
-            pen.band(&bezier(back, 16), &bezier(front, 16), SHEET);
+            pen.band(&bezier(back, 16), &bezier(front, 16), ic.sheet);
             pen.curve(back, ink);
             pen.curve(front, ink);
             pen.line(&[(6.0, 14.0), (3.0, 20.0)], ink);
@@ -1104,7 +1099,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         "ruled" => {
             // A strip hanging off a block's edge (accent), ruled by straight lines.
             pen.poly(&[(2.0, 12.0), (12.0, 12.0), (12.0, 22.0), (2.0, 22.0)], pen.fill, ink);
-            pen.poly(&[(12.0, 12.0), (21.0, 4.0), (21.0, 14.0), (12.0, 22.0)], SHEET, ink);
+            pen.poly(&[(12.0, 12.0), (21.0, 4.0), (21.0, 14.0), (12.0, 22.0)], ic.sheet, ink);
             pen.line(&[(15.0, 9.3), (15.0, 19.3)], a);
             pen.line(&[(18.0, 6.7), (18.0, 16.7)], a);
             pen.line(&[(12.0, 12.0), (12.0, 22.0)], a);
@@ -1140,13 +1135,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
                 })
                 .collect();
             for (lo, hi) in rows.iter().zip(rows.iter().skip(1)) {
-                pen.band(lo, hi, SHEET);
+                pen.band(lo, hi, ic.sheet);
             }
             for j in [n / 3, 2 * n / 3] {
                 if let Some(r) = rows.get(j) {
-                    pen.line(r, SHEET_LINE);
+                    pen.line(r, ic.sheet_line);
                 }
-                pen.line(&rows.iter().filter_map(|r| r.get(j).copied()).collect::<Vec<_>>(), SHEET_LINE);
+                pen.line(&rows.iter().filter_map(|r| r.get(j).copied()).collect::<Vec<_>>(), ic.sheet_line);
             }
             for c in [left, top, right, bottom] {
                 pen.curve(c, a);
@@ -1160,29 +1155,29 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // leaves both edges tangent.
             let near = [(13.0, 20.0), (8.5, 20.0), (10.5, 11.0), (6.0, 11.0)];
             let far = near.map(|(x, y)| (x + 4.4, y - 3.6));
-            pen.poly(&[(2.0, 11.0), (6.0, 11.0), (10.4, 7.4), (6.4, 7.4)], SHEET, ink);
-            pen.band(&bezier(near, 16), &bezier(far, 16), SHEET_LIGHT);
+            pen.poly(&[(2.0, 11.0), (6.0, 11.0), (10.4, 7.4), (6.4, 7.4)], ic.sheet, ink);
+            pen.band(&bezier(near, 16), &bezier(far, 16), ic.sheet_light);
             pen.curve(far, a);
-            pen.poly(&[(13.0, 20.0), (17.0, 20.0), (21.4, 16.4), (17.4, 16.4)], SHEET, ink);
+            pen.poly(&[(13.0, 20.0), (17.0, 20.0), (21.4, 16.4), (17.4, 16.4)], ic.sheet, ink);
             pen.curve(near, a);
         }
         "untrim" => {
             // A trimmed sheet whose hole (dashed, accent) is filled back in.
-            pen.poly(&[(3.0, 17.0), (9.0, 5.0), (21.0, 7.0), (16.0, 20.0)], SHEET, ink);
+            pen.poly(&[(3.0, 17.0), (9.0, 5.0), (21.0, 7.0), (16.0, 20.0)], ic.sheet, ink);
             let hole = ellipse(12.2, 12.3, 4.2, 3.2, 0.0, std::f32::consts::TAU, 32);
-            pen.poly(hole.get(1..).unwrap_or_default(), SHEET_LIGHT, Color32::TRANSPARENT);
+            pen.poly(hole.get(1..).unwrap_or_default(), ic.sheet_light, Color32::TRANSPARENT);
             pen.dashed(&hole, a);
         }
         "unstitch" => {
             // Two sheets pulled apart from their shared edge.
-            pen.poly(&[(2.0, 18.0), (9.0, 14.0), (9.0, 4.0), (2.0, 8.0)], SHEET, ink);
-            pen.poly(&[(15.0, 14.0), (22.0, 18.0), (22.0, 8.0), (15.0, 4.0)], SHEET_2, ink);
+            pen.poly(&[(2.0, 18.0), (9.0, 14.0), (9.0, 4.0), (2.0, 8.0)], ic.sheet, ink);
+            pen.poly(&[(15.0, 14.0), (22.0, 18.0), (22.0, 8.0), (15.0, 4.0)], ic.sheet_2, ink);
             pen.arrow((10.8, 11.0), (7.0, 11.0), a);
             pen.arrow((13.2, 11.0), (17.0, 11.0), a);
         }
         "reverse_normal" => {
             // A sheet with its old normal (faded) and the flipped one (accent).
-            pen.poly(&[(2.0, 14.0), (14.0, 10.0), (22.0, 13.0), (10.0, 18.0)], SHEET, ink);
+            pen.poly(&[(2.0, 14.0), (14.0, 10.0), (22.0, 13.0), (10.0, 18.0)], ic.sheet, ink);
             pen.arrow((12.0, 14.0), (12.0, 3.5), ink.gamma_multiply(0.5));
             pen.arrow((12.0, 14.0), (12.0, 22.5), a);
         }
@@ -1190,10 +1185,10 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
             // A wall sheet and a floor sheet joined by a round strip (accent edges).
             let near = [(3.0, 16.0), (3.0, 18.8), (5.2, 21.0), (8.0, 21.0)];
             let far = near.map(|(x, y)| (x + 4.4, y - 3.6));
-            pen.poly(&[(3.0, 16.0), (3.0, 8.0), (7.4, 4.4), (7.4, 12.4)], SHEET_2, ink);
-            pen.poly(&[(8.0, 21.0), (16.0, 21.0), (20.4, 17.4), (12.4, 17.4)], SHEET, ink);
-            pen.band(&bezier(near, 16), &bezier(far, 16), SHEET_LIGHT);
-            pen.line(&[(4.5, 19.5), (8.9, 15.9)], SHEET_LINE);
+            pen.poly(&[(3.0, 16.0), (3.0, 8.0), (7.4, 4.4), (7.4, 12.4)], ic.sheet_2, ink);
+            pen.poly(&[(8.0, 21.0), (16.0, 21.0), (20.4, 17.4), (12.4, 17.4)], ic.sheet, ink);
+            pen.band(&bezier(near, 16), &bezier(far, 16), ic.sheet_light);
+            pen.line(&[(4.5, 19.5), (8.9, 15.9)], ic.sheet_line);
             pen.curve(far, a);
             pen.curve(near, a);
         }
@@ -1209,11 +1204,11 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
                 let h = 0.8 + 4.2 * i as f32 / 10.0;
                 let tip = (x + (y1 - y) / len * h, y - (x1 - x) / len * h);
                 if i % 2 == 0 {
-                    pen.line(&[(*x, *y), tip], SHEET_LINE);
+                    pen.line(&[(*x, *y), tip], ic.sheet_line);
                 }
                 tips.push(tip);
             }
-            pen.line(&tips, SHEET_LINE);
+            pen.line(&tips, ic.sheet_line);
             pen.curve(c, a);
             pen.dot(12.0, 13.0, a);
         }
@@ -1256,7 +1251,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         }
         "interference" => {
             pen.closed(&[(3.0, 5.0), (14.0, 5.0), (14.0, 16.0), (3.0, 16.0)], ink);
-            pen.poly(&[(9.0, 10.0), (14.0, 10.0), (14.0, 16.0), (9.0, 16.0)], Color32::from_rgb(225, 70, 60), Color32::from_rgb(225, 70, 60));
+            pen.poly(&[(9.0, 10.0), (14.0, 10.0), (14.0, 16.0), (9.0, 16.0)], ic.interference, ic.interference);
             pen.closed(&[(9.0, 10.0), (21.0, 10.0), (21.0, 20.0), (9.0, 20.0)], ink);
         }
         // Sheet metal: thin plates (fill), the made or changed part in the accent.
@@ -1283,7 +1278,7 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         "fold" => {
             pen.line(&[(2.0, 18.0), (12.0, 18.0)], ink);
             pen.line(&[(12.0, 18.0), (19.0, 6.0)], a);
-            pen.line(&[(9.0, 21.0), (15.0, 15.0)], Color32::from_rgb(130, 140, 160));
+            pen.line(&[(9.0, 21.0), (15.0, 15.0)], ic.fold);
             pen.arc(12.0, 18.0, 6.0, 0.2, 1.0, a);
             pen.arrow((18.0, 16.0), (17.0, 12.5), a);
         }
@@ -1358,13 +1353,13 @@ pub fn paint(p: &Painter, r: Rect, name: &str, ink: Color32, fill: Color32, acce
         // Appearance: a shaded ball with three paint dabs.
         "appearance" => {
             pen.circle(10.0, 13.0, 7.5, pen.fill, ink);
-            pen.arc(10.0, 13.0, 4.5, 1.8, 3.2, Color32::WHITE);
-            pen.circle(18.0, 5.0, 2.6, Color32::from_rgb(220, 70, 60), ink);
-            pen.circle(20.5, 11.0, 2.6, Color32::from_rgb(70, 150, 230), ink);
-            pen.circle(19.0, 17.5, 2.6, Color32::from_rgb(240, 200, 60), ink);
+            pen.arc(10.0, 13.0, 4.5, 1.8, 3.2, ic.highlight);
+            pen.circle(18.0, 5.0, 2.6, ic.paint[0], ink);
+            pen.circle(20.5, 11.0, 2.6, ic.paint[1], ink);
+            pen.circle(19.0, 17.5, 2.6, ic.paint[2], ink);
         }
         "warning" => {
-            pen.poly(&[(12.0, 3.0), (21.0, 20.0), (3.0, 20.0)], Color32::from_rgb(250, 200, 60), ink);
+            pen.poly(&[(12.0, 3.0), (21.0, 20.0), (3.0, 20.0)], ic.warning, ink);
             pen.line(&[(12.0, 9.0), (12.0, 14.0)], ink);
             pen.dot(12.0, 17.0, ink);
         }

assets/icons/ui/source/markers.rs

@@ -5,8 +5,9 @@ use egui::{Color32, Pos2, Stroke, vec2};
 
 pub(crate) fn snap(painter: &egui::Painter, c: Pos2, tip: Option<Pos2>, kind: SnapKind, col: Color32, tag: Option<&str>) {
     // A dark halo under every stroke keeps the glyph readable on light and dark faces alike.
-    let halo = Stroke::new(4.5, Color32::from_black_alpha(150));
-    let white = Stroke::new(1.5, Color32::WHITE);
+    let ic = Tokens::get().icons;
+    let halo = Stroke::new(4.5, ic.marker_halo);
+    let white = Stroke::new(1.5, ic.highlight);
     if let Some(tip) = tip {
         let d = (tip - c).normalized();
         let n = vec2(-d.y, d.x);
@@ -30,7 +31,7 @@ pub(crate) fn snap(painter: &egui::Painter, c: Pos2, tip: Option<Pos2>, kind: Sn
             }
         }
     };
-    painter.add(shape(Color32::from_black_alpha(150), Stroke::NONE, 4.0));
+    painter.add(shape(ic.marker_halo, Stroke::NONE, 4.0));
     painter.add(shape(col, Stroke::NONE, 0.0));
     match kind {
         SnapKind::FaceCenter => {
@@ -38,8 +39,8 @@ pub(crate) fn snap(painter: &egui::Painter, c: Pos2, tip: Option<Pos2>, kind: Sn
         }
         SnapKind::CircleCenter => {
             painter.circle_stroke(c, 7.0, white);
-            painter.line_segment([c - vec2(4.5, 0.0), c + vec2(4.5, 0.0)], Stroke::new(1.2, Color32::WHITE));
-            painter.line_segment([c - vec2(0.0, 4.5), c + vec2(0.0, 4.5)], Stroke::new(1.2, Color32::WHITE));
+            painter.line_segment([c - vec2(4.5, 0.0), c + vec2(4.5, 0.0)], Stroke::new(1.2, ic.highlight));
+            painter.line_segment([c - vec2(0.0, 4.5), c + vec2(0.0, 4.5)], Stroke::new(1.2, ic.highlight));
         }
         SnapKind::EdgeMid | SnapKind::Vertex => {
             painter.add(shape(Color32::TRANSPARENT, white, 0.0));

assets/icons/ui/source/navigation.rs

@@ -151,13 +151,12 @@ pub(crate) fn curved_arrow(painter: &egui::Painter, at: Pos2, clockwise: bool, h
 pub(crate) const AXIS_RADIUS: f32 = 11.0;
 pub(crate) fn axis_tip(painter: &egui::Painter, c: Pos2, name: &str, d: &Vec3, at: Pos2, depth: f64, hovered: bool, t: Tokens) {
     let col = if d.x != 0.0 {
-        solidcraft_engine::view::colors::AXIS_X
+        t.triad[0]
     } else if d.y != 0.0 {
-        solidcraft_engine::view::colors::AXIS_Y
+        t.triad[1]
     } else {
-        solidcraft_engine::view::colors::AXIS_Z
+        t.triad[2]
     };
-    let col = Color32::from_rgb(col.0, col.1, col.2);
     let positive = !name.starts_with('-');
     let ink = if depth < -0.01 { col.gamma_multiply(0.55) } else { col };
     painter.line_segment([c, at], Stroke::new(if positive { 2.0 } else { 1.0 }, ink));

assets/icons/ui/source/pointer.rs

@@ -1,14 +1,18 @@
 //! Original agent pointer and label. Animation stays with the UI controller.
 use egui::{Color32, FontId, Pos2, Shape, Stroke, vec2};
-pub(crate) const AGENT: Color32 = Color32::from_rgb(168, 85, 247);
+/// The agent pointer's colour (a theme token, so a colour vision mode can reach it).
+pub(crate) fn agent() -> Color32 {
+    crate::theme::Tokens::get().icons.agent
+}
 pub(crate) fn paint(painter: &egui::Painter, p: Pos2) {
+    let ic = crate::theme::Tokens::get().icons;
     // An arrow pointer, tip at `p`.
     let pts: Vec<Pos2> =
         [(0.0, 0.0), (0.0, 17.0), (4.5, 13.0), (7.5, 20.0), (10.5, 18.8), (7.5, 12.0), (13.0, 12.0)].iter().map(|(x, y)| p + vec2(*x, *y)).collect();
-    painter.add(Shape::convex_polygon(pts.clone(), AGENT, Stroke::NONE));
-    painter.add(Shape::closed_line(pts, Stroke::new(1.5, Color32::WHITE)));
-    let label = painter.layout_no_wrap("Agent".into(), FontId::proportional(11.0), Color32::WHITE);
+    painter.add(Shape::convex_polygon(pts.clone(), ic.agent, Stroke::NONE));
+    painter.add(Shape::closed_line(pts, Stroke::new(1.5, ic.highlight)));
+    let label = painter.layout_no_wrap("Agent".into(), FontId::proportional(11.0), ic.highlight);
     let r = egui::Rect::from_min_size(p + vec2(15.0, 18.0), label.size() + vec2(10.0, 4.0));
-    painter.rect_filled(r, 4.0, AGENT);
-    painter.galley(r.min + vec2(5.0, 2.0), label, Color32::WHITE);
+    painter.rect_filled(r, 4.0, ic.agent);
+    painter.galley(r.min + vec2(5.0, 2.0), label, ic.highlight);
 }

assets/locales/de.json

@@ -72,6 +72,21 @@
   "ui.coincident": "Koinzident",
   "ui.collapse": "Einklappen",
   "ui.collinear": "Kollinear",
+  "ui.colour_vision": "Farbsehen",
+  "ui.colour_vision_deutan": "Deutan",
+  "ui.colour_vision_deutan_tip": "Bei schwachem oder fehlendem Grünsinn",
+  "ui.colour_vision_failed": "Fehler",
+  "ui.colour_vision_fixed": "Fixiert",
+  "ui.colour_vision_mode": "Modus",
+  "ui.colour_vision_note": "Ändert die Farben, die eine Bedeutung tragen: Skizzenstatus, Achsen, Biegungen, Analysen und Symbole. Wenn Sie die Farbfilter von Windows verwenden, lassen Sie dies auf „Aus“.",
+  "ui.colour_vision_off": "Aus",
+  "ui.colour_vision_off_tip": "Die eigenen Farben des Designs",
+  "ui.colour_vision_projected": "Projiziert",
+  "ui.colour_vision_protan": "Protan",
+  "ui.colour_vision_protan_tip": "Bei schwachem oder fehlendem Rotsinn",
+  "ui.colour_vision_sample": "Beispiel",
+  "ui.colour_vision_tritan": "Tritan",
+  "ui.colour_vision_tritan_tip": "Bei schwachem oder fehlendem Blausinn",
   "ui.combine": "Kombinieren",
   "ui.coming_later": "bald verfügbar",
   "ui.concentric": "Konzentrisch",
@@ -668,6 +683,7 @@
   "ui.heading_constraints": "RANDBEDINGUNGEN",
   "ui.heading_utilities": "WERKZEUGE",
   "BROWSER": "BROWSER",
+  "Bends": "Biegungen",
   "Drive Joint": "Gelenk antreiben",
   "Edit Profile Sketch": "Profile-Skizze bearbeiten",
   "Find in Browser": "Im Browser suchen",

assets/locales/en.json

@@ -350,6 +350,21 @@
   "ui.coincident": "Coincident",
   "ui.collapse": "Collapse",
   "ui.collinear": "Collinear",
+  "ui.colour_vision": "Colour vision",
+  "ui.colour_vision_deutan": "Deutan",
+  "ui.colour_vision_deutan_tip": "For a weak or missing green sense",
+  "ui.colour_vision_failed": "Failed",
+  "ui.colour_vision_fixed": "Fixed",
+  "ui.colour_vision_mode": "Mode",
+  "ui.colour_vision_note": "Changes the colours that carry a meaning: sketch states, axes, bends, analyses and icons. If you use Windows colour filters, keep this Off.",
+  "ui.colour_vision_off": "Off",
+  "ui.colour_vision_off_tip": "The theme's own colours",
+  "ui.colour_vision_projected": "Projected",
+  "ui.colour_vision_protan": "Protan",
+  "ui.colour_vision_protan_tip": "For a weak or missing red sense",
+  "ui.colour_vision_sample": "Sample",
+  "ui.colour_vision_tritan": "Tritan",
+  "ui.colour_vision_tritan_tip": "For a weak or missing blue sense",
   "ui.combine": "Combine",
   "ui.coming_later": "coming later",
   "ui.concentric": "Concentric",

assets/locales/ja.json

@@ -350,6 +350,21 @@
   "ui.coincident": "一致",
   "ui.collapse": "折りたたむ",
   "ui.collinear": "同一直線上",
+  "ui.colour_vision": "色覚",
+  "ui.colour_vision_deutan": "2型色覚（D型）",
+  "ui.colour_vision_deutan_tip": "緑を感じにくい、または感じない場合に",
+  "ui.colour_vision_failed": "エラー",
+  "ui.colour_vision_fixed": "固定",
+  "ui.colour_vision_mode": "モード",
+  "ui.colour_vision_note": "意味を持つ色を変更します（スケッチの状態、軸、曲げ、解析、アイコン）。Windows のカラー フィルターを使う場合は「オフ」のままにしてください。",
+  "ui.colour_vision_off": "オフ",
+  "ui.colour_vision_off_tip": "テーマ本来の色",
+  "ui.colour_vision_projected": "投影",
+  "ui.colour_vision_protan": "1型色覚（P型）",
+  "ui.colour_vision_protan_tip": "赤を感じにくい、または感じない場合に",
+  "ui.colour_vision_sample": "サンプル",
+  "ui.colour_vision_tritan": "3型色覚（T型）",
+  "ui.colour_vision_tritan_tip": "青を感じにくい、または感じない場合に",
   "ui.combine": "結合",
   "ui.coming_later": "準備中",
   "ui.concentric": "同心",

assets/locales/ko.json

@@ -72,6 +72,21 @@
   "ui.coincident": "일치",
   "ui.collapse": "접기",
   "ui.collinear": "동일 선상",
+  "ui.colour_vision": "색각",
+  "ui.colour_vision_deutan": "녹색각이상 (Deutan)",
+  "ui.colour_vision_deutan_tip": "녹색 감각이 약하거나 없는 경우",
+  "ui.colour_vision_failed": "실패",
+  "ui.colour_vision_fixed": "고정",
+  "ui.colour_vision_mode": "모드",
+  "ui.colour_vision_note": "의미를 나타내는 색을 바꿉니다: 스케치 상태, 축, 벤딩, 분석, 아이콘. Windows 색 필터를 사용한다면 '끄기'로 두세요.",
+  "ui.colour_vision_off": "끄기",
+  "ui.colour_vision_off_tip": "테마 고유의 색상",
+  "ui.colour_vision_projected": "투영",
+  "ui.colour_vision_protan": "적색각이상 (Protan)",
+  "ui.colour_vision_protan_tip": "빨간색 감각이 약하거나 없는 경우",
+  "ui.colour_vision_sample": "예시",
+  "ui.colour_vision_tritan": "청색각이상 (Tritan)",
+  "ui.colour_vision_tritan_tip": "파란색 감각이 약하거나 없는 경우",
   "ui.combine": "결합",
   "ui.coming_later": "추후 지원 예정",
   "ui.concentric": "동심",
@@ -668,6 +683,7 @@
   "ui.heading_constraints": "구속 조건",
   "ui.heading_utilities": "유틸리티",
   "BROWSER": "브라우저",
+  "Bends": "벤딩",
   "Drive Joint": "조인트 구동",
   "Edit Profile Sketch": "윤곽 스케치 편집",
   "Find in Browser": "브라우저에서 찾기",

assets/locales/ru.json

@@ -342,6 +342,21 @@
   "ui.coincident": "Совпадение",
   "ui.collapse": "Свернуть",
   "ui.collinear": "Коллинеарность",
+  "ui.colour_vision": "Цветовое зрение",
+  "ui.colour_vision_deutan": "Дейтан",
+  "ui.colour_vision_deutan_tip": "При слабом или отсутствующем восприятии зелёного",
+  "ui.colour_vision_failed": "Ошибка",
+  "ui.colour_vision_fixed": "Фиксировано",
+  "ui.colour_vision_mode": "Режим",
+  "ui.colour_vision_note": "Меняет цвета, которые несут смысл: статус эскиза, оси, гибы, анализы и значки. Если вы пользуетесь цветовыми фильтрами Windows, оставьте «Выключено».",
+  "ui.colour_vision_off": "Выключено",
+  "ui.colour_vision_off_tip": "Собственные цвета темы",
+  "ui.colour_vision_projected": "Проекция",
+  "ui.colour_vision_protan": "Протан",
+  "ui.colour_vision_protan_tip": "При слабом или отсутствующем восприятии красного",
+  "ui.colour_vision_sample": "Пример",
+  "ui.colour_vision_tritan": "Тритан",
+  "ui.colour_vision_tritan_tip": "При слабом или отсутствующем восприятии синего",
   "ui.combine": "Объединение",
   "ui.coming_later": "появится позже",
   "ui.concentric": "Концентричность",

assets/locales/zh.json

@@ -349,6 +349,21 @@
   "ui.coincident": "重合",
   "ui.collapse": "折叠",
   "ui.collinear": "共线",
+  "ui.colour_vision": "色觉",
+  "ui.colour_vision_deutan": "绿色觉异常（Deutan）",
+  "ui.colour_vision_deutan_tip": "绿色感知较弱或缺失时使用",
+  "ui.colour_vision_failed": "失败",
+  "ui.colour_vision_fixed": "固定",
+  "ui.colour_vision_mode": "模式",
+  "ui.colour_vision_note": "更改表示含义的颜色：草图状态、轴、折弯、分析和图标。如果使用 Windows 颜色滤镜，请保持“关闭”。",
+  "ui.colour_vision_off": "关闭",
+  "ui.colour_vision_off_tip": "主题本身的颜色",
+  "ui.colour_vision_projected": "投影",
+  "ui.colour_vision_protan": "红色觉异常（Protan）",
+  "ui.colour_vision_protan_tip": "红色感知较弱或缺失时使用",
+  "ui.colour_vision_sample": "示例",
+  "ui.colour_vision_tritan": "蓝色觉异常（Tritan）",
+  "ui.colour_vision_tritan_tip": "蓝色感知较弱或缺失时使用",
   "ui.combine": "组合",
   "ui.coming_later": "即将推出",
   "ui.concentric": "同心",

assets/shaders/viewport.wgsl

@@ -10,6 +10,10 @@ struct U {
     acc_u: vec4<f32>,  // accessibility map axes (xyz, offset)
     acc_v: vec4<f32>,
     eye: vec4<f32>,    // eye position, w = 1 for perspective (0: orthographic, looking along -back)
+    // analysis colours (`theme::AnalysisColors`): draft positive, between, negative; reachable,
+    // blocked; curvature flat, middle, tight
+    ana_c: array<vec4<f32>, 8>,
+    ana_f: vec4<f32>,  // x = 1: stripe the negative draft and blocked faces
 };
 
 @group(1) @binding(2) var acc_t: texture_2d<f32>;
@@ -150,8 +154,8 @@ fn analysis(i: TOut, k: f32) -> vec4<f32> {
         // Slack of a pixel and a half, more on slopes (the map holds the pixel's highest point).
         let slack = u.ana.y * (1.0 + sqrt(max(1.0 - cn * cn, 0.0)) / max(cn, 0.05));
         let clear = dot(i.wp, d) >= top - slack;
-        var c = vec3<f32>(0.85, 0.22, 0.20);
-        if (facing && clear) { c = vec3<f32>(0.20, 0.75, 0.30); }
+        var c = u.ana_c[4].rgb;
+        if (facing && clear) { c = u.ana_c[3].rgb; } else { c = stripe(i, c); }
         return out_color(vec4<f32>(c * lit, 1.0));
     }
     if (u.ana.x > 3.5) {
@@ -171,18 +175,25 @@ fn analysis(i: TOut, k: f32) -> vec4<f32> {
     }
     if (u.ana.x < 2.5) {
         let a = degrees(asin(clamp(dot(normalize(i.n), normalize(u.pull.xyz)), -1.0, 1.0)));
-        var c = vec3<f32>(0.95, 0.80, 0.15);
-        if (a >= u.ana.y) { c = vec3<f32>(0.20, 0.75, 0.30); }
-        if (a <= -u.ana.y) { c = vec3<f32>(0.85, 0.22, 0.20); }
+        var c = u.ana_c[1].rgb;
+        if (a >= u.ana.y) { c = u.ana_c[0].rgb; }
+        if (a <= -u.ana.y) { c = stripe(i, u.ana_c[2].rgb); }
         return out_color(vec4<f32>(c * lit, 1.0));
     }
     // Curvature from how fast the normal turns across the pixel.
     let t = clamp(k * u.ana.y, 0.0, 1.0);
-    let c = select(mix(vec3<f32>(0.10, 0.80, 0.25), vec3<f32>(0.90, 0.15, 0.10), t * 2.0 - 1.0),
-                   mix(vec3<f32>(0.15, 0.35, 0.95), vec3<f32>(0.10, 0.80, 0.25), t * 2.0), t < 0.5);
+    let c = select(mix(u.ana_c[6].rgb, u.ana_c[7].rgb, t * 2.0 - 1.0), mix(u.ana_c[5].rgb, u.ana_c[6].rgb, t * 2.0), t < 0.5);
     return out_color(vec4<f32>(c * lit, 1.0));
 }
 
+/// A "bad" analysis face (negative draft, blocked): with the stripes on (colour vision modes), the
+/// section cap's 45 degree hatch over it, so colour is not the only cue.
+fn stripe(i: TOut, c: vec3<f32>) -> vec3<f32> {
+    if (u.ana_f.x < 0.5) { return c; }
+    let h = fract((i.pos.x + i.pos.y) / 9.0);
+    return select(c, c * 0.6, h < 0.22);
+}
+
 @fragment
 fn fs_tri(i: TOut) -> @location(0) vec4<f32> {
     if (clipped(i.wp)) { discard; }

assets/styles/ui/palettes.rs

@@ -1,5 +1,5 @@
 //! Original light and dark palette values. Compiled by the UI theme boundary.
-use crate::theme::Tokens;
+use crate::theme::{AnalysisColors, IconColors, Tokens};
 use egui::Color32;
 impl Tokens {
     pub const fn light() -> Tokens {
@@ -83,6 +83,48 @@ impl Tokens {
             field: Color32::WHITE,
             box_window: Color32::from_rgb(38, 120, 218),
             box_crossing: Color32::from_rgb(40, 160, 80),
+            // Equal to `view::colors` (the engine's tags), so mapping a tag to its token
+            // changes nothing.
+            sketch_projected: Color32::from_rgb(150, 60, 190),
+            sketch_lost: Color32::from_rgb(200, 60, 90),
+            sketch_construction: Color32::from_rgb(230, 130, 40),
+            sketch_centerline: Color32::from_rgb(200, 110, 60),
+            triad: [Color32::from_rgb(220, 60, 60), Color32::from_rgb(60, 170, 60), Color32::from_rgb(60, 100, 230)],
+            gizmo: [Color32::from_rgb(225, 70, 60), Color32::from_rgb(80, 190, 80), Color32::from_rgb(70, 130, 240)],
+            bend_up: Color32::from_rgb(30, 140, 50),
+            bend_down: Color32::from_rgb(200, 90, 20),
+            interference: Color32::from_rgb(235, 45, 40),
+            analysis: AnalysisColors {
+                draft: [[0.20, 0.75, 0.30], [0.95, 0.80, 0.15], [0.85, 0.22, 0.20]],
+                access: [[0.20, 0.75, 0.30], [0.85, 0.22, 0.20]],
+                curvature: [[0.15, 0.35, 0.95], [0.10, 0.80, 0.25], [0.90, 0.15, 0.10]],
+                hatch: false,
+            },
+            icons: IconColors {
+                sheet: Color32::from_rgb(170, 200, 240),
+                sheet_2: Color32::from_rgb(150, 185, 235),
+                sheet_light: Color32::from_rgb(214, 229, 248),
+                sheet_line: Color32::from_rgb(127, 166, 218),
+                highlight: Color32::WHITE,
+                glint: Color32::from_rgba_premultiplied(160, 160, 160, 160),
+                folder: Color32::from_rgb(236, 200, 110),
+                plane: Color32::from_rgb(244, 214, 150),
+                fold: Color32::from_rgb(130, 140, 160),
+                stripe: Color32::from_gray(30),
+                sky: Color32::from_rgb(190, 205, 230),
+                floor: Color32::from_rgb(60, 62, 70),
+                paint: [Color32::from_rgb(220, 70, 60), Color32::from_rgb(70, 150, 230), Color32::from_rgb(240, 200, 60)],
+                axes: [Color32::from_rgb(210, 60, 60), Color32::from_rgb(60, 160, 60), Color32::from_rgb(60, 100, 220)],
+                access: [Color32::from_rgb(70, 180, 90), Color32::from_rgb(220, 70, 60)],
+                draft: [Color32::from_rgb(70, 180, 90), Color32::from_rgb(235, 200, 50)],
+                curvature: [Color32::from_rgb(60, 110, 230), Color32::from_rgb(70, 190, 90), Color32::from_rgb(225, 60, 45)],
+                interference: Color32::from_rgb(225, 70, 60),
+                warning: Color32::from_rgb(250, 200, 60),
+                agent: Color32::from_rgb(168, 85, 247),
+                marker_halo: Color32::from_black_alpha(150),
+            },
+            app_bar_icon: [Color32::from_rgb(225, 230, 238), Color32::from_rgb(120, 140, 170), Color32::from_rgb(120, 190, 255)],
+            logo: [Color32::from_rgb(96, 158, 236), Color32::from_rgb(58, 136, 238), Color32::from_rgb(55, 108, 197), Color32::WHITE],
         }
     }
     pub const fn dark() -> Tokens {
@@ -135,6 +177,60 @@ impl Tokens {
         t.field = Color32::from_rgb(30, 34, 41);
         t.box_window = Color32::from_rgb(70, 150, 255);
         t.box_crossing = Color32::from_rgb(80, 200, 120);
+        t.bend_up = Color32::from_rgb(110, 200, 120);
+        t.bend_down = Color32::from_rgb(240, 150, 80);
+        t
+    }
+
+    /// Colour vision, red-green (Protan and Deutan share it, #778): values of the theme's colours
+    /// that a weak red or green sense still tells apart. Each was measured against normal vision,
+    /// protan and deutan, with two simulations of each loss (`colour_vision_tests`).
+    pub(super) const fn red_green(self, dark: bool) -> Tokens {
+        let mut t = self;
+        let positive = [0.20, 0.45, 0.90];
+        let negative = [0.85, 0.40, 0.05];
+        t.triad[0] = Color32::from_rgb(200, 40, 40);
+        t.triad[1] = Color32::from_rgb(120, 210, 80);
+        t.gizmo[1] = Color32::from_rgb(140, 220, 90);
+        t.preview_sketch = Color32::from_rgb(80, 185, 145);
+        t.analysis.draft = [positive, [0.95, 0.90, 0.60], negative];
+        t.analysis.access = [positive, negative];
+        t.analysis.hatch = true;
+        // The icons that show the same meanings follow; on the dark toolbar the blue is a little
+        // stronger, to stay clear of the icon fill.
+        let good = if dark { Color32::from_rgb(35, 115, 245) } else { Color32::from_rgb(51, 115, 230) };
+        t.icons.axes[0] = t.triad[0];
+        t.icons.axes[1] = t.triad[1];
+        t.icons.access = [good, Color32::from_rgb(217, 102, 13)];
+        t.icons.draft = [good, Color32::from_rgb(242, 230, 153)];
+        if dark {
+            t.bend_up = Color32::from_rgb(110, 165, 255);
+            t.bend_down = Color32::from_rgb(240, 180, 70);
+            t.sketch_accent = Color32::from_rgb(150, 225, 195);
+        } else {
+            t.sketch_projected = Color32::from_rgb(205, 120, 215);
+            t.sketch_locked = Color32::from_rgb(60, 150, 120);
+            t.timeline_item_error = Color32::from_rgb(232, 196, 170);
+            t.bend_up = Color32::from_rgb(30, 100, 210);
+            t.bend_down = Color32::from_rgb(200, 120, 0);
+            t.sketch_accent = Color32::from_rgb(60, 150, 105);
+        }
+        t
+    }
+
+    /// Colour vision, blue-yellow (Tritan, #778), measured against normal vision and tritan.
+    pub(super) const fn blue_yellow(self, dark: bool) -> Tokens {
+        let mut t = self;
+        t.analysis.hatch = true;
+        t.preview_sketch = Color32::from_rgb(125, 180, 105);
+        if dark {
+            t.sketch_locked = Color32::from_rgb(140, 225, 110);
+            t.box_crossing = Color32::from_rgb(240, 110, 170);
+            t.glyph_text = Color32::from_rgb(240, 180, 165);
+        } else {
+            t.sketch_locked = Color32::from_rgb(20, 165, 70);
+            t.box_crossing = Color32::from_rgb(200, 60, 120);
+        }
         t
     }
 }