Merge branch 'fsundvik/glamour' into fsundvik/wgpu-winit-0.30

Cargo.toml

@@ -36,10 +36,9 @@ copypasta = "0.10.1"
 csscolorparser = "0.6.2"
 derive-new = "0.6.0"
 dirs = "5.0.0"
-euclid = { version = "0.22.9", features = ["serde", "mint"] }
+glamour = { version = "0.11.1", features = ["serde"] }
 flexi_logger = { version = "0.28.0", default-features = false }
 futures = "0.3.21"
-glam = { version = "0.22.0", features = ["mint"] }
 glutin = "0.31.1"
 glutin-winit = "0.4.2"
 image = { version = "0.25.0", default-features = false, features = ["ico"] }

src/renderer/animation_utils.rs

@@ -1,4 +1,4 @@
-use crate::units::PixelPos;
+use glamour::{Point2, Unit};
 
 #[allow(dead_code)]
 pub fn ease_linear(t: f32) -> f32 {
@@ -73,13 +73,13 @@ pub fn ease(ease_func: fn(f32) -> f32, start: f32, end: f32, t: f32) -> f32 {
     lerp(start, end, ease_func(t))
 }
 
-pub fn ease_point(
+pub fn ease_point<T: Unit<Scalar = f32>>(
     ease_func: fn(f32) -> f32,
-    start: PixelPos<f32>,
-    end: PixelPos<f32>,
+    start: Point2<T>,
+    end: Point2<T>,
     t: f32,
-) -> PixelPos<f32> {
-    PixelPos::new(
+) -> Point2<T> {
+    Point2::new(
         ease(ease_func, start.x, end.x, t),
         ease(ease_func, start.y, end.y, t),
     )

src/renderer/cursor_renderer/cursor_vfx.rs

@@ -6,7 +6,7 @@ use crate::{
     renderer::cursor_renderer::CursorSettings,
     renderer::{animation_utils::*, grid_renderer::GridRenderer},
     settings::*,
-    units::{PixelPos, PixelSize, PixelVec},
+    units::{GridSize, PixelPos, PixelSize, PixelVec},
 };
 
 pub trait CursorVfx {
@@ -136,7 +136,7 @@ impl CursorVfx for PointHighlight {
         //
         // paint.set_color(color);
         //
-        // let cursor_height = grid_renderer.grid_scale.0.height;
+        // let cursor_height = grid_renderer.grid_scale.height();
         // let size = 3.0 * cursor_height;
         // let radius = self.t * size;
         // let hr = radius * 0.5;
@@ -161,7 +161,6 @@ impl CursorVfx for PointHighlight {
         //         paint.set_stroke_width(cursor_height * 0.2);
         //         canvas.draw_rect(rect, &paint);
         //     }
-        // }
     }
 }
 
@@ -316,7 +315,7 @@ impl CursorVfx for ParticleTrail {
 
     fn render(&self, settings: &CursorSettings, grid_renderer: &mut GridRenderer, cursor: &Cursor) {
         // let mut paint = Paint::new(skia_safe::colors::WHITE, None);
-        // let font_dimensions = grid_renderer.grid_scale.0;
+        // let font_dimensions = GridSize::new(1.0, 1.0) * grid_renderer.grid_scale;
         // match self.trail_mode {
         //     TrailMode::Torpedo | TrailMode::Railgun => {
         //         paint.set_style(Style::Stroke);