berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

layout: use epsilons instead of infringable lists to evade abutters

This commit is contained in:
Mikolaj Wielgus 2024-02-15 02:34:25 +00:00
parent 2197017f54
commit 6fa6ec7527
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/layout/layout.rs
View File

@ -281,7 +281,7 @@ impl<R: RulesTrait> Layout<R> {
}
if let Some(outer) = self.primitive(segbend.bend).outer() {
self.update_this_and_outward_bows(outer);
self.update_this_and_outward_bows(outer)?;
}
// Segs must not cross.
@ -309,6 +309,7 @@ impl<R: RulesTrait> Layout<R> {
&mut self,
around: LooseBendIndex,
) -> Result<(), LayoutException> {
// FIXME: Fail gracefully on infringement.
let mut maybe_rail = Some(around);
while let Some(rail) = maybe_rail {
@ -516,14 +517,7 @@ impl<R: RulesTrait> Layout<R> {
to: LooseDotIndex,
weight: SeqLooseSegWeight,
) -> Result<SeqLooseSegIndex, Infringement> {
let seg = self.add_seg_infringably(
from,
to.into(),
weight,
&self
.collect()
.bend_abutters(self.primitive(to).bend().into()),
)?;
let seg = self.add_seg_infringably(from, to.into(), weight, &[])?;
if let DotIndex::Fixed(dot) = from {
self.connectivity.update_edge(
@ -821,10 +815,11 @@ impl<R: RulesTrait> Layout<R> {
.filter(|wrapper| {
let infringee_conditions = wrapper.data.primitive(self).conditions();
inflated_shape = node
.primitive(self)
.shape()
.inflate(self.rules.clearance(&conditions, &infringee_conditions));
let epsilon = 1.0;
inflated_shape = node.primitive(self).shape().inflate(
(self.rules.clearance(&conditions, &infringee_conditions) - epsilon)
.clamp(0.0, f64::INFINITY),
);
inflated_shape.intersects(wrapper.geom())
})

4
src/main.rs
View File

@ -526,8 +526,8 @@ fn main() -> Result<(), anyhow::Error> {
dot_start,
dot_end,
3.0,
//&mut EmptyRouterObserver,
&mut DebugRouterObserver::new(&mut event_pump, &window, &mut renderer, &font_context),
&mut EmptyRouterObserver,
//&mut DebugRouterObserver::new(&mut event_pump, &window, &mut renderer, &font_context),
)?;
render_times(