rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-09 12:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate redundant type definitions

Browse Source
This commit is contained in:
Hanno Braun 2024-10-14 21:46:19 +02:00
parent 748cef852e
commit 4a778e2f88
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/fj-core/src/geometry/surfaces/transformed_surface.rs
View File

@ -1,13 +1,11 @@
use std::sync::Arc;
use fj_math::{Aabb, Point, Scalar, Transform, Triangle}; use fj_math::{Aabb, Point, Scalar, Transform, Triangle};
use crate::geometry::{traits::GenTriMesh, Tolerance}; use crate::geometry::{traits::GenTriMesh, SurfaceGeom, Tolerance};
/// # A surface that is a transformation of another surface /// # A surface that is a transformation of another surface
pub struct TransformedSurface { pub struct TransformedSurface {
/// # The original surface that is being transformed /// # The original surface that is being transformed
pub surface: Arc<dyn GenTriMesh>, pub surface: SurfaceGeom,
/// # The transform that is applied to the original surface /// # The transform that is applied to the original surface
pub transform: Transform, pub transform: Transform,
@ -15,7 +13,8 @@ pub struct TransformedSurface {
impl GenTriMesh for TransformedSurface { impl GenTriMesh for TransformedSurface {
fn origin(&self) -> Point<3> { fn origin(&self) -> Point<3> {
self.transform.transform_point(&self.surface.origin()) self.transform
.transform_point(&self.surface.geometry.origin())
} }
fn triangle_at( fn triangle_at(
@ -24,7 +23,7 @@ impl GenTriMesh for TransformedSurface {
tolerance: Tolerance, tolerance: Tolerance,
) -> (Triangle<3>, [Scalar; 3]) { ) -> (Triangle<3>, [Scalar; 3]) {
let (triangle, barycentric_coords) = let (triangle, barycentric_coords) =
self.surface.triangle_at(point_surface, tolerance); self.surface.geometry.triangle_at(point_surface, tolerance);
let triangle = self.transform.transform_triangle(&triangle); let triangle = self.transform.transform_triangle(&triangle);
@ -38,6 +37,6 @@ impl GenTriMesh for TransformedSurface {
) -> Vec<Point<2>> { ) -> Vec<Point<2>> {
// The triangle mesh is generated in 2D surface coordinates. No need to // The triangle mesh is generated in 2D surface coordinates. No need to
// transform that. // transform that.
self.surface.generate_tri_mesh(boundary, tolerance) self.surface.geometry.generate_tri_mesh(boundary, tolerance)
} }
} }