From cae8656c8a242017f826290410e484a00f09d505 Mon Sep 17 00:00:00 2001 From: Artem Novikov Date: Tue, 19 Nov 2024 17:52:16 +0300 Subject: [PATCH] refactor | s&t : export all through sal-3dlib --- crates/sal-3dlib-core/Cargo.toml | 4 +++ .../src/bound.rs | 0 .../src/gmath.rs | 0 .../src/gmath/point.rs | 0 .../src/gmath/vector.rs | 0 crates/sal-3dlib-core/src/lib.rs | 8 +++++ .../{sal-3dlib => sal-3dlib-core}/src/ops.rs | 0 .../src/ops/boolean.rs | 0 .../src/ops/boolean/volume.rs | 0 .../src/ops/transform.rs | 0 .../src/props.rs | 0 .../src/topology.rs | 0 .../src/topology/shape.rs | 0 .../src/topology/shape/compound.rs | 0 .../src/topology/shape/edge.rs | 0 .../src/topology/shape/face.rs | 0 .../src/topology/shape/shell.rs | 0 .../src/topology/shape/solid.rs | 0 .../src/topology/shape/vertex.rs | 0 .../src/topology/shape/wire.rs | 0 crates/sal-3dlib/Cargo.toml | 13 ++++++- crates/sal-3dlib/src/lib.rs | 35 ++++++++++++++----- .../tests/hull_shell.step | 0 .../tests/integration_test.rs | 13 +++++-- crates/sal-occt-rs/Cargo.toml | 2 +- crates/sal-occt-rs/src/fs.rs | 2 +- crates/sal-occt-rs/src/gmath.rs | 8 ++--- crates/sal-occt-rs/src/lib.rs | 28 ++++++++------- crates/sal-occt-rs/src/ops.rs | 2 +- crates/sal-occt-rs/src/ops/boolean.rs | 8 ++--- crates/sal-occt-rs/src/ops/boolean/volume.rs | 8 ++--- crates/sal-occt-rs/src/topology.rs | 2 +- crates/sal-occt-rs/src/topology/shape.rs | 16 +++++---- .../src/topology/shape/compound.rs | 2 +- crates/sal-occt-rs/src/topology/shape/face.rs | 2 +- .../sal-occt-rs/src/topology/shape/shell.rs | 2 +- .../sal-occt-rs/src/topology/shape/solid.rs | 2 +- .../sal-occt-rs/src/topology/shape/vertex.rs | 2 +- crates/sal-occt-rs/src/topology/shape/wire.rs | 2 +- 39 files changed, 108 insertions(+), 53 deletions(-) create mode 100644 crates/sal-3dlib-core/Cargo.toml rename crates/{sal-3dlib => sal-3dlib-core}/src/bound.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/gmath.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/gmath/point.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/gmath/vector.rs (100%) create mode 100644 crates/sal-3dlib-core/src/lib.rs rename crates/{sal-3dlib => sal-3dlib-core}/src/ops.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/ops/boolean.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/ops/boolean/volume.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/ops/transform.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/props.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/compound.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/edge.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/face.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/shell.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/solid.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/vertex.rs (100%) rename crates/{sal-3dlib => sal-3dlib-core}/src/topology/shape/wire.rs (100%) rename crates/{sal-occt-rs => sal-3dlib}/tests/hull_shell.step (100%) rename crates/{sal-occt-rs => sal-3dlib}/tests/integration_test.rs (98%) diff --git a/crates/sal-3dlib-core/Cargo.toml b/crates/sal-3dlib-core/Cargo.toml new file mode 100644 index 0000000..93eed57 --- /dev/null +++ b/crates/sal-3dlib-core/Cargo.toml @@ -0,0 +1,4 @@ +[package] +name = "sal-3dlib-core" +version = "0.0.1" +edition = "2021" diff --git a/crates/sal-3dlib/src/bound.rs b/crates/sal-3dlib-core/src/bound.rs similarity index 100% rename from crates/sal-3dlib/src/bound.rs rename to crates/sal-3dlib-core/src/bound.rs diff --git a/crates/sal-3dlib/src/gmath.rs b/crates/sal-3dlib-core/src/gmath.rs similarity index 100% rename from crates/sal-3dlib/src/gmath.rs rename to crates/sal-3dlib-core/src/gmath.rs diff --git a/crates/sal-3dlib/src/gmath/point.rs b/crates/sal-3dlib-core/src/gmath/point.rs similarity index 100% rename from crates/sal-3dlib/src/gmath/point.rs rename to crates/sal-3dlib-core/src/gmath/point.rs diff --git a/crates/sal-3dlib/src/gmath/vector.rs b/crates/sal-3dlib-core/src/gmath/vector.rs similarity index 100% rename from crates/sal-3dlib/src/gmath/vector.rs rename to crates/sal-3dlib-core/src/gmath/vector.rs diff --git a/crates/sal-3dlib-core/src/lib.rs b/crates/sal-3dlib-core/src/lib.rs new file mode 100644 index 0000000..3c3f1e8 --- /dev/null +++ b/crates/sal-3dlib-core/src/lib.rs @@ -0,0 +1,8 @@ +//! Abstact definition of objects and operations over the CAD kernel. +//! It is assumed that the kernel is universal, but it implements all the necessary traits. +// +pub mod bound; +pub mod gmath; +pub mod ops; +pub mod props; +pub mod topology; diff --git a/crates/sal-3dlib/src/ops.rs b/crates/sal-3dlib-core/src/ops.rs similarity index 100% rename from crates/sal-3dlib/src/ops.rs rename to crates/sal-3dlib-core/src/ops.rs diff --git a/crates/sal-3dlib/src/ops/boolean.rs b/crates/sal-3dlib-core/src/ops/boolean.rs similarity index 100% rename from crates/sal-3dlib/src/ops/boolean.rs rename to crates/sal-3dlib-core/src/ops/boolean.rs diff --git a/crates/sal-3dlib/src/ops/boolean/volume.rs b/crates/sal-3dlib-core/src/ops/boolean/volume.rs similarity index 100% rename from crates/sal-3dlib/src/ops/boolean/volume.rs rename to crates/sal-3dlib-core/src/ops/boolean/volume.rs diff --git a/crates/sal-3dlib/src/ops/transform.rs b/crates/sal-3dlib-core/src/ops/transform.rs similarity index 100% rename from crates/sal-3dlib/src/ops/transform.rs rename to crates/sal-3dlib-core/src/ops/transform.rs diff --git a/crates/sal-3dlib/src/props.rs b/crates/sal-3dlib-core/src/props.rs similarity index 100% rename from crates/sal-3dlib/src/props.rs rename to crates/sal-3dlib-core/src/props.rs diff --git a/crates/sal-3dlib/src/topology.rs b/crates/sal-3dlib-core/src/topology.rs similarity index 100% rename from crates/sal-3dlib/src/topology.rs rename to crates/sal-3dlib-core/src/topology.rs diff --git a/crates/sal-3dlib/src/topology/shape.rs b/crates/sal-3dlib-core/src/topology/shape.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape.rs rename to crates/sal-3dlib-core/src/topology/shape.rs diff --git a/crates/sal-3dlib/src/topology/shape/compound.rs b/crates/sal-3dlib-core/src/topology/shape/compound.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/compound.rs rename to crates/sal-3dlib-core/src/topology/shape/compound.rs diff --git a/crates/sal-3dlib/src/topology/shape/edge.rs b/crates/sal-3dlib-core/src/topology/shape/edge.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/edge.rs rename to crates/sal-3dlib-core/src/topology/shape/edge.rs diff --git a/crates/sal-3dlib/src/topology/shape/face.rs b/crates/sal-3dlib-core/src/topology/shape/face.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/face.rs rename to crates/sal-3dlib-core/src/topology/shape/face.rs diff --git a/crates/sal-3dlib/src/topology/shape/shell.rs b/crates/sal-3dlib-core/src/topology/shape/shell.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/shell.rs rename to crates/sal-3dlib-core/src/topology/shape/shell.rs diff --git a/crates/sal-3dlib/src/topology/shape/solid.rs b/crates/sal-3dlib-core/src/topology/shape/solid.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/solid.rs rename to crates/sal-3dlib-core/src/topology/shape/solid.rs diff --git a/crates/sal-3dlib/src/topology/shape/vertex.rs b/crates/sal-3dlib-core/src/topology/shape/vertex.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/vertex.rs rename to crates/sal-3dlib-core/src/topology/shape/vertex.rs diff --git a/crates/sal-3dlib/src/topology/shape/wire.rs b/crates/sal-3dlib-core/src/topology/shape/wire.rs similarity index 100% rename from crates/sal-3dlib/src/topology/shape/wire.rs rename to crates/sal-3dlib-core/src/topology/shape/wire.rs diff --git a/crates/sal-3dlib/Cargo.toml b/crates/sal-3dlib/Cargo.toml index 8cf334e..e10c30c 100644 --- a/crates/sal-3dlib/Cargo.toml +++ b/crates/sal-3dlib/Cargo.toml @@ -1,4 +1,15 @@ [package] name = "sal-3dlib" -version = "0.0.1" +version = "0.1.0" edition = "2021" + +[dependencies] +sal-3dlib-core = { path = "../sal-3dlib-core/" } +sal-occt-rs = { path = "../sal-occt-rs/" } + +[dev-dependencies] +debugging.workspace = true +env_logger.workspace = true +log.workspace = true +testing.workspace = true +sal-sync.workspace = true diff --git a/crates/sal-3dlib/src/lib.rs b/crates/sal-3dlib/src/lib.rs index 6081f19..a8c4d9a 100644 --- a/crates/sal-3dlib/src/lib.rs +++ b/crates/sal-3dlib/src/lib.rs @@ -1,9 +1,28 @@ -//! This is a set of modules for interacting with the CAD kernel. -//! It is assumed that the kernel is universal, -//! but it implements all the necessary traits. +//! Set of modules for interacting with the CAD kernel. +//! +//! Main objects and operations are defined in the core module (see [sal_3dlib_core]). +//! +//! [sal_occt_rs] provides an implementation of the core. // -pub mod bound; -pub mod gmath; -pub mod ops; -pub mod props; -pub mod topology; +pub use sal_3dlib_core::bound; +pub use sal_occt_rs::fs; +pub use sal_occt_rs::gmath; +/// +/// Operations for creating, transforming, and modifying objects. +pub mod ops { + /// + /// Create new objects from combinations of two groups of objects. + pub mod boolean { + /// + /// Build an elementary volume from a set of objects. + pub mod volume { + pub use sal_3dlib_core::ops::boolean::volume::*; + pub use sal_occt_rs::ops::boolean::volume::VolumeConf; + } + pub use sal_3dlib_core::ops::boolean::*; + pub use sal_occt_rs::ops::boolean::OpConf; + } + pub use sal_3dlib_core::ops::{transform, Polygon}; +} +pub use sal_3dlib_core::props; +pub use sal_occt_rs::export::topology; diff --git a/crates/sal-occt-rs/tests/hull_shell.step b/crates/sal-3dlib/tests/hull_shell.step similarity index 100% rename from crates/sal-occt-rs/tests/hull_shell.step rename to crates/sal-3dlib/tests/hull_shell.step diff --git a/crates/sal-occt-rs/tests/integration_test.rs b/crates/sal-3dlib/tests/integration_test.rs similarity index 98% rename from crates/sal-occt-rs/tests/integration_test.rs rename to crates/sal-3dlib/tests/integration_test.rs index e4c8149..4c12b02 100644 --- a/crates/sal-occt-rs/tests/integration_test.rs +++ b/crates/sal-3dlib/tests/integration_test.rs @@ -1,14 +1,21 @@ use debugging::session::debug_session::{Backtrace, DebugSession, LogLevel}; use sal_3dlib::{ + fs::Reader, + gmath::Vector, ops::{ - boolean::{volume::Volume, Intersect}, + boolean::{ + volume::{Volume, VolumeConf}, + Intersect, OpConf, + }, transform::{Rotate, Translate}, Polygon, }, props::{Center, Metadata, Volume as _}, - topology::Vertex, + topology::{ + shape::{Face, Vertex, Wire}, + Shape, + }, }; -use sal_occt_rs::{fs::Reader, prelude::*}; use std::{ f64::consts::PI, sync::Once, diff --git a/crates/sal-occt-rs/Cargo.toml b/crates/sal-occt-rs/Cargo.toml index 3e96cf4..5ecf9fe 100644 --- a/crates/sal-occt-rs/Cargo.toml +++ b/crates/sal-occt-rs/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" anyhow = "1.0.93" cxx = "1.0.130" glam = { version = "0.24", features = ["bytemuck"] } -sal-3dlib = { path = "../sal-3dlib/" } +sal-3dlib-core = { path = "../sal-3dlib-core/" } opencascade = { git = "https://github.com/novartole/opencascade-rs.git", branch = "dev" } [dev-dependencies] diff --git a/crates/sal-occt-rs/src/fs.rs b/crates/sal-occt-rs/src/fs.rs index 41b92d2..65341ae 100644 --- a/crates/sal-occt-rs/src/fs.rs +++ b/crates/sal-occt-rs/src/fs.rs @@ -2,7 +2,7 @@ // use crate::{prelude, topology::shape}; use opencascade::primitives::{self, ShapeType}; -use sal_3dlib::props::Attributes; +use sal_3dlib_core::props::Attributes; use std::path::Path; /// /// Reader of various file format. diff --git a/crates/sal-occt-rs/src/gmath.rs b/crates/sal-occt-rs/src/gmath.rs index fe92158..64ee362 100644 --- a/crates/sal-occt-rs/src/gmath.rs +++ b/crates/sal-occt-rs/src/gmath.rs @@ -1,16 +1,16 @@ -//! Implementation of [sal_3dlib::gmath]. +//! Implementation of [sal_3dlib_core::gmath]. // mod point; mod vector; // -use sal_3dlib::gmath; +use sal_3dlib_core::gmath; /// /// Location in 3-dimensional space. /// -/// See [sal_3dlib::gmath::Point] for details. +/// See [sal_3dlib_core::gmath::Point] for details. pub type Point = gmath::Point<3>; /// /// Displacment in 3-dimensional space. /// -/// See [sal_3dlib::gmath::Vector] for details. +/// See [sal_3dlib_core::gmath::Vector] for details. pub struct Vector(pub(crate) gmath::Vector<3>); diff --git a/crates/sal-occt-rs/src/lib.rs b/crates/sal-occt-rs/src/lib.rs index d72ad13..301da77 100644 --- a/crates/sal-occt-rs/src/lib.rs +++ b/crates/sal-occt-rs/src/lib.rs @@ -1,4 +1,4 @@ -//! Implementation of [sal_3dlib] taking [opencascade] as the CAD kernel. +//! Implementation of [sal_3dlib_core] taking [opencascade] as the CAD kernel. // pub mod fs; pub mod gmath; @@ -6,37 +6,41 @@ pub mod ops; #[cfg(test)] mod tests; mod topology; -mod export { +pub mod export { + /// + /// Implementation of [sal_3dlib_core::topology]. pub mod topology { + /// + /// Implementation of [sal_3dlib_core::topology]. pub mod shape { - use sal_3dlib::topology; + use sal_3dlib_core::topology; /// - /// See [sal_3dlib::topology::Vertex] for details. + /// See [sal_3dlib_core::topology::Vertex] for details. pub type Vertex = topology::Vertex<3, super::Vertex, T>; /// - /// See [sal_3dlib::topology::Edge] for details. + /// See [sal_3dlib_core::topology::Edge] for details. pub type Edge = topology::Edge<3, super::Edge, T>; /// - /// See [sal_3dlib::topology::Wire] for details. + /// See [sal_3dlib_core::topology::Wire] for details. pub type Wire = topology::Wire<3, super::Wire, T>; /// - /// See [sal_3dlib::topology::Face] for details. + /// See [sal_3dlib_core::topology::Face] for details. pub type Face = topology::Face<3, super::Face, T>; /// - /// See [sal_3dlib::topology::Shell] for details. + /// See [sal_3dlib_core::topology::Shell] for details. pub type Shell = topology::Shell<3, super::Shell, T>; /// - /// See [sal_3dlib::topology::Solid] for details. + /// See [sal_3dlib_core::topology::Solid] for details. pub type Solid = topology::Solid<3, super::Solid, T>; /// - /// See [sal_3dlib::topology::Compound] for details. + /// See [sal_3dlib_core::topology::Compound] for details. pub type Compound = topology::Compound<3, super::Compound, T>; } // use crate::topology::shape::*; - use sal_3dlib::topology; + use sal_3dlib_core::topology; /// - /// See [sal_3dlib::topology::Shape] for details. + /// See [sal_3dlib_core::topology::Shape] for details. pub type Shape = topology::Shape<3, Vertex, Edge, Wire, Face, Shell, Solid, Compound, T>; } } diff --git a/crates/sal-occt-rs/src/ops.rs b/crates/sal-occt-rs/src/ops.rs index 5773a5f..ddc1391 100644 --- a/crates/sal-occt-rs/src/ops.rs +++ b/crates/sal-occt-rs/src/ops.rs @@ -1,3 +1,3 @@ -//! Implementation of [sal_3dlib::ops]. +//! Implementation of [sal_3dlib_core::ops]. // pub mod boolean; diff --git a/crates/sal-occt-rs/src/ops/boolean.rs b/crates/sal-occt-rs/src/ops/boolean.rs index dfac19b..52206e5 100644 --- a/crates/sal-occt-rs/src/ops/boolean.rs +++ b/crates/sal-occt-rs/src/ops/boolean.rs @@ -1,14 +1,14 @@ -//! Implementation of [sal_3dlib::ops::boolean]. +//! Implementation of [sal_3dlib_core::ops::boolean]. // pub mod volume; // -use sal_3dlib::ops::boolean; +use sal_3dlib_core::ops::boolean; /// -/// See [sal_3dlib::ops::boolean::OpConf] for details. +/// See [sal_3dlib_core::ops::boolean::OpConf] for details. #[derive(Clone, Copy)] pub struct OpConf { /// - /// See [sal_3dlib::ops::boolean::OpConf::parallel] for details. + /// See [sal_3dlib_core::ops::boolean::OpConf::parallel] for details. pub parallel: bool, } // diff --git a/crates/sal-occt-rs/src/ops/boolean/volume.rs b/crates/sal-occt-rs/src/ops/boolean/volume.rs index 6273b9d..705fb39 100644 --- a/crates/sal-occt-rs/src/ops/boolean/volume.rs +++ b/crates/sal-occt-rs/src/ops/boolean/volume.rs @@ -1,13 +1,13 @@ -//! Implementation of [sal_3dlib::ops::boolean::volume]. +//! Implementation of [sal_3dlib_core::ops::boolean::volume]. // use super::*; -use sal_3dlib::ops::boolean::volume; +use sal_3dlib_core::ops::boolean::volume; /// -/// See [sal_3dlib::ops::boolean::volume::VolumeConf] for details. +/// See [sal_3dlib_core::ops::boolean::volume::VolumeConf] for details. #[derive(Clone, Copy)] pub struct VolumeConf { /// - /// See [sal_3dlib::ops::boolean::OpConf::parallel] for details. + /// See [sal_3dlib_core::ops::boolean::OpConf::parallel] for details. pub parallel: bool, } // diff --git a/crates/sal-occt-rs/src/topology.rs b/crates/sal-occt-rs/src/topology.rs index a290b5b..b0c82dd 100644 --- a/crates/sal-occt-rs/src/topology.rs +++ b/crates/sal-occt-rs/src/topology.rs @@ -1,3 +1,3 @@ -//! Implementation of [sal_3dlib::topology]. +//! Inner structures used for [sal_3dlib_core::topology::Shape]. // pub mod shape; diff --git a/crates/sal-occt-rs/src/topology/shape.rs b/crates/sal-occt-rs/src/topology/shape.rs index c88db53..ef86c6a 100644 --- a/crates/sal-occt-rs/src/topology/shape.rs +++ b/crates/sal-occt-rs/src/topology/shape.rs @@ -1,3 +1,5 @@ +//! Inner structures used for [sal_3dlib_core::topology]. +// #![allow(dead_code)] // mod compound; @@ -9,25 +11,25 @@ mod wire; // use opencascade::primitives; /// -/// Implementation of [sal_3dlib::topology::Vertex]. +/// Implementation of [sal_3dlib_core::topology::Vertex]. pub struct Vertex(pub(crate) primitives::Vertex); /// -/// Implementation of [sal_3dlib::topology::Edge]. +/// Implementation of [sal_3dlib_core::topology::Edge]. pub struct Edge(pub(crate) primitives::Edge); /// -/// Implementation of [sal_3dlib::topology::Wire]. +/// Implementation of [sal_3dlib_core::topology::Wire]. pub struct Wire(pub(crate) primitives::Wire); /// -/// Implementation of [sal_3dlib::topology::Face]. +/// Implementation of [sal_3dlib_core::topology::Face]. #[derive(Clone)] pub struct Face(pub(crate) primitives::Face); /// -/// Implementation of [sal_3dlib::topology::Shell]. +/// Implementation of [sal_3dlib_core::topology::Shell]. #[derive(Clone)] pub struct Shell(pub(crate) primitives::Shell); /// -/// Implementation of [sal_3dlib::topology::Solid]. +/// Implementation of [sal_3dlib_core::topology::Solid]. pub struct Solid(pub(crate) primitives::Solid); /// -/// Implementation of [sal_3dlib::topology::Compound]. +/// Implementation of [sal_3dlib_core::topology::Compound]. pub struct Compound(pub(crate) primitives::Compound); diff --git a/crates/sal-occt-rs/src/topology/shape/compound.rs b/crates/sal-occt-rs/src/topology/shape/compound.rs index af8999c..543fec3 100644 --- a/crates/sal-occt-rs/src/topology/shape/compound.rs +++ b/crates/sal-occt-rs/src/topology/shape/compound.rs @@ -1,5 +1,5 @@ use super::*; -use sal_3dlib::props::Center; +use sal_3dlib_core::props::Center; // // impl Center for Compound { diff --git a/crates/sal-occt-rs/src/topology/shape/face.rs b/crates/sal-occt-rs/src/topology/shape/face.rs index bb60676..ba06967 100644 --- a/crates/sal-occt-rs/src/topology/shape/face.rs +++ b/crates/sal-occt-rs/src/topology/shape/face.rs @@ -1,7 +1,7 @@ use super::*; use crate::gmath::Vector; use glam::DVec3; -use sal_3dlib::{ +use sal_3dlib_core::{ ops::transform::{Rotate, Translate}, props::{Area, Center}, }; diff --git a/crates/sal-occt-rs/src/topology/shape/shell.rs b/crates/sal-occt-rs/src/topology/shape/shell.rs index 238aac7..ac07e4a 100644 --- a/crates/sal-occt-rs/src/topology/shape/shell.rs +++ b/crates/sal-occt-rs/src/topology/shape/shell.rs @@ -1,7 +1,7 @@ use super::*; use crate::ops::boolean::volume::VolumeConf; use anyhow::Result; -use sal_3dlib::{ops::boolean::volume::Volume, props::Center}; +use sal_3dlib_core::{ops::boolean::volume::Volume, props::Center}; // // impl Volume> for Shell { diff --git a/crates/sal-occt-rs/src/topology/shape/solid.rs b/crates/sal-occt-rs/src/topology/shape/solid.rs index 60bd235..1b696aa 100644 --- a/crates/sal-occt-rs/src/topology/shape/solid.rs +++ b/crates/sal-occt-rs/src/topology/shape/solid.rs @@ -1,7 +1,7 @@ use super::*; use crate::ops::boolean::OpConf; use primitives::IntoShape; -use sal_3dlib::{ops::boolean::Intersect, props::Volume}; +use sal_3dlib_core::{ops::boolean::Intersect, props::Volume}; // // impl Volume for Solid { diff --git a/crates/sal-occt-rs/src/topology/shape/vertex.rs b/crates/sal-occt-rs/src/topology/shape/vertex.rs index cea01d1..e50354b 100644 --- a/crates/sal-occt-rs/src/topology/shape/vertex.rs +++ b/crates/sal-occt-rs/src/topology/shape/vertex.rs @@ -1,7 +1,7 @@ use super::*; use crate::gmath::Point; use glam::DVec3; -use sal_3dlib::props::Dist; +use sal_3dlib_core::props::Dist; // // impl From for Vertex { diff --git a/crates/sal-occt-rs/src/topology/shape/wire.rs b/crates/sal-occt-rs/src/topology/shape/wire.rs index 57b1d6b..483b6be 100644 --- a/crates/sal-occt-rs/src/topology/shape/wire.rs +++ b/crates/sal-occt-rs/src/topology/shape/wire.rs @@ -1,7 +1,7 @@ use super::*; use crate::gmath::Point; use glam::DVec3; -use sal_3dlib::ops::Polygon; +use sal_3dlib_core::ops::Polygon; // // impl Polygon for Wire {