upgrade to use macroquad over ggez

Author: Velfi

Cargo.lock

@@ -1,18 +1,18 @@
 [package]
 name = "vector_field_visualization"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Zelda Hessler <[email protected]>"]
-edition = "2018"
+edition = "2024"
 
 [profile.release]
 lto = "thin"
 
 [dependencies]
 chrono = "0.4.19"
 dotenv = "0.15.0"
-env_logger = "0.9.0"
-ggez = "0.6.0-rc2"
+env_logger = "0.11.8"
 log = "0.4.14"
-noise = "0.7.0"
-rand = "0.8.4"
-svg = "0.10.0"
+noise = "0.9.0"
+rand = "0.9.0"
+svg = "0.18.0"
+macroquad = "0.4.14"

Cargo.toml

@@ -1,15 +1,11 @@
 use crate::{
     consts::{
-        CIRCLE_TOLERANCE, GRID_CELL_H, GRID_CELL_W, GRID_SIZE_X, GRID_SIZE_Y, SCREEN_H, SCREEN_W,
-        VECTOR_SCALE, VECTOR_WIDTH,
+        GRID_CELL_H, GRID_CELL_W, GRID_SIZE_X, GRID_SIZE_Y, SCREEN_H, SCREEN_W, VECTOR_SCALE,
     },
     visualizer::{Visualizer, VisualizerParams},
 };
-use ggez::{
-    graphics::{Color, DrawMode, Mesh, MeshBuilder},
-    Context,
-};
 use log::info;
+use macroquad::prelude::*;
 use svg::node::element;
 
 type Point2<T> = [T; 2];
@@ -91,31 +87,10 @@ impl Visualizer for Circles {
         }
     }
 
-    fn build_mesh(&self, ctx: &mut Context) -> Option<Mesh> {
-        let mut circle_mesh_builder = MeshBuilder::new();
-        let color = Color::new(1.0, 1.0, 1.0, 1.0);
-
-        for circle in self.circles.iter() {
-            let [x, y] = circle.location;
-
-            circle_mesh_builder
-                .circle(
-                    DrawMode::stroke(VECTOR_WIDTH as f32),
-                    [x as f32, y as f32],
-                    circle.radius as f32,
-                    CIRCLE_TOLERANCE,
-                    color,
-                )
-                .unwrap();
-        }
-
-        circle_mesh_builder.build(ctx).ok()
-    }
-
     fn build_svg_document_from_state(&self) -> svg::Document {
         let doc = svg::Document::new().set("viewBox", (0, 0, SCREEN_W, SCREEN_H));
 
-        let mut group = svg::node::element::Group::new()
+        let mut group = element::Group::new()
             .set("fill", "none")
             .set("stroke", "black")
             .set("stroke-width", "0.3mm");
@@ -132,7 +107,7 @@ impl Visualizer for Circles {
             group = group.add(path);
         }
 
-        let bounding_rect = svg::node::element::Rectangle::new()
+        let bounding_rect = element::Rectangle::new()
             .set("width", SCREEN_W)
             .set("height", SCREEN_H)
             .set("fill", "none")
@@ -141,4 +116,12 @@ impl Visualizer for Circles {
 
         doc.add(group).add(bounding_rect)
     }
+
+    fn render(&self) {
+        for circle in self.circles.iter() {
+            let [x, y] = circle.location;
+
+            draw_circle(x as f32, y as f32, circle.radius as f32, WHITE);
+        }
+    }
 }

src/circles.rs

@@ -4,13 +4,12 @@ pub const GRID_SIZE_X: usize = 96;
 pub const GRID_SIZE_Y: usize = 60;
 pub const VECTOR_SCALE: f64 = 20.0;
 pub const VECTOR_WIDTH: f64 = 2.0;
-pub const CIRCLE_TOLERANCE: f32 = 1.0;
 
-pub const DEFAULT_MOVE_SPEED: f64 = 0.05;
-pub const DEFAULT_NOISE_SCALE: f64 = 0.01;
-pub const DEFAULT_NOISE_SCALE_INCREMENT: f64 = DEFAULT_NOISE_SCALE * 0.2;
-pub const DEFAULT_NOISE_SPEED: f64 = 0.00001;
-pub const DEFAULT_NOISE_SPEED_INCREMENT: f64 = DEFAULT_NOISE_SPEED * 0.2;
+pub const DEFAULT_MOVE_SPEED: f64 = 0.001;
+pub const DEFAULT_NOISE_SCALE: f64 = 0.001;
+pub const DEFAULT_NOISE_SCALE_INCREMENT: f64 = DEFAULT_NOISE_SCALE * 0.01;
+pub const DEFAULT_NOISE_SPEED: f64 = 0.000005;
+pub const DEFAULT_NOISE_SPEED_INCREMENT: f64 = DEFAULT_NOISE_SPEED * 0.01;
 
 pub const SCREEN_W: usize = 1920;
 pub const SCREEN_H: usize = 1080;

src/consts.rs

@@ -5,12 +5,14 @@ pub struct Counter {
 }
 
 impl Counter {
+    /// Creates a new Counter with the given minimum and maximum values.
     pub fn new(min: usize, max: usize) -> Self {
         assert!(min <= max);
 
         Counter { count: 0, min, max }
     }
 
+    /// Get the current count.
     pub fn count(&self) -> usize {
         self.count
     }

src/counter.rs

@@ -5,13 +5,10 @@ use crate::{
     },
     visualizer::{Visualizer, VisualizerParams},
 };
-use ggez::{
-    graphics::{Color, Mesh, MeshBuilder},
-    Context,
-};
 use log::info;
 use std::f64::consts::TAU;
 use svg::node::element;
+use macroquad::prelude::*;
 
 type Point2<T> = [T; 2];
 
@@ -93,26 +90,10 @@ impl Visualizer for LineSegments {
         }
     }
 
-    fn build_mesh(&self, ctx: &mut Context) -> Option<Mesh> {
-        let mut line_mesh_builder = MeshBuilder::new();
-        let color = Color::new(1.0, 1.0, 1.0, 1.0);
-
-        for line_segment in self.line_segments.iter() {
-            let [[x1, y1], [x2, y2]] = line_segment.points;
-            let points = [[x1 as f32, y1 as f32], [x2 as f32, y2 as f32]];
-
-            line_mesh_builder
-                .line(&points, VECTOR_WIDTH as f32, color)
-                .unwrap();
-        }
-
-        line_mesh_builder.build(ctx).ok()
-    }
-
     fn build_svg_document_from_state(&self) -> svg::Document {
         let doc = svg::Document::new().set("viewBox", (0, 0, SCREEN_W, SCREEN_H));
 
-        let mut group = svg::node::element::Group::new()
+        let mut group = element::Group::new()
             .set("fill", "none")
             .set("stroke", "black")
             .set("stroke-width", "0.3mm");
@@ -130,7 +111,7 @@ impl Visualizer for LineSegments {
             group = group.add(path);
         }
 
-        let bounding_rect = svg::node::element::Rectangle::new()
+        let bounding_rect = element::Rectangle::new()
             .set("width", SCREEN_W)
             .set("height", SCREEN_H)
             .set("fill", "none")
@@ -139,4 +120,11 @@ impl Visualizer for LineSegments {
 
         doc.add(group).add(bounding_rect)
     }
+
+    fn render(&self) {
+        for line_segment in self.line_segments.iter() {
+            let [[x1, y1], [x2, y2]] = line_segment.points;
+            draw_line(x1 as f32, y1 as f32, x2 as f32, y2 as f32,VECTOR_WIDTH as f32, WHITE);
+        }
+    }
 }