Remove redundant re-export

This commit is contained in:
Hanno Braun 2025-03-21 23:11:08 +01:00
parent 0a94adf4ea
commit 6460040f62
9 changed files with 18 additions and 19 deletions

View File

@ -1,5 +1,6 @@
use std::sync::Arc; use std::sync::Arc;
use fj_interop::TriMesh;
use winit::{ use winit::{
application::ApplicationHandler, application::ApplicationHandler,
event::{KeyEvent, WindowEvent}, event::{KeyEvent, WindowEvent},
@ -8,7 +9,7 @@ use winit::{
window::{Window, WindowAttributes, WindowId}, window::{Window, WindowAttributes, WindowId},
}; };
use crate::{geometry::TriMesh, render::Renderer}; use crate::render::Renderer;
pub fn run(tri_mesh: TriMesh) -> anyhow::Result<()> { pub fn run(tri_mesh: TriMesh) -> anyhow::Result<()> {
let event_loop = EventLoop::new()?; let event_loop = EventLoop::new()?;

View File

@ -1,6 +1,6 @@
use std::{collections::BTreeMap, fs::File}; use std::{collections::BTreeMap, fs::File};
use crate::geometry::TriMesh; use fj_interop::TriMesh;
pub fn export(tri_mesh: &TriMesh) -> anyhow::Result<()> { pub fn export(tri_mesh: &TriMesh) -> anyhow::Result<()> {
let mut indices_by_vertex = BTreeMap::new(); let mut indices_by_vertex = BTreeMap::new();

View File

@ -3,12 +3,12 @@ use std::{
mem, mem,
}; };
use fj_interop::{Color, MeshTriangle}; use fj_interop::{Color, MeshTriangle, TriMesh};
use fj_math::{Point, Triangle}; use fj_math::{Point, Triangle};
use geo::{Contains, Coord, LineString, Polygon}; use geo::{Contains, Coord, LineString, Polygon};
use spade::Triangulation; use spade::Triangulation;
use crate::{geometry::TriMesh, topology::face::Face}; use crate::topology::face::Face;
pub fn triangulate(face: &Face) -> TriMesh { pub fn triangulate(face: &Face) -> TriMesh {
let points = points(face); let points = points(face);

View File

@ -3,5 +3,3 @@ mod surface;
mod tri_mesh; mod tri_mesh;
pub use self::{sketch::Sketch, surface::SurfaceGeometry, tri_mesh::ToTriMesh}; pub use self::{sketch::Sketch, surface::SurfaceGeometry, tri_mesh::ToTriMesh};
pub use fj_interop::TriMesh;

View File

@ -1,7 +1,8 @@
use fj_interop::TriMesh;
use fj_math::{Point, Vector}; use fj_math::{Point, Vector};
use crate::{ use crate::{
geometry::{Sketch, ToTriMesh, TriMesh}, geometry::{Sketch, ToTriMesh},
handle::Handle, handle::Handle,
math::{Bivector, Plane}, math::{Bivector, Plane},
operations::sweep::SweepExt, operations::sweep::SweepExt,

View File

@ -1,8 +1,7 @@
use fj_interop::TriMesh;
use glam::Vec3; use glam::Vec3;
use wgpu::util::DeviceExt; use wgpu::util::DeviceExt;
use crate::geometry::TriMesh;
use super::vertex::Vertex; use super::vertex::Vertex;
pub struct Geometry { pub struct Geometry {
@ -19,7 +18,10 @@ impl Geometry {
for triangle in tri_mesh.all_triangles() { for triangle in tri_mesh.all_triangles() {
let triangle = triangle.points.each_ref().map(|point| { let triangle = triangle.points.each_ref().map(|point| {
Vec3::from( Vec3::from(
point.coords.components.map(|coord| coord.into_f64() as f32), point
.coords
.components
.map(|coord| coord.into_f64() as f32),
) )
}); });
let normal = { let normal = {

View File

@ -1,10 +1,9 @@
use std::sync::Arc; use std::sync::Arc;
use anyhow::anyhow; use anyhow::anyhow;
use fj_interop::TriMesh;
use winit::window::Window; use winit::window::Window;
use crate::geometry::TriMesh;
use super::{geometry::Geometry, pipeline::Pipeline}; use super::{geometry::Geometry, pipeline::Pipeline};
pub struct Renderer { pub struct Renderer {

View File

@ -1,9 +1,8 @@
use fj_interop::TriMesh;
use itertools::Itertools; use itertools::Itertools;
use crate::{ use crate::{
extra::triangulate::triangulate, extra::triangulate::triangulate, geometry::ToTriMesh, handle::Handle,
geometry::{ToTriMesh, TriMesh},
handle::Handle,
}; };
use super::{half_edge::HalfEdge, surface::Surface, vertex::Vertex}; use super::{half_edge::HalfEdge, surface::Surface, vertex::Vertex};

View File

@ -1,7 +1,6 @@
use crate::{ use fj_interop::TriMesh;
geometry::{ToTriMesh, TriMesh},
handle::Handle, use crate::{geometry::ToTriMesh, handle::Handle};
};
use super::face::Face; use super::face::Face;