From d6d657d4011ed2eade664d42d4ffef34452c08ba Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Tue, 6 Jun 2023 12:31:50 +0200 Subject: [PATCH] Rename `ProcessedShape` to `Model` --- crates/fj-interop/src/processed_shape.rs | 2 +- crates/fj-viewer/src/camera.rs | 4 ++-- crates/fj-viewer/src/viewer.rs | 6 +++--- crates/fj-window/src/display.rs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crates/fj-interop/src/processed_shape.rs b/crates/fj-interop/src/processed_shape.rs index 5abe29c1f..f1ef7c957 100644 --- a/crates/fj-interop/src/processed_shape.rs +++ b/crates/fj-interop/src/processed_shape.rs @@ -6,7 +6,7 @@ use crate::mesh::Mesh; /// A processed shape #[derive(Clone, Debug)] -pub struct ProcessedShape { +pub struct Model { /// The axis-aligned bounding box of the shape pub aabb: Aabb<3>, diff --git a/crates/fj-viewer/src/camera.rs b/crates/fj-viewer/src/camera.rs index 5cb41ed40..39ae33dba 100644 --- a/crates/fj-viewer/src/camera.rs +++ b/crates/fj-viewer/src/camera.rs @@ -1,7 +1,7 @@ //! Viewer camera module use std::f64::consts::FRAC_PI_2; -use fj_interop::{mesh::Mesh, processed_shape::ProcessedShape}; +use fj_interop::{mesh::Mesh, processed_shape::Model}; use fj_math::{Aabb, Point, Scalar, Transform, Vector}; use crate::screen::NormalizedScreenPosition; @@ -82,7 +82,7 @@ impl Camera { pub fn focus_point( &self, cursor: Option, - shape: &ProcessedShape, + shape: &Model, ) -> FocusPoint { self.calculate_focus_point(cursor, &shape.mesh) .unwrap_or_else(|| FocusPoint(shape.aabb.center())) diff --git a/crates/fj-viewer/src/viewer.rs b/crates/fj-viewer/src/viewer.rs index b99936d6d..e2a6fe311 100644 --- a/crates/fj-viewer/src/viewer.rs +++ b/crates/fj-viewer/src/viewer.rs @@ -1,4 +1,4 @@ -use fj_interop::processed_shape::ProcessedShape; +use fj_interop::processed_shape::Model; use fj_math::Aabb; use tracing::warn; @@ -28,7 +28,7 @@ pub struct Viewer { pub renderer: Renderer, /// The shape - pub shape: Option, + pub shape: Option, } impl Viewer { @@ -60,7 +60,7 @@ impl Viewer { } /// Handle the shape being updated - pub fn handle_shape_update(&mut self, shape: ProcessedShape) { + pub fn handle_shape_update(&mut self, shape: Model) { self.renderer.update_geometry((&shape.mesh).into()); let aabb = shape.aabb; diff --git a/crates/fj-window/src/display.rs b/crates/fj-window/src/display.rs index cc06b8790..ce81f9cb7 100644 --- a/crates/fj-window/src/display.rs +++ b/crates/fj-window/src/display.rs @@ -1,4 +1,4 @@ -use fj_interop::{mesh::Mesh, processed_shape::ProcessedShape}; +use fj_interop::{mesh::Mesh, processed_shape::Model}; use fj_math::{Aabb, Point}; use fj_viewer::{ InputEvent, NormalizedScreenPosition, RendererInitError, Screen, @@ -22,7 +22,7 @@ pub fn display(mesh: Mesh>, invert_zoom: bool) -> Result<(), Error> { let window = Window::new(&event_loop)?; let mut viewer = block_on(Viewer::new(&window))?; - viewer.handle_shape_update(ProcessedShape { + viewer.handle_shape_update(Model { aabb: Aabb::<3>::from_points(mesh.vertices()), mesh, });