There's so much to fix :(

Author: an-Iceberg

src/graph.rs

@@ -21,8 +21,6 @@ pub(crate) struct DijkstraGraph
   end: Option<usize>
 }
 
-
-
 impl Default for DijkstraGraph
 {
   fn default() -> Self
@@ -123,8 +121,8 @@ impl DijkstraGraph
     }
   }
 
-  pub fn get(&self, id: usize) -> Option<DijkstraNode>
-  { return self.graph[id]; }
+  pub fn get(&self, id: usize) -> &Option<DijkstraNode>
+  { return &self.graph[id]; }
 
   pub fn start(&self) -> Option<usize>
   { return self.start; }
@@ -171,9 +169,9 @@ impl DijkstraGraph
     for _ in 0..self.graph.len()
     {
       if self.graph[current_node].is_none() { return None; }
-      if self.graph[current_node].unwrap().parent.is_none() { return None; }
+      if self.graph[current_node].as_ref().unwrap().parent.is_none() { return None; }
 
-      current_node = self.graph[current_node].unwrap().parent.unwrap();
+      current_node = self.graph[current_node].as_ref().unwrap().parent.unwrap();
 
       path.push(current_node);
 
@@ -183,33 +181,26 @@ impl DijkstraGraph
     return Some(path);
   }
 
-  pub fn points_iter(&self) -> Iter<Option<DijkstraNode>>
-  { return self.graph.iter(); }
+  pub fn points(&self) -> &[Option<DijkstraNode>; 100]
+  { return &self.graph; }
 
-  pub fn lines_iter(&self) -> Iter<&(DijkstraNode, u16, DijkstraNode)>
+  pub fn lines(&self) -> Vec<(usize, &DijkstraNode, u16, usize, &DijkstraNode)>
   {
-    self.graph.iter()
-      .filter_map(|node| *node)
-      .map(|node| (node, node.edges))
-      .map(|(node, edges)| edges.iter()
-        .map(|edge| (edge.distance, edge.destination))
-        .map(|(distance, id)| (distance, self.graph.get(id)))
-        .filter(|(distance, option)| option.is_some())
-        .map(|(distance, option)| (distance, option.unwrap()))
-        .filter(|(distance, option)| option.is_some())
-        .map(|(distance, option)| (distance, option.unwrap()))
-        .map(|(distance, destination)| (node, distance, destination))
-        .collect::<Vec<_>>()
-        .iter()
-      )
-      .flatten()
-      .collect::<Vec<_>>()
-      .iter()
-  }
+    let mut lines_iter = vec![];
 
-  pub fn get_lines(&self)
-  {
-    todo!();
+    for (from_id, point_option) in self.graph.iter().enumerate()
+    {
+      let Some(from_point) = point_option else { continue; };
+
+      for edge in &from_point.edges
+      {
+        let Some(Some(to_point)) = self.graph.get(edge.destination) else { continue; };
+
+        lines_iter.push((from_id, from_point, edge.distance, edge.destination, to_point));
+      }
+    }
+
+    return lines_iter;
   }
 
   pub fn find_hovered_point(&mut self, mouse_x: f32, mouse_y: f32, radius: f32) -> Option<usize>
@@ -391,7 +382,8 @@ impl DijkstraGraph
   }
 }
 
-struct DijkstraNode
+#[derive(Clone)]
+pub(crate) struct DijkstraNode
 {
   pub position: Position,
   parent: Option<usize>,
@@ -435,12 +427,12 @@ impl DijkstraNode
   pub fn set_visited(&mut self, visited: bool)
   { self.visited = visited; }
 
-  pub fn edges(&self) -> Vec<Edge>
-  { return self.edges; }
+  pub fn edges(&self) -> &Vec<Edge>
+  { return &self.edges; }
 }
 
-// TODO: consider making these fields pub
-struct Position
+#[derive(Clone, Copy)]
+pub(crate) struct Position
 {
   pub x: f32,
   pub y: f32,
@@ -455,7 +447,8 @@ impl Position
   { self.x = x; self.y = y; }
 }
 
-struct Edge
+#[derive(Clone, Copy)]
+pub(crate) struct Edge
 {
   destination: usize,
   distance: u16,

src/main.rs

@@ -39,16 +39,16 @@ async fn main()
   // This is the id of the point the mouse is currently hovering over and mouse 1 is pressed
   let mut selected_point_id: Option<usize> = None;
 
-  let ui_width = 200_f32;
+  let ui_width: f32 = 200.;
   let mut mode = Mode::Move;
 
-  let mut padding = 3_u8;
-  let mut angle = 0.436_f32;
-  let mut arrow_head_length = 20_f32;
-  let mut radius = 13_f32;
-  let mut line_length = 1_u16;
-  let mut path_thickness = 2_f32;
-  let mut base_point = 15_f32;
+  let mut padding: u8 = 3;
+  let mut angle: f32 = 0.436;
+  let mut arrow_head_length: f32 = 20.;
+  let mut radius: f32 = 13.;
+  let mut line_length: u16 = 1;
+  let mut path_thickness: f32 = 2.;
+  let mut base_point: f32 = 15.;
 
   let mut bg_color: [f32;3] = [0.25_f32, 0., 0.5];
   let mut path_color: [f32;3] = [0., 1., 0.];
@@ -92,7 +92,6 @@ async fn main()
       &mut arrow_head_length,
       &mut path_thickness,
       &mut base_point,
-      &mut padding,
       &mut selected_point_id,
       &mut line_length,
       &mut path_color,
@@ -114,6 +113,9 @@ async fn main()
       &graph, &radius,
       &path_thickness,
       &padding,
+      &angle,
+      &base_point,
+      &arrow_head_length,
       &hovered_point_id,
       &selected_point_id,
       &path_color,

src/tests/graph_tests.rs

@@ -20,22 +20,22 @@ fn generate_random_points_graph(amount_of_points: u8) -> DijkstraGraph
 #[test]
 fn add_some_points()
 {
-  let mut graph = generate_random_points_graph(3);
+  let graph = generate_random_points_graph(3);
   assert_eq!(graph.size(), 3);
 }
 
 #[test]
 fn add_many_points()
 {
-  let mut graph = generate_random_points_graph(50);
+  let graph = generate_random_points_graph(50);
   assert_eq!(graph.size(), 50);
 }
 
 #[test]
 fn max_amount_of_points()
 {
   // Creating graph and "adding" 1_000 points to it
-  let mut graph = generate_random_points_graph(1_000);
+  let graph = generate_random_points_graph(255);
   // The graph should still only have 100 points
   assert_eq!(graph.size(), 101);
 }

src/ui.rs

@@ -15,7 +15,6 @@ pub(crate) fn paint_ui(
   arrow_head_length: &mut f32,
   path_thickness: &mut f32,
   base_point: &mut f32,
-  padding: &mut u8,
   selected_point_id: &mut Option<usize>,
   line_length: &mut u16,
   path_color: &mut [f32;3],
@@ -57,10 +56,10 @@ pub(crate) fn paint_ui(
           ui.separator();
 
           // The newlines are a hack to make all text fill up the same amount of vertical space
-          match (&mode, selected_point_id)
+          match (&mode, selected_point_id.is_some())
           { (Mode::Move, _) => ui.label("• Left click on a point to select it.\n• Hold left click to move it around."),
-            (Mode::Line, None) => ui.label("• Left click on a point to select it."),
-            (Mode::Line, Some(_)) => ui.label("• Left click on another point to create a new line.\n• Right click on another point to delete an existing line."),
+            (Mode::Line, false) => ui.label("• Left click on a point to select it."),
+            (Mode::Line, true) => ui.label("• Left click on another point to create a new line.\n• Right click on another point to delete an existing line."),
             (Mode::Point, _) => ui.label("• Left click somewhere to create a point.\n• Right click on a point to delete it."),
             (Mode::Path, _) => ui.label("• Left click on a point to set the start.\n• Right click on a point to set the end.")
           };