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

Merge pull request #454 from hannobraun/interop

Browse Source 
Rename `fj-debug` crate to `fj-interop`
This commit is contained in:
Hanno Braun 2022-04-11 17:29:28 +02:00 committed by GitHub
commit 4afdd3f1e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 139 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -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",

4
Cargo.toml
View File

@ -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",

58
fj-app/Cargo.toml
View File

@ -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"]

2
fj-app/src/graphics/vertices.rs
View File

@ -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};

2
fj-app/src/main.rs
View File

@ -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 _;

15
fj-debug/Cargo.toml
View File

@ -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"

16
fj-host/Cargo.toml
View File

@ -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"

15
fj-interop/Cargo.toml Normal file
View File

@ -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"

9
fj-debug/src/lib.rs → fj-interop/src/debug.rs
View File

@ -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};

5
fj-interop/src/lib.rs Normal file
View File

@ -0,0 +1,5 @@
//! Data types for interoperation within the Fornjot ecosystem
#![deny(missing_docs)]
pub mod debug;

36
fj-kernel/Cargo.toml
View File

@ -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"

4
fj-kernel/src/algorithms/triangulation/mod.rs
View File

@ -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};

4
fj-kernel/src/algorithms/triangulation/polygon.rs
View File

@ -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;

20
fj-math/Cargo.toml
View File

@ -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"

24
fj-operations/Cargo.toml
View File

@ -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"

2
fj-operations/src/circle.rs
View File

@ -1,4 +1,4 @@
use fj_debug::DebugInfo;
use fj_interop::debug::DebugInfo;
use fj_kernel::{
geometry::Surface,
shape::Shape,

2
fj-operations/src/difference_2d.rs
View File

@ -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},

2
fj-operations/src/group.rs
View File

@ -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},

2
fj-operations/src/lib.rs
View File

@ -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};

2
fj-operations/src/sketch.rs
View File

@ -1,4 +1,4 @@
use fj_debug::DebugInfo;
use fj_interop::debug::DebugInfo;
use fj_kernel::{
geometry::Surface,
shape::Shape,

2
fj-operations/src/sweep.rs
View File

@ -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};

2
fj-operations/src/transform.rs
View File

@ -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;

2
models/cuboid/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "cuboid"
name = "cuboid"
version = "0.1.0"
edition = "2021"

2
models/group/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "group"
name = "group"
version = "0.1.0"
edition = "2021"

2
models/spacer/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "spacer"
name = "spacer"
version = "0.1.0"
edition = "2021"

2
models/star/Cargo.toml
View File

@ -1,5 +1,5 @@
[package]
name = "star"
name = "star"
version = "0.1.0"
edition = "2021"

20
release-operator/Cargo.toml
View File

@ -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"]