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

Consolidate duplicated code

Browse Source
This commit is contained in:
Hanno Braun 2022-03-18 14:01:40 +01:00
parent 15439c9586
commit f1feff2879
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,11 +201,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))?;
renderer.update_geometry( processed_shape.update_geometry(&mut renderer);
(&processed_shape.triangles).into(),
(&processed_shape.debug_info).into(),
processed_shape.aabb,
);
let mut draw_config = DrawConfig::default(); let mut draw_config = DrawConfig::default();
let mut camera = Camera::new(&processed_shape.aabb); let mut camera = Camera::new(&processed_shape.aabb);
@ -220,12 +216,7 @@ fn main() -> anyhow::Result<()> {
match watcher_rx.try_recv() { match watcher_rx.try_recv() {
Ok(shape) => { Ok(shape) => {
processed_shape = shape_processor.process(&shape); processed_shape = shape_processor.process(&shape);
processed_shape.update_geometry(&mut renderer);
renderer.update_geometry(
(&processed_shape.triangles).into(),
(&processed_shape.debug_info).into(),
processed_shape.aabb,
);
} }
Err(mpsc::TryRecvError::Empty) => { Err(mpsc::TryRecvError::Empty) => {
// Nothing to receive from the channel. We don't care. // Nothing to receive from the channel. We don't care.
@ -392,3 +383,13 @@ struct ProcessedShape {
triangles: Vec<Triangle<3>>, triangles: Vec<Triangle<3>>,
debug_info: DebugInfo, debug_info: DebugInfo,
} }
impl ProcessedShape {
fn update_geometry(&self, renderer: &mut Renderer) {
renderer.update_geometry(
(&self.triangles).into(),
(&self.debug_info).into(),
self.aabb,
);
}
}