diff --git a/topola/src/board.rs b/topola/src/board.rs index d21f120..a31a986 100644 --- a/topola/src/board.rs +++ b/topola/src/board.rs @@ -55,10 +55,6 @@ impl Board { self.layout.add_segment(segment) } - pub fn add_arc(&mut self, arc: Arc) -> ArcId { - self.layout.add_arc(arc) - } - pub fn add_via(&mut self, via: Via) -> ViaId { self.layout.add_via(via) } diff --git a/topola/src/layout.rs b/topola/src/layout.rs index a78c0f0..9a0b30b 100644 --- a/topola/src/layout.rs +++ b/topola/src/layout.rs @@ -136,7 +136,6 @@ pub struct Layout { joints: Recorder>, segments: Recorder>, - arcs: Recorder>, vias: Recorder>, polygons: Recorder>, } @@ -150,7 +149,6 @@ impl Layout { joints: Recorder::new(StableVec::new()), segments: Recorder::new(StableVec::new()), - arcs: Recorder::new(StableVec::new()), vias: Recorder::new(StableVec::new()), polygons: Recorder::new(StableVec::new()), } @@ -164,10 +162,6 @@ impl Layout { SegmentId::new(self.segments.push(segment)) } - pub fn add_arc(&mut self, arc: Arc) -> ArcId { - ArcId::new(self.arcs.push(arc)) - } - pub fn add_via(&mut self, via: Via) -> ViaId { ViaId::new(self.vias.push(via)) } @@ -189,7 +183,6 @@ impl Layout { pub struct LayoutHalfDelta { joints: BTreeMap, segments: BTreeMap, - arcs: BTreeMap, vias: BTreeMap, polygons: BTreeMap, } @@ -204,9 +197,6 @@ impl ApplyDelta for Layout { let segments_delta = Delta::with_removed_inserted(removed.segments, inserted.segments); self.segments.apply_delta(&segments_delta); - let arcs_delta = Delta::with_removed_inserted(removed.arcs, inserted.arcs); - self.arcs.apply_delta(&arcs_delta); - let vias_delta = Delta::with_removed_inserted(removed.vias, inserted.vias); self.vias.apply_delta(&vias_delta); @@ -219,7 +209,6 @@ impl FlushDelta for Layout { fn flush_delta(&mut self) -> Delta { let (removed_joints, inserted_joints) = self.joints.flush_delta().dissolve(); let (removed_segments, inserted_segments) = self.segments.flush_delta().dissolve(); - let (removed_arcs, inserted_arcs) = self.arcs.flush_delta().dissolve(); let (removed_vias, inserted_vias) = self.vias.flush_delta().dissolve(); let (removed_polygons, inserted_polygons) = self.polygons.flush_delta().dissolve(); @@ -227,14 +216,12 @@ impl FlushDelta for Layout { LayoutHalfDelta { joints: removed_joints, segments: removed_segments, - arcs: removed_arcs, vias: removed_vias, polygons: removed_polygons, }, LayoutHalfDelta { joints: inserted_joints, segments: inserted_segments, - arcs: inserted_arcs, vias: inserted_vias, polygons: inserted_polygons, }, diff --git a/topola/src/navmesher.rs b/topola/src/navmesher.rs index 4e3aab9..fddb772 100644 --- a/topola/src/navmesher.rs +++ b/topola/src/navmesher.rs @@ -114,11 +114,6 @@ impl NavmesherBoard { self.board.add_segment(segment) } - pub fn insert_arc(&mut self, arc: Arc) -> ArcId { - // TODO: Insert into navmesh. - self.board.add_arc(arc) - } - pub fn insert_via(&mut self, via: Via) -> ViaId { // TODO: Insert into navmesh. self.board.add_via(via)