rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-02-27 01:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate tolerance on ShapeProcessor creation

Browse Source
This commit is contained in:
Hanno Braun 2022-03-18 13:56:05 +01:00
parent eafa7d6960
commit 0f2631fece
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fj-app/src/main.rs
View File

@ -94,9 +94,7 @@ fn main() -> anyhow::Result<()> {
// https://github.com/hannobraun/fornjot/issues/32
let shape = model.load(&parameters)?;
let shape_processor = ShapeProcessor {
tolerance: args.tolerance,
};
let shape_processor = ShapeProcessor::new(args.tolerance)?;
let mut processed_shape = shape_processor.process(&shape)?;
if let Some(path) = args.export {
@ -344,10 +342,26 @@ fn main() -> anyhow::Result<()> {
}
struct ShapeProcessor {
tolerance: Option<f64>,
tolerance: Option<Scalar>,
}
impl ShapeProcessor {
fn new(tolerance: Option<f64>) -> anyhow::Result<Self> {
if let Some(tolerance) = tolerance {
if tolerance <= 0. {
anyhow::bail!(
"Invalid user defined model deviation tolerance: {}.\n\
Tolerance must be larger than zero",
tolerance
);
}
}
let tolerance = tolerance.map(Scalar::from_f64);
Ok(Self { tolerance })
}
fn process(&self, shape: &fj::Shape) -> anyhow::Result<ProcessedShape> {
let aabb = shape.bounding_volume();
@ -369,17 +383,7 @@ impl ShapeProcessor {
tolerance
}
Some(user_defined_tolerance) => {
if user_defined_tolerance > 0.0 {
Scalar::from_f64(user_defined_tolerance)
} else {
anyhow::bail!(
"Invalid user defined model deviation tolerance: {}.\n\
Tolerance must be larger than zero",
user_defined_tolerance
)
}
}
Some(user_defined_tolerance) => user_defined_tolerance,
};
let mut debug_info = DebugInfo::new();