diff --git a/Cargo.lock b/Cargo.lock index 15b69ba21..57160857f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -668,8 +668,8 @@ dependencies = [ "clap", "figment", "fj", - "fj-debug", "fj-host", + "fj-interop", "fj-kernel", "fj-math", "fj-operations", @@ -686,13 +686,6 @@ dependencies = [ "winit", ] -[[package]] -name = "fj-debug" -version = "0.5.0" -dependencies = [ - "fj-math", -] - [[package]] name = "fj-host" version = "0.5.0" @@ -703,6 +696,13 @@ dependencies = [ "thiserror", ] +[[package]] +name = "fj-interop" +version = "0.5.0" +dependencies = [ + "fj-math", +] + [[package]] name = "fj-kernel" version = "0.5.0" @@ -710,7 +710,7 @@ dependencies = [ "anyhow", "anymap", "approx 0.5.1", - "fj-debug", + "fj-interop", "fj-math", "map-macro", "nalgebra", @@ -740,7 +740,7 @@ name = "fj-operations" version = "0.5.0" dependencies = [ "fj", - "fj-debug", + "fj-interop", "fj-kernel", "fj-math", "nalgebra", diff --git a/Cargo.toml b/Cargo.toml index 069b25487..cc3272e04 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,8 +3,8 @@ resolver = "2" members = [ "fj", "fj-app", - "fj-debug", "fj-host", + "fj-interop", "fj-kernel", "fj-math", "fj-operations", @@ -18,8 +18,8 @@ members = [ ] default-members = [ "fj-app", - "fj-debug", "fj-host", + "fj-interop", "fj-kernel", "fj-math", "fj-operations", diff --git a/fj-app/Cargo.toml b/fj-app/Cargo.toml index 3bf91b011..f90fbfaf3 100644 --- a/fj-app/Cargo.toml +++ b/fj-app/Cargo.toml @@ -1,65 +1,65 @@ [package] -name = "fj-app" +name = "fj-app" version = "0.5.0" edition = "2021" description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["mathematics", "rendering"] +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] +categories = ["mathematics", "rendering"] [dependencies] -anyhow = "1.0.56" -bytemuck = "1.9.1" -futures = "0.3.21" -nalgebra = "0.30.0" +anyhow = "1.0.56" +bytemuck = "1.9.1" +futures = "0.3.21" +nalgebra = "0.30.0" parry3d-f64 = "0.8.0" -thiserror = "1.0.30" -threemf = "0.2.0" -tracing = "0.1.33" -wgpu = "0.12.0" -wgpu_glyph = "0.16.0" -winit = "0.26.1" +thiserror = "1.0.30" +threemf = "0.2.0" +tracing = "0.1.33" +wgpu = "0.12.0" +wgpu_glyph = "0.16.0" +winit = "0.26.1" [dependencies.clap] -version = "3.1.8" +version = "3.1.8" features = ["derive"] [dependencies.figment] -version = "0.10.6" +version = "0.10.6" features = ["env", "toml"] [dependencies.fj] version = "0.5.0" -path = "../fj" - -[dependencies.fj-debug] -version = "0.5.0" -path = "../fj-debug" +path = "../fj" [dependencies.fj-host] version = "0.5.0" -path = "../fj-host" +path = "../fj-host" + +[dependencies.fj-interop] +version = "0.5.0" +path = "../fj-interop" [dependencies.fj-kernel] version = "0.5.0" -path = "../fj-kernel" +path = "../fj-kernel" [dependencies.fj-math] version = "0.5.0" -path = "../fj-math" +path = "../fj-math" [dependencies.fj-operations] version = "0.5.0" -path = "../fj-operations" +path = "../fj-operations" [dependencies.serde] -version = "1.0.136" +version = "1.0.136" features = ["derive"] [dependencies.tracing-subscriber] -version = "0.3.11" +version = "0.3.11" features = ["env-filter", "fmt"] diff --git a/fj-app/src/graphics/vertices.rs b/fj-app/src/graphics/vertices.rs index b72e47a1b..181544a32 100644 --- a/fj-app/src/graphics/vertices.rs +++ b/fj-app/src/graphics/vertices.rs @@ -1,5 +1,5 @@ use bytemuck::{Pod, Zeroable}; -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_math::Triangle; use nalgebra::{vector, Point}; diff --git a/fj-app/src/main.rs b/fj-app/src/main.rs index bea1e38db..e1619ad89 100644 --- a/fj-app/src/main.rs +++ b/fj-app/src/main.rs @@ -9,8 +9,8 @@ mod window; use std::path::PathBuf; use std::{collections::HashMap, time::Instant}; -use fj_debug::DebugInfo; use fj_host::Model; +use fj_interop::debug::DebugInfo; use fj_kernel::algorithms::triangulate; use fj_math::{Aabb, Scalar, Triangle}; use fj_operations::ToShape as _; diff --git a/fj-debug/Cargo.toml b/fj-debug/Cargo.toml deleted file mode 100644 index 1997d107b..000000000 --- a/fj-debug/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "fj-debug" -version = "0.5.0" -edition = "2021" - -description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] - - -[dependencies.fj-math] -path = "../fj-math" -version = "0.5.0" diff --git a/fj-host/Cargo.toml b/fj-host/Cargo.toml index f5f201c4d..377c9d75d 100644 --- a/fj-host/Cargo.toml +++ b/fj-host/Cargo.toml @@ -1,20 +1,20 @@ [package] -name = "fj-host" +name = "fj-host" version = "0.5.0" edition = "2021" description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] [dependencies] libloading = "0.7.2" -notify = "5.0.0-pre.14" -thiserror = "1.0.30" +notify = "5.0.0-pre.14" +thiserror = "1.0.30" [dependencies.fj] version = "0.5.0" -path = "../fj" +path = "../fj" diff --git a/fj-interop/Cargo.toml b/fj-interop/Cargo.toml new file mode 100644 index 000000000..c549343eb --- /dev/null +++ b/fj-interop/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "fj-interop" +version = "0.5.0" +edition = "2021" + +description = "The world needs another CAD program." +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] + + +[dependencies.fj-math] +path = "../fj-math" +version = "0.5.0" diff --git a/fj-debug/src/lib.rs b/fj-interop/src/debug.rs similarity index 81% rename from fj-debug/src/lib.rs rename to fj-interop/src/debug.rs index 1e7a8e82d..60d4eaf88 100644 --- a/fj-debug/src/lib.rs +++ b/fj-interop/src/debug.rs @@ -1,11 +1,8 @@ //! Debug information definitions for the Fornjot ecosystem //! -//! This crate contains debug information that is used by other crates within -//! the Fornjot ecosystem. The types in here aren't very useful in themselves, -//! but they define an interface that other crates use to communicate between -//! each other. - -#![deny(missing_docs)] +//! Defines debug information that is used by other crates within the Fornjot +//! ecosystem. The types in here aren't very useful in themselves, but they +//! define an interface that other crates use to communicate between each other. use fj_math::{Point, Segment}; diff --git a/fj-interop/src/lib.rs b/fj-interop/src/lib.rs new file mode 100644 index 000000000..60601a84d --- /dev/null +++ b/fj-interop/src/lib.rs @@ -0,0 +1,5 @@ +//! Data types for interoperation within the Fornjot ecosystem + +#![deny(missing_docs)] + +pub mod debug; diff --git a/fj-kernel/Cargo.toml b/fj-kernel/Cargo.toml index c52e0074c..5e6ce0f6a 100644 --- a/fj-kernel/Cargo.toml +++ b/fj-kernel/Cargo.toml @@ -1,34 +1,34 @@ [package] -name = "fj-kernel" +name = "fj-kernel" version = "0.5.0" edition = "2021" description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["mathematics"] +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] +categories = ["mathematics"] [dependencies] -anyhow = "1.0.56" -anymap = "1.0.0-beta.2" -approx = "0.5.1" -map-macro = "0.2.0" -nalgebra = "0.30.0" +anyhow = "1.0.56" +anymap = "1.0.0-beta.2" +approx = "0.5.1" +map-macro = "0.2.0" +nalgebra = "0.30.0" parking_lot = "0.12.0" parry2d-f64 = "0.8.0" parry3d-f64 = "0.8.0" -robust = "0.2.3" -slotmap = "1.0.6" -spade = "2.0.0" -thiserror = "1.0.30" +robust = "0.2.3" +slotmap = "1.0.6" +spade = "2.0.0" +thiserror = "1.0.30" -[dependencies.fj-debug] +[dependencies.fj-interop] version = "0.5.0" -path = "../fj-debug" +path = "../fj-interop" [dependencies.fj-math] version = "0.5.0" -path = "../fj-math" +path = "../fj-math" diff --git a/fj-kernel/src/algorithms/triangulation/mod.rs b/fj-kernel/src/algorithms/triangulation/mod.rs index a18312d0b..7bf7611f3 100644 --- a/fj-kernel/src/algorithms/triangulation/mod.rs +++ b/fj-kernel/src/algorithms/triangulation/mod.rs @@ -1,7 +1,7 @@ mod polygon; mod ray; -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_math::{Scalar, Triangle}; use parry2d_f64::utils::point_in_triangle::{corner_direction, Orientation}; use spade::HasPosition; @@ -121,7 +121,7 @@ impl HasPosition for geometry::Point<2> { #[cfg(test)] mod tests { - use fj_debug::DebugInfo; + use fj_interop::debug::DebugInfo; use fj_math::{Scalar, Triangle}; use crate::{geometry::Surface, shape::Shape, topology::Face}; diff --git a/fj-kernel/src/algorithms/triangulation/polygon.rs b/fj-kernel/src/algorithms/triangulation/polygon.rs index 4b5e01bff..aeb9e251c 100644 --- a/fj-kernel/src/algorithms/triangulation/polygon.rs +++ b/fj-kernel/src/algorithms/triangulation/polygon.rs @@ -1,4 +1,4 @@ -use fj_debug::{DebugInfo, TriangleEdgeCheck}; +use fj_interop::debug::{DebugInfo, TriangleEdgeCheck}; use fj_math::{Point, PolyChain, Segment}; use crate::geometry::Surface; @@ -218,7 +218,7 @@ impl Polygon { #[cfg(test)] mod tests { - use fj_debug::DebugInfo; + use fj_interop::debug::DebugInfo; use fj_math::{Point, PolyChain}; use crate::geometry::Surface; diff --git a/fj-math/Cargo.toml b/fj-math/Cargo.toml index 34c7dffab..9fc3ac481 100644 --- a/fj-math/Cargo.toml +++ b/fj-math/Cargo.toml @@ -1,19 +1,19 @@ [package] -name = "fj-math" +name = "fj-math" version = "0.5.0" edition = "2021" description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["mathematics"] +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] +categories = ["mathematics"] [dependencies] -approx = "0.5.1" -decorum = "0.3.1" -nalgebra = "0.30.0" -num-traits = "0.2.14" +approx = "0.5.1" +decorum = "0.3.1" +nalgebra = "0.30.0" +num-traits = "0.2.14" parry2d-f64 = "0.8.0" parry3d-f64 = "0.8.0" diff --git a/fj-operations/Cargo.toml b/fj-operations/Cargo.toml index 023bede6e..fdc3271f7 100644 --- a/fj-operations/Cargo.toml +++ b/fj-operations/Cargo.toml @@ -1,32 +1,32 @@ [package] -name = "fj-operations" +name = "fj-operations" version = "0.5.0" edition = "2021" description = "The world needs another CAD program." -readme = "../README.md" -repository = "https://github.com/hannobraun/fornjot" -license = "0BSD" -keywords = ["cad", "programmatic", "code-cad"] -categories = ["mathematics"] +readme = "../README.md" +repository = "https://github.com/hannobraun/fornjot" +license = "0BSD" +keywords = ["cad", "programmatic", "code-cad"] +categories = ["mathematics"] [dependencies] -nalgebra = "0.30.0" +nalgebra = "0.30.0" parry3d-f64 = "0.8.0" [dependencies.fj] version = "0.5.0" -path = "../fj" +path = "../fj" [dependencies.fj-math] version = "0.5.0" -path = "../fj-math" +path = "../fj-math" -[dependencies.fj-debug] +[dependencies.fj-interop] version = "0.5.0" -path = "../fj-debug" +path = "../fj-interop" [dependencies.fj-kernel] version = "0.5.0" -path = "../fj-kernel" +path = "../fj-kernel" diff --git a/fj-operations/src/circle.rs b/fj-operations/src/circle.rs index 731c4a732..3c9671e9a 100644 --- a/fj-operations/src/circle.rs +++ b/fj-operations/src/circle.rs @@ -1,4 +1,4 @@ -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::{ geometry::Surface, shape::Shape, diff --git a/fj-operations/src/difference_2d.rs b/fj-operations/src/difference_2d.rs index 06aee0848..94d06f87c 100644 --- a/fj-operations/src/difference_2d.rs +++ b/fj-operations/src/difference_2d.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::{ shape::{Handle, Shape}, topology::{Cycle, Edge, Face, Vertex}, diff --git a/fj-operations/src/group.rs b/fj-operations/src/group.rs index f99bbb22d..6e139af29 100644 --- a/fj-operations/src/group.rs +++ b/fj-operations/src/group.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::{ shape::Shape, topology::{Cycle, Edge, Face, Vertex}, diff --git a/fj-operations/src/lib.rs b/fj-operations/src/lib.rs index 1632f444d..aef0c61bb 100644 --- a/fj-operations/src/lib.rs +++ b/fj-operations/src/lib.rs @@ -13,7 +13,7 @@ mod sketch; mod sweep; mod transform; -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::shape::Shape; use fj_math::{Aabb, Scalar}; diff --git a/fj-operations/src/sketch.rs b/fj-operations/src/sketch.rs index 312add0cf..557fef23d 100644 --- a/fj-operations/src/sketch.rs +++ b/fj-operations/src/sketch.rs @@ -1,4 +1,4 @@ -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::{ geometry::Surface, shape::Shape, diff --git a/fj-operations/src/sweep.rs b/fj-operations/src/sweep.rs index 0a2dab176..898a02c7f 100644 --- a/fj-operations/src/sweep.rs +++ b/fj-operations/src/sweep.rs @@ -1,4 +1,4 @@ -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::{algorithms::sweep_shape, shape::Shape}; use fj_math::{Aabb, Scalar, Vector}; diff --git a/fj-operations/src/transform.rs b/fj-operations/src/transform.rs index f297e0122..f6602ea4e 100644 --- a/fj-operations/src/transform.rs +++ b/fj-operations/src/transform.rs @@ -1,4 +1,4 @@ -use fj_debug::DebugInfo; +use fj_interop::debug::DebugInfo; use fj_kernel::shape::Shape; use fj_math::{Aabb, Scalar, Transform}; use parry3d_f64::math::Isometry; diff --git a/models/cuboid/Cargo.toml b/models/cuboid/Cargo.toml index c0e973af3..7ce5c840d 100644 --- a/models/cuboid/Cargo.toml +++ b/models/cuboid/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cuboid" +name = "cuboid" version = "0.1.0" edition = "2021" diff --git a/models/group/Cargo.toml b/models/group/Cargo.toml index 7910d2980..380514ee3 100644 --- a/models/group/Cargo.toml +++ b/models/group/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "group" +name = "group" version = "0.1.0" edition = "2021" diff --git a/models/spacer/Cargo.toml b/models/spacer/Cargo.toml index 7e0ef06fd..d4f18bbef 100644 --- a/models/spacer/Cargo.toml +++ b/models/spacer/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "spacer" +name = "spacer" version = "0.1.0" edition = "2021" diff --git a/models/star/Cargo.toml b/models/star/Cargo.toml index b725b7e10..5ed04729e 100644 --- a/models/star/Cargo.toml +++ b/models/star/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "star" +name = "star" version = "0.1.0" edition = "2021" diff --git a/release-operator/Cargo.toml b/release-operator/Cargo.toml index bdaf3c9f4..0ab46b865 100644 --- a/release-operator/Cargo.toml +++ b/release-operator/Cargo.toml @@ -6,21 +6,21 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.56" +anyhow = "1.0.56" cargo_metadata = "0.14.2" -cmd_lib = "1.3.0" -env_logger = "0.9.0" -log = "0.4.16" -regex = "1.5.5" -secstr = "0.5.0" -semver = "1.0.7" -serde_json = "1.0.79" +cmd_lib = "1.3.0" +env_logger = "0.9.0" +log = "0.4.16" +regex = "1.5.5" +secstr = "0.5.0" +semver = "1.0.7" +serde_json = "1.0.79" [dependencies.clap] -version = "3.1.8" +version = "3.1.8" features = ["std", "derive", "env"] default_features = false [dependencies.serde] -version = "1.0.136" +version = "1.0.136" features = ["derive"]