cyberpunk-splash/src/main.rs

@@ -143,15 +143,6 @@ impl SplashPrivate {
     }
 
     fn redraw_background(&self) {
-        let pen = GlowPen::new(
-            *self.width.borrow(),
-            *self.height.borrow(),
-            2.,
-            8.,
-            8.,
-            (0.7, 0., 1.),
-        );
-
         let background =
             ImageSurface::create(Format::Rgb24, *self.width.borrow(), *self.height.borrow())
                 .unwrap();
@@ -161,43 +152,6 @@ impl SplashPrivate {
         let _ = context.paint();
 
         context.select_font_face("Alegreya Sans SC", FontSlant::Normal, FontWeight::Bold);
-
-        {
-            context.set_source_rgb(0.7, 0., 1.);
-
-            let hashtag = "#CodingTogether";
-            context.set_font_size(64.);
-            let extents = context.text_extents(hashtag).unwrap();
-
-            context.move_to(20., extents.height() + 40.);
-            let _ = context.show_text(hashtag);
-
-            AsymLine {
-                orientation: gtk::Orientation::Horizontal,
-                start_x: 10.,
-                start_y: extents.height() + 10.,
-                start_length: 0.,
-                height: extents.height() / 2.,
-                total_length: extents.width() + extents.height() / 2.,
-                invert: false,
-            }
-            .draw(&pen);
-            pen.stroke();
-
-            AsymLine {
-                orientation: gtk::Orientation::Horizontal,
-                start_x: 20.,
-                start_y: extents.height() + 60.,
-                start_length: extents.width(),
-                height: extents.height() / 2.,
-                total_length: extents.width() + extents.height() / 2.,
-                invert: false,
-            }
-            .draw(&pen);
-            pen.stroke();
-        }
-
-        {
         context.set_font_size(128.);
 
         let center_x = *self.width.borrow() as f64 / 2.;
@@ -221,8 +175,11 @@ impl SplashPrivate {
                 invert: false,
             };
 
-                title_cutout.draw(&pen);
+            context.set_line_cap(LineCap::Round);
-                pen.stroke();
+            context.set_source_rgb(0.7, 0., 1.);
+            context.set_line_width(2.);
+            title_cutout.draw(&context);
+            let _ = context.stroke();
         }
 
         {
@@ -241,9 +198,9 @@ impl SplashPrivate {
             let _ = context.set_source(gradient);
             let _ = context.show_text(&self.text.borrow());
         }
-        }
 
         {
+            context.set_source_rgb(0.7, 0., 1.);
             AsymLine {
                 orientation: gtk::Orientation::Horizontal,
                 start_x: 100.,
@@ -253,8 +210,8 @@ impl SplashPrivate {
                 total_length: 650.,
                 invert: true,
             }
-            .draw(&pen);
+            .draw(&context);
-            pen.stroke();
+            let _ = context.stroke();
         }
 
         {
@@ -268,14 +225,10 @@ impl SplashPrivate {
                 total_length: 650.,
                 invert: false,
             }
-            .draw(&pen);
+            .draw(&context);
-            pen.stroke();
+            let _ = context.stroke();
         }
 
-        let tracery = pen.finish();
-        let _ = context.set_source(tracery);
-        let _ = context.paint();
-
         let background = context.pop_group().unwrap();
 
         *self.background.borrow_mut() = background;
@@ -441,7 +394,7 @@ struct AsymLineCutout {
 }
 
 impl AsymLineCutout {
-    fn draw(&self, pen: &impl Pen) {
+    fn draw(&self, context: &Context) {
         let dodge = if self.invert {
             self.height
         } else {
@@ -449,17 +402,17 @@ impl AsymLineCutout {
         };
         match self.orientation {
             gtk::Orientation::Horizontal => {
-                pen.move_to(self.start_x, self.start_y);
+                context.move_to(self.start_x, self.start_y);
-                pen.line_to(self.start_x + self.start_length, self.start_y);
+                context.line_to(self.start_x + self.start_length, self.start_y);
-                pen.line_to(
+                context.line_to(
                     self.start_x + self.start_length + self.height,
                     self.start_y + dodge,
                 );
-                pen.line_to(
+                context.line_to(
                     self.start_x + self.start_length + self.height + self.cutout_length,
                     self.start_y + dodge,
                 );
-                pen.line_to(
+                context.line_to(
                     self.start_x
                         + self.start_length
                         + self.height
@@ -467,20 +420,20 @@ impl AsymLineCutout {
                         + (self.height / 2.),
                     self.start_y + dodge / 2.,
                 );
-                pen.line_to(self.total_length, self.start_y + dodge / 2.);
+                context.line_to(self.total_length, self.start_y + dodge / 2.);
             }
             gtk::Orientation::Vertical => {
-                pen.move_to(self.start_x, self.start_y);
+                context.move_to(self.start_x, self.start_y);
-                pen.line_to(self.start_x, self.start_y + self.start_length);
+                context.line_to(self.start_x, self.start_y + self.start_length);
-                pen.line_to(
+                context.line_to(
                     self.start_x + dodge,
                     self.start_y + self.start_length + self.height,
                 );
-                pen.line_to(
+                context.line_to(
                     self.start_x + dodge,
                     self.start_y + self.start_length + self.height + self.cutout_length,
                 );
-                pen.line_to(
+                context.line_to(
                     self.start_x + dodge / 2.,
                     self.start_y
                         + self.start_length
@@ -488,7 +441,7 @@ impl AsymLineCutout {
                         + self.cutout_length
                         + (self.height / 2.),
                 );
-                pen.line_to(self.start_x + dodge / 2., self.total_length);
+                context.line_to(self.start_x + dodge / 2., self.total_length);
             }
             _ => panic!("unknown orientation"),
         }
@@ -506,7 +459,7 @@ struct AsymLine {
 }
 
 impl AsymLine {
-    fn draw(&self, pen: &impl Pen) {
+    fn draw(&self, context: &Context) {
         let dodge = if self.invert {
             self.height
         } else {
@@ -514,13 +467,13 @@ impl AsymLine {
         };
         match self.orientation {
             gtk::Orientation::Horizontal => {
-                pen.move_to(self.start_x, self.start_y);
+                context.move_to(self.start_x, self.start_y);
-                pen.line_to(self.start_x + self.start_length, self.start_y);
+                context.line_to(self.start_x + self.start_length, self.start_y);
-                pen.line_to(
+                context.line_to(
                     self.start_x + self.start_length + self.height,
                     self.start_y + dodge,
                 );
-                pen.line_to(self.start_x + self.total_length, self.start_y + dodge);
+                context.line_to(self.start_x + self.total_length, self.start_y + dodge);
             }
             gtk::Orientation::Vertical => {}
             _ => panic!("unknown orientation"),
@@ -528,6 +481,36 @@ impl AsymLine {
     }
 }
 
+struct RoundedRectangle {
+    x: f64,
+    y: f64,
+    width: f64,
+    height: f64,
+}
+
+impl RoundedRectangle {
+    fn draw(&self, context: &Context) {
+        context.arc(
+            self.x,
+            self.y - self.height / 2.,
+            self.height / 2.,
+            0.5 * std::f64::consts::PI,
+            1.5 * std::f64::consts::PI,
+        );
+        let _ = context.fill();
+        context.arc(
+            self.x + self.width,
+            self.y - self.height / 2.,
+            self.height / 2.,
+            1.5 * std::f64::consts::PI,
+            0.5 * std::f64::consts::PI,
+        );
+        let _ = context.fill();
+        context.rectangle(self.x, self.y, self.width, -self.height);
+        let _ = context.fill();
+    }
+}
+
 struct SlashMeter {
     orientation: gtk::Orientation,
     start_x: f64,
@@ -568,80 +551,6 @@ impl SlashMeter {
     }
 }
 
-trait Pen {
-    fn move_to(&self, x: f64, y: f64);
-    fn line_to(&self, x: f64, y: f64);
-    fn stroke(&self);
-
-    fn finish(self) -> Pattern;
-}
-
-struct GlowPen {
-    blur_context: Context,
-    draw_context: Context,
-
-    line_width: f64,
-    blur_line_width: f64,
-    blur_size: f64,
-}
-
-impl GlowPen {
-    fn new(
-        width: i32,
-        height: i32,
-        line_width: f64,
-        blur_line_width: f64,
-        blur_size: f64,
-        color: (f64, f64, f64),
-    ) -> Self {
-        let blur_context =
-            Context::new(ImageSurface::create(Format::Rgb24, width, height).unwrap()).unwrap();
-        blur_context.set_line_width(blur_line_width);
-        blur_context.set_source_rgba(color.0, color.1, color.2, 0.5);
-        blur_context.push_group();
-        blur_context.set_line_cap(LineCap::Round);
-
-        let draw_context =
-            Context::new(ImageSurface::create(Format::Rgb24, width, height).unwrap()).unwrap();
-        draw_context.set_line_width(line_width);
-        draw_context.set_source_rgb(color.0, color.1, color.2);
-        draw_context.push_group();
-        draw_context.set_line_cap(LineCap::Round);
-
-        Self {
-            blur_context,
-            draw_context,
-            line_width,
-            blur_line_width,
-            blur_size,
-        }
-    }
-}
-
-impl Pen for GlowPen {
-    fn move_to(&self, x: f64, y: f64) {
-        self.blur_context.move_to(x, y);
-        self.draw_context.move_to(x, y);
-    }
-
-    fn line_to(&self, x: f64, y: f64) {
-        self.blur_context.line_to(x, y);
-        self.draw_context.line_to(x, y);
-    }
-
-    fn stroke(&self) {
-        self.blur_context.stroke();
-        self.draw_context.stroke();
-    }
-
-    fn finish(self) -> Pattern {
-        let foreground = self.draw_context.pop_group().unwrap();
-        self.blur_context.set_source(foreground).unwrap();
-        self.blur_context.paint().unwrap();
-        self.blur_context.pop_group().unwrap()
-    }
-}
-
 fn main() {
     let app = gtk::Application::builder()
         .application_id("com.luminescent-dreams.cyberpunk-splash")