rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-02-07 15:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Hanno Braun 2022-04-12 17:48:08 +02:00
parent f1a0b02065
commit b7a1b34397
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@ mod window;
use std::path::PathBuf; use std::path::PathBuf;
use std::time::Instant; use std::time::Instant;
use anyhow::anyhow;
use fj_host::{Model, Parameters}; use fj_host::{Model, Parameters};
use fj_interop::{debug::DebugInfo, mesh::Mesh}; use fj_interop::{debug::DebugInfo, mesh::Mesh};
use fj_kernel::algorithms::{triangulate, Tolerance}; use fj_kernel::algorithms::{triangulate, Tolerance};
@ -48,17 +49,13 @@ fn main() -> anyhow::Result<()> {
let config = Config::load()?; let config = Config::load()?;
let mut path = config.default_path.unwrap_or_else(|| PathBuf::from("")); let mut path = config.default_path.unwrap_or_else(|| PathBuf::from(""));
match args.model.or(config.default_model) { let model = args.model.or(config.default_model).ok_or_else(|| {
Some(model) => { anyhow!(
path.push(model); "No model specified, and no default model configured.\n\
}
None => {
anyhow::bail!(
"No model specified, and no default model configured.\n\
Specify a model by passing `--model path/to/model`." Specify a model by passing `--model path/to/model`."
); )
} })?;
} path.push(model);
let model = Model::from_path(path, config.target_dir)?; let model = Model::from_path(path, config.target_dir)?;
let parameters = args.parameters.unwrap_or_else(Parameters::empty); let parameters = args.parameters.unwrap_or_else(Parameters::empty);