Rebased PR to advanced-text

core/Cargo.toml

@@ -9,7 +9,6 @@ repository = "https://github.com/iced-rs/iced"
 
 [dependencies]
 bitflags = "1.2"
-thiserror = "1"
 twox-hash = { version = "1.5", default-features = false }
 
 [dependencies.palette]

core/src/angle.rs

@@ -1,3 +1,4 @@
+use crate::{Point, Rectangle, Vector};
 use std::f32::consts::PI;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -13,3 +14,20 @@ impl From<Degrees> for Radians {
         Radians(degrees.0 * PI / 180.0)
     }
 }
+
+impl Radians {
+    /// Calculates the line in which the [`Angle`] intercepts the `bounds`.
+    pub fn to_distance(&self, bounds: &Rectangle) -> (Point, Point) {
+        let v1 = Vector::new(f32::cos(self.0), f32::sin(self.0));
+
+        let distance_to_rect = f32::min(
+            f32::abs((bounds.y - bounds.center().y) / v1.y),
+            f32::abs(((bounds.x + bounds.width) - bounds.center().x) / v1.x),
+        );
+
+        let start = bounds.center() + v1 * distance_to_rect;
+        let end = bounds.center() - v1 * distance_to_rect;
+
+        (start, end)
+    }
+}

core/src/gradient.rs

@@ -1,7 +1,7 @@
 //! For creating a Gradient.
 pub use linear::Linear;
 
-use crate::{Color, Radians, Rectangle, Vector};
+use crate::{Color, Radians};
 
 #[derive(Debug, Clone, Copy, PartialEq)]
 /// A fill which transitions colors progressively along a direction, either linearly, radially (TBD),
@@ -23,7 +23,7 @@ impl Gradient {
     }
 
     /// Adjust the opacity of the gradient by a multiplier applied to each color stop.
-    pub fn transparentize(mut self, alpha_multiplier: f32) -> Self {
+    pub fn mul_alpha(mut self, alpha_multiplier: f32) -> Self {
         match &mut self {
             Gradient::Linear(linear) => {
                 for stop in &mut linear.color_stops {
@@ -34,60 +34,6 @@ impl Gradient {
 
         self
     }
-
-    /// Packs the [`Gradient`] into a buffer for use in shader code.
-    pub fn pack(&self, bounds: Rectangle) -> [f32; 44] {
-        match self {
-            Gradient::Linear(linear) => {
-                let mut pack: [f32; 44] = [0.0; 44];
-                let mut offsets: [f32; 8] = [2.0; 8];
-
-                for (index, stop) in
-                    linear.color_stops.iter().enumerate().take(8)
-                {
-                    let [r, g, b, a] = stop.color.into_linear();
-
-                    pack[(index * 4)] = r;
-                    pack[(index * 4) + 1] = g;
-                    pack[(index * 4) + 2] = b;
-                    pack[(index * 4) + 3] = a;
-
-                    offsets[index] = stop.offset;
-                }
-
-                pack[32] = offsets[0];
-                pack[33] = offsets[1];
-                pack[34] = offsets[2];
-                pack[35] = offsets[3];
-                pack[36] = offsets[4];
-                pack[37] = offsets[5];
-                pack[38] = offsets[6];
-                pack[39] = offsets[7];
-
-                let v1 = Vector::new(
-                    f32::cos(linear.angle.0),
-                    f32::sin(linear.angle.0),
-                );
-
-                let distance_to_rect = f32::min(
-                    f32::abs((bounds.y - bounds.center().y) / v1.y),
-                    f32::abs(
-                        ((bounds.x + bounds.width) - bounds.center().x) / v1.x,
-                    ),
-                );
-
-                let start = bounds.center() + v1 * distance_to_rect;
-                let end = bounds.center() - v1 * distance_to_rect;
-
-                pack[40] = start.x;
-                pack[41] = start.y;
-                pack[42] = end.x;
-                pack[43] = end.y;
-
-                pack
-            }
-        }
-    }
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq)]

examples/tour/src/main.rs

@@ -4,8 +4,10 @@ use iced::widget::{
     scrollable, slider, text, text_input, toggler, vertical_space,
 };
 use iced::widget::{Button, Column, Container, Slider};
-use iced::{alignment, widget, Degrees, Gradient, Radians, Theme};
-use iced::{Color, Element, Length, Renderer, Sandbox, Settings};
+use iced::{
+    alignment, widget, Color, Degrees, Element, Gradient, Length, Radians,
+    Renderer, Sandbox, Settings, Theme,
+};
 
 pub fn main() -> iced::Result {
     env_logger::init();