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

Fix double-load of model on initialization

Browse Source
This commit is contained in:
Hanno Braun 2022-03-18 15:33:58 +01:00
parent a34e872db4
commit 920d470870
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,8 +80,6 @@ fn main() -> anyhow::Result<()> {
parameters.insert(key, value); parameters.insert(key, value);
} }
let shape = model.load(&parameters)?;
let shape_processor = ShapeProcessor::new(args.tolerance)?; let shape_processor = ShapeProcessor::new(args.tolerance)?;
if let Some(path) = args.export { if let Some(path) = args.export {
@ -131,8 +129,7 @@ fn main() -> anyhow::Result<()> {
let mut input_handler = input::Handler::new(previous_time); let mut input_handler = input::Handler::new(previous_time);
let mut renderer = block_on(Renderer::new(&window))?; let mut renderer = block_on(Renderer::new(&window))?;
let mut processed_shape = shape_processor.process(&shape); let mut processed_shape = None;
processed_shape.update_geometry(&mut renderer);
let mut draw_config = DrawConfig::default(); let mut draw_config = DrawConfig::default();
let mut camera = None; let mut camera = None;
@ -145,12 +142,14 @@ fn main() -> anyhow::Result<()> {
let now = Instant::now(); let now = Instant::now();
if let Some(shape) = watcher.receive() { if let Some(shape) = watcher.receive() {
processed_shape = shape_processor.process(&shape); let shape = shape_processor.process(&shape);
processed_shape.update_geometry(&mut renderer); shape.update_geometry(&mut renderer);
if camera.is_none() { if camera.is_none() {
camera = Some(Camera::new(&processed_shape.aabb)); camera = Some(Camera::new(&shape.aabb));
} }
processed_shape = Some(shape);
} }
match event { match event {
@ -185,11 +184,12 @@ fn main() -> anyhow::Result<()> {
event: WindowEvent::MouseInput { state, button, .. }, event: WindowEvent::MouseInput { state, button, .. },
.. ..
} => { } => {
if let Some(camera) = &camera { if let (Some(shape), Some(camera)) = (&processed_shape, &camera)
{
let focus_point = camera.focus_point( let focus_point = camera.focus_point(
&window, &window,
input_handler.cursor(), input_handler.cursor(),
&processed_shape.triangles, &shape.triangles,
); );
input_handler.handle_mouse_input( input_handler.handle_mouse_input(
@ -209,21 +209,25 @@ fn main() -> anyhow::Result<()> {
let delta_t = now.duration_since(previous_time); let delta_t = now.duration_since(previous_time);
previous_time = now; previous_time = now;
if let Some(camera) = &mut camera { if let (Some(shape), Some(camera)) =
(&processed_shape, &mut camera)
{
input_handler.update( input_handler.update(
delta_t.as_secs_f64(), delta_t.as_secs_f64(),
now, now,
camera, camera,
&window, &window,
&processed_shape.triangles, &shape.triangles,
); );
} }
window.inner().request_redraw(); window.inner().request_redraw();
} }
Event::RedrawRequested(_) => { Event::RedrawRequested(_) => {
if let Some(camera) = &mut camera { if let (Some(shape), Some(camera)) =
camera.update_planes(&processed_shape.aabb); (&processed_shape, &mut camera)
{
camera.update_planes(&shape.aabb);
match renderer.draw(camera, &draw_config) { match renderer.draw(camera, &draw_config) {
Ok(()) => {} Ok(()) => {}