Added ability to define colors at UV coordinates along a path

crates/egui/src/painter.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use epaint::{
     text::{Fonts, Galley, LayoutJob},
-    CircleShape, ClippedShape, RectShape, Rounding, Shape, Stroke,
+    CircleShape, ClippedShape, PathStroke, RectShape, Rounding, Shape, Stroke,
 };
 
 /// Helper to paint shapes and text to a specific region on a specific layer.
@@ -280,21 +280,21 @@ impl Painter {
 /// # Paint different primitives
 impl Painter {
     /// Paints a line from the first point to the second.
-    pub fn line_segment(&self, points: [Pos2; 2], stroke: impl Into<Stroke>) -> ShapeIdx {
+    pub fn line_segment(&self, points: [Pos2; 2], stroke: impl Into<PathStroke>) -> ShapeIdx {
         self.add(Shape::LineSegment {
             points,
             stroke: stroke.into(),
         })
     }
 
     /// Paints a horizontal line.
-    pub fn hline(&self, x: impl Into<Rangef>, y: f32, stroke: impl Into<Stroke>) -> ShapeIdx {
-        self.add(Shape::hline(x, y, stroke))
+    pub fn hline(&self, x: impl Into<Rangef>, y: f32, stroke: impl Into<PathStroke>) -> ShapeIdx {
+        self.add(Shape::hline(x, y, stroke.into()))
     }
 
     /// Paints a vertical line.
-    pub fn vline(&self, x: f32, y: impl Into<Rangef>, stroke: impl Into<Stroke>) -> ShapeIdx {
-        self.add(Shape::vline(x, y, stroke))
+    pub fn vline(&self, x: f32, y: impl Into<Rangef>, stroke: impl Into<PathStroke>) -> ShapeIdx {
+        self.add(Shape::vline(x, y, stroke.into()))
     }
 
     pub fn circle(

crates/epaint/src/bezier.rs

@@ -3,15 +3,15 @@
 
 use std::ops::Range;
 
-use crate::{shape::Shape, Color32, PathShape, Stroke};
+use crate::{shape::Shape, Color32, PathShape, PathStroke};
 use emath::*;
 
 // ----------------------------------------------------------------------------
 
 /// A cubic [Bézier Curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve).
 ///
 /// See also [`QuadraticBezierShape`].
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct CubicBezierShape {
     /// The first point is the starting point and the last one is the ending point of the curve.
@@ -20,7 +20,7 @@ pub struct CubicBezierShape {
     pub closed: bool,
 
     pub fill: Color32,
-    pub stroke: Stroke,
+    pub stroke: PathStroke,
 }
 
 impl CubicBezierShape {
@@ -32,7 +32,7 @@ impl CubicBezierShape {
         points: [Pos2; 4],
         closed: bool,
         fill: Color32,
-        stroke: impl Into<Stroke>,
+        stroke: impl Into<PathStroke>,
     ) -> Self {
         Self {
             points,
@@ -52,7 +52,7 @@ impl CubicBezierShape {
             points,
             closed: self.closed,
             fill: self.fill,
-            stroke: self.stroke,
+            stroke: self.stroke.clone(),
         }
     }
 
@@ -69,7 +69,7 @@ impl CubicBezierShape {
                 points,
                 closed: self.closed,
                 fill: self.fill,
-                stroke: self.stroke,
+                stroke: self.stroke.clone(),
             };
             pathshapes.push(pathshape);
         }
@@ -156,7 +156,7 @@ impl CubicBezierShape {
             points: [d_from, d_ctrl, d_to],
             closed: self.closed,
             fill: self.fill,
-            stroke: self.stroke,
+            stroke: self.stroke.clone(),
         };
         let delta_t = t_range.end - t_range.start;
         let q_start = q.sample(t_range.start);
@@ -168,7 +168,7 @@ impl CubicBezierShape {
             points: [from, ctrl1, ctrl2, to],
             closed: self.closed,
             fill: self.fill,
-            stroke: self.stroke,
+            stroke: self.stroke.clone(),
         }
     }
 
@@ -375,7 +375,7 @@ impl From<CubicBezierShape> for Shape {
 /// A quadratic [Bézier Curve](https://en.wikipedia.org/wiki/B%C3%A9zier_curve).
 ///
 /// See also [`CubicBezierShape`].
-#[derive(Copy, Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct QuadraticBezierShape {
     /// The first point is the starting point and the last one is the ending point of the curve.
@@ -384,7 +384,7 @@ pub struct QuadraticBezierShape {
     pub closed: bool,
 
     pub fill: Color32,
-    pub stroke: Stroke,
+    pub stroke: PathStroke,
 }
 
 impl QuadraticBezierShape {
@@ -397,7 +397,7 @@ impl QuadraticBezierShape {
         points: [Pos2; 3],
         closed: bool,
         fill: Color32,
-        stroke: impl Into<Stroke>,
+        stroke: impl Into<PathStroke>,
     ) -> Self {
         Self {
             points,
@@ -417,7 +417,7 @@ impl QuadraticBezierShape {
             points,
             closed: self.closed,
             fill: self.fill,
-            stroke: self.stroke,
+            stroke: self.stroke.clone(),
         }
     }
 
@@ -429,7 +429,7 @@ impl QuadraticBezierShape {
             points,
             closed: self.closed,
             fill: self.fill,
-            stroke: self.stroke,
+            stroke: self.stroke.clone(),
         }
     }
 
@@ -688,7 +688,7 @@ fn single_curve_approximation(curve: &CubicBezierShape) -> QuadraticBezierShape
         points: [curve.points[0], c, curve.points[3]],
         closed: curve.closed,
         fill: curve.fill,
-        stroke: curve.stroke,
+        stroke: curve.stroke.clone(),
     }
 }
 

crates/epaint/src/lib.rs

@@ -53,7 +53,7 @@ pub use self::{
         Rounding, Shape, TextShape,
     },
     stats::PaintStats,
-    stroke::Stroke,
+    stroke::{ColorMode, PathStroke, Stroke},
     tessellator::{TessellationOptions, Tessellator},
     text::{FontFamily, FontId, Fonts, Galley},
     texture_atlas::TextureAtlas,

crates/epaint/src/shape.rs

@@ -3,6 +3,7 @@
 use std::{any::Any, sync::Arc};
 
 use crate::{
+    stroke::PathStroke,
     text::{FontId, Fonts, Galley},
     Color32, Mesh, Stroke, TextureId,
 };
@@ -34,7 +35,10 @@ pub enum Shape {
     Ellipse(EllipseShape),
 
     /// A line between two points.
-    LineSegment { points: [Pos2; 2], stroke: Stroke },
+    LineSegment {
+        points: [Pos2; 2],
+        stroke: PathStroke,
+    },
 
     /// A series of lines between points.
     /// The path can have a stroke and/or fill (if closed).
@@ -88,15 +92,15 @@ impl Shape {
     /// A line between two points.
     /// More efficient than calling [`Self::line`].
     #[inline]
-    pub fn line_segment(points: [Pos2; 2], stroke: impl Into<Stroke>) -> Self {
+    pub fn line_segment(points: [Pos2; 2], stroke: impl Into<PathStroke>) -> Self {
         Self::LineSegment {
             points,
             stroke: stroke.into(),
         }
     }
 
     /// A horizontal line.
-    pub fn hline(x: impl Into<Rangef>, y: f32, stroke: impl Into<Stroke>) -> Self {
+    pub fn hline(x: impl Into<Rangef>, y: f32, stroke: impl Into<PathStroke>) -> Self {
         let x = x.into();
         Self::LineSegment {
             points: [pos2(x.min, y), pos2(x.max, y)],
@@ -105,7 +109,7 @@ impl Shape {
     }
 
     /// A vertical line.
-    pub fn vline(x: f32, y: impl Into<Rangef>, stroke: impl Into<Stroke>) -> Self {
+    pub fn vline(x: f32, y: impl Into<Rangef>, stroke: impl Into<PathStroke>) -> Self {
         let y = y.into();
         Self::LineSegment {
             points: [pos2(x, y.min), pos2(x, y.max)],
@@ -117,13 +121,13 @@ impl Shape {
     ///
     /// Use [`Self::line_segment`] instead if your line only connects two points.
     #[inline]
-    pub fn line(points: Vec<Pos2>, stroke: impl Into<Stroke>) -> Self {
+    pub fn line(points: Vec<Pos2>, stroke: impl Into<PathStroke>) -> Self {
         Self::Path(PathShape::line(points, stroke))
     }
 
     /// A line that closes back to the start point again.
     #[inline]
-    pub fn closed_line(points: Vec<Pos2>, stroke: impl Into<Stroke>) -> Self {
+    pub fn closed_line(points: Vec<Pos2>, stroke: impl Into<PathStroke>) -> Self {
         Self::Path(PathShape::closed_line(points, stroke))
     }
 
@@ -224,7 +228,7 @@ impl Shape {
     pub fn convex_polygon(
         points: Vec<Pos2>,
         fill: impl Into<Color32>,
-        stroke: impl Into<Stroke>,
+        stroke: impl Into<PathStroke>,
     ) -> Self {
         Self::Path(PathShape::convex_polygon(points, fill, stroke))
     }
@@ -586,7 +590,7 @@ pub struct PathShape {
     pub fill: Color32,
 
     /// Color and thickness of the line.
-    pub stroke: Stroke,
+    pub stroke: PathStroke,
     // TODO(emilk): Add texture support either by supplying uv for each point,
     // or by some transform from points to uv (e.g. a callback or a linear transform matrix).
 }
@@ -596,7 +600,7 @@ impl PathShape {
     ///
     /// Use [`Shape::line_segment`] instead if your line only connects two points.
     #[inline]
-    pub fn line(points: Vec<Pos2>, stroke: impl Into<Stroke>) -> Self {
+    pub fn line(points: Vec<Pos2>, stroke: impl Into<PathStroke>) -> Self {
         Self {
             points,
             closed: false,
@@ -607,7 +611,7 @@ impl PathShape {
 
     /// A line that closes back to the start point again.
     #[inline]
-    pub fn closed_line(points: Vec<Pos2>, stroke: impl Into<Stroke>) -> Self {
+    pub fn closed_line(points: Vec<Pos2>, stroke: impl Into<PathStroke>) -> Self {
         Self {
             points,
             closed: true,
@@ -623,7 +627,7 @@ impl PathShape {
     pub fn convex_polygon(
         points: Vec<Pos2>,
         fill: impl Into<Color32>,
-        stroke: impl Into<Stroke>,
+        stroke: impl Into<PathStroke>,
     ) -> Self {
         Self {
             points,

crates/epaint/src/shape_transform.rs

@@ -10,8 +10,36 @@ pub fn adjust_colors(shape: &mut Shape, adjust_color: &impl Fn(&mut Color32)) {
                 adjust_colors(shape, adjust_color);
             }
         }
-        Shape::LineSegment { stroke, points: _ } => {
-            adjust_color(&mut stroke.color);
+        Shape::LineSegment { stroke, points: _ } => match stroke.color {
+            stroke::ColorMode::Solid(mut col) => adjust_color(&mut col),
+            stroke::ColorMode::UV(_) => {}
+            stroke::ColorMode::UVBounds(_, _) => {}
+        },
+
+        Shape::Path(PathShape {
+            points: _,
+            closed: _,
+            fill,
+            stroke,
+        })
+        | Shape::QuadraticBezier(QuadraticBezierShape {
+            points: _,
+            closed: _,
+            fill,
+            stroke,
+        })
+        | Shape::CubicBezier(CubicBezierShape {
+            points: _,
+            closed: _,
+            fill,
+            stroke,
+        }) => {
+            adjust_color(fill);
+            match stroke.color {
+                stroke::ColorMode::Solid(mut col) => adjust_color(&mut col),
+                stroke::ColorMode::UV(_) => {}
+                stroke::ColorMode::UVBounds(_, _) => {}
+            }
         }
 
         Shape::Circle(CircleShape {
@@ -26,12 +54,6 @@ pub fn adjust_colors(shape: &mut Shape, adjust_color: &impl Fn(&mut Color32)) {
             fill,
             stroke,
         })
-        | Shape::Path(PathShape {
-            points: _,
-            closed: _,
-            fill,
-            stroke,
-        })
         | Shape::Rect(RectShape {
             rect: _,
             rounding: _,
@@ -40,18 +62,6 @@ pub fn adjust_colors(shape: &mut Shape, adjust_color: &impl Fn(&mut Color32)) {
             blur_width: _,
             fill_texture_id: _,
             uv: _,
-        })
-        | Shape::QuadraticBezier(QuadraticBezierShape {
-            points: _,
-            closed: _,
-            fill,
-            stroke,
-        })
-        | Shape::CubicBezier(CubicBezierShape {
-            points: _,
-            closed: _,
-            fill,
-            stroke,
         }) => {
             adjust_color(fill);
             adjust_color(&mut stroke.color);