lib: handle floating-point precision edge case for setting origin w/ loop

master
Sameer Puri 4 years ago
parent 171387643e
commit 00589256fb

@ -246,31 +246,47 @@ pub fn svg2program<'a, 'input: 'a>(
options: ConversionOptions, options: ConversionOptions,
machine: Machine<'input>, machine: Machine<'input>,
) -> Vec<Token<'input>> { ) -> Vec<Token<'input>> {
let bounding_box = { let mut origin_transform = Transform2D::identity();
let mut visitor = ConversionVisitor { loop {
terrarium: Terrarium::new(PreprocessTurtle::default()), let bounding_box = {
config, let mut visitor = ConversionVisitor {
options: options.clone(), terrarium: Terrarium::new(PreprocessTurtle::default()),
name_stack: vec![], config,
options: options.clone(),
name_stack: vec![],
};
visitor.terrarium.push_transform(origin_transform);
visitor.begin();
visit::depth_first_visit(doc, &mut visitor);
visitor.end();
visitor.terrarium.pop_transform();
visitor.terrarium.turtle.bounding_box
}; };
visitor.begin(); if (!bounding_box.min.x.is_sign_negative() && !bounding_box.min.y.is_sign_negative())
visit::depth_first_visit(doc, &mut visitor); || bounding_box
visitor.end(); .min
.to_vector()
visitor.terrarium.turtle.bounding_box .abs()
}; .lower_than(vector(std::f64::EPSILON, std::f64::EPSILON))
.all()
let origin_transform = { {
let mut transform = Transform2D::identity(); break;
if let Some(origin_x) = config.origin[0] {
transform = transform.then_translate(vector(origin_x - bounding_box.min.x, 0.));
} }
if let Some(origin_y) = config.origin[1] {
transform = transform.then_translate(vector(0., origin_y - bounding_box.min.y)); origin_transform = origin_transform.then(&{
} let mut transform = Transform2D::identity();
transform if let Some(origin_x) = config.origin[0] {
}; transform = transform.then_translate(vector(origin_x - bounding_box.min.x, 0.));
}
if let Some(origin_y) = config.origin[1] {
transform = transform.then_translate(vector(0., origin_y - bounding_box.min.y));
}
transform
});
}
let mut conversion_visitor = ConversionVisitor { let mut conversion_visitor = ConversionVisitor {
terrarium: Terrarium::new(GCodeTurtle { terrarium: Terrarium::new(GCodeTurtle {

Loading…
Cancel
Save