Tidying

Author: rparrett

src/main.rs

@@ -139,7 +139,7 @@ fn main() {
             .after(DrawingMouseMovement)
             .run_if(in_state(GameState::Playing)),
     );
-    app.add_systems(Update, draw_mouse_system.in_set(DrawingInteraction));
+    app.add_systems(Update, draw_cursor_system.in_set(DrawingInteraction));
 
     // whenever
     app.add_systems(
@@ -241,8 +241,6 @@ struct MainCamera;
 #[derive(Component)]
 struct Cursor;
 #[derive(Component)]
-struct DrawingLine;
-#[derive(Component)]
 struct GridPoint;
 #[derive(Component)]
 struct PixieCountText;
@@ -656,12 +654,11 @@ fn snap_to_grid(position: Vec2, grid_size: f32) -> Vec2 {
     (position / grid_size).round() * grid_size
 }
 
-fn draw_mouse_system(
+fn draw_cursor_system(
     mut commands: Commands,
     line_drawing: Res<RoadDrawingState>,
     mouse_snapped: Res<MouseSnappedPos>,
     q_cursor: Query<Entity, With<Cursor>>,
-    q_drawing: Query<Entity, With<DrawingLine>>,
 ) {
     if mouse_snapped.is_changed() || line_drawing.is_changed() {
         for entity in q_cursor.iter() {
@@ -685,34 +682,6 @@ fn draw_mouse_system(
             StateScoped(GameState::Playing),
         ));
     }
-
-    // TODO move this bit to a separate system in road_drawing.rs
-    if !line_drawing.is_changed() {
-        return;
-    }
-
-    for entity in q_drawing.iter() {
-        commands.entity(entity).despawn();
-    }
-
-    if line_drawing.drawing {
-        let color = if line_drawing.valid {
-            theme::DRAWING_ROAD[line_drawing.layer as usize - 1]
-        } else {
-            bevy::color::palettes::css::RED
-        };
-
-        for (a, b) in line_drawing.segments.iter() {
-            commands.spawn((
-                ShapeBuilder::with(&shapes::Line(*a, *b))
-                    .stroke((color, 2.0))
-                    .build(),
-                Transform::from_xyz(0.0, 0.0, layer::ROAD_OVERLAY),
-                DrawingLine,
-                StateScoped(GameState::Playing),
-            ));
-        }
-    }
 }
 
 fn drawing_mode_change_system(

src/road_drawing.rs

@@ -1,17 +1,18 @@
 use bevy::{platform::collections::HashSet, prelude::*};
+use bevy_prototype_lyon::prelude::*;
+use petgraph::{
+    dot::{Config, Dot},
+    stable_graph::NodeIndex,
+};
 
 use crate::{
     collision::{point_segment_collision, segment_collision, PointCollision, SegmentCollision},
+    layer,
     lines::{possible_lines, Axis},
     sim::SimulationState,
-    spawn_road_segment, Collider, ColliderLayer, DrawingInteraction, DrawingMouseMovement,
-    MousePos, MouseSnappedPos, PointGraphNode, RoadGraph, RoadSegment, SegmentGraphNodes,
-    SelectedTool, Tool, BOTTOM_BAR_HEIGHT,
-};
-
-use petgraph::{
-    dot::{Config, Dot},
-    stable_graph::NodeIndex,
+    spawn_road_segment, theme, Collider, ColliderLayer, DrawingInteraction, DrawingMouseMovement,
+    GameState, MousePos, MouseSnappedPos, PointGraphNode, RoadGraph, RoadSegment,
+    SegmentGraphNodes, SelectedTool, Tool, BOTTOM_BAR_HEIGHT,
 };
 
 pub struct RoadDrawingPlugin;
@@ -28,7 +29,9 @@ impl Plugin for RoadDrawingPlugin {
         );
         app.add_systems(
             Update,
-            (drawing_mouse_click_system).in_set(DrawingInteraction),
+            (drawing_mouse_click_system, draw_drawing_system)
+                .chain()
+                .in_set(DrawingInteraction),
         );
     }
 }
@@ -62,6 +65,8 @@ impl Default for RoadDrawingState {
         }
     }
 }
+#[derive(Component)]
+struct DrawingLine;
 
 #[derive(Clone, Debug)]
 struct AddSegment {
@@ -622,3 +627,36 @@ fn drawing_mouse_movement_system(
         road_state.valid = false;
     }
 }
+
+fn draw_drawing_system(
+    mut commands: Commands,
+    road_drawing: Res<RoadDrawingState>,
+    lines: Query<Entity, With<DrawingLine>>,
+) {
+    if !road_drawing.is_changed() {
+        return;
+    }
+
+    for entity in lines.iter() {
+        commands.entity(entity).despawn();
+    }
+
+    if road_drawing.drawing {
+        let color = if road_drawing.valid {
+            theme::DRAWING_ROAD[road_drawing.layer as usize - 1]
+        } else {
+            bevy::color::palettes::css::RED
+        };
+
+        for (a, b) in road_drawing.segments.iter() {
+            commands.spawn((
+                ShapeBuilder::with(&shapes::Line(*a, *b))
+                    .stroke((color, 2.0))
+                    .build(),
+                Transform::from_xyz(0.0, 0.0, layer::ROAD_OVERLAY),
+                DrawingLine,
+                StateScoped(GameState::Playing),
+            ));
+        }
+    }
+}