mirror of https://github.com/hannobraun/Fornjot
Rename `fj-kernel` to `fj-core`
The name `fj-kernel` has become confusing. All of Fornjot is a kernel now, and `fj-core` is just the core part of that CAD kernel.
This commit is contained in:
parent
41774c2315
commit
0d2f1c47c7
|
@ -630,8 +630,8 @@ version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
|
"fj-core",
|
||||||
"fj-export",
|
"fj-export",
|
||||||
"fj-kernel",
|
|
||||||
"fj-math",
|
"fj-math",
|
||||||
"fj-window",
|
"fj-window",
|
||||||
"itertools",
|
"itertools",
|
||||||
|
@ -779,6 +779,23 @@ dependencies = [
|
||||||
"simd-adler32",
|
"simd-adler32",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fj-core"
|
||||||
|
version = "0.46.0"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"fj-interop",
|
||||||
|
"fj-math",
|
||||||
|
"iter_fixed",
|
||||||
|
"itertools",
|
||||||
|
"parking_lot",
|
||||||
|
"pretty_assertions",
|
||||||
|
"robust 1.1.0",
|
||||||
|
"spade",
|
||||||
|
"thiserror",
|
||||||
|
"type-map",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fj-export"
|
name = "fj-export"
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
|
@ -798,23 +815,6 @@ dependencies = [
|
||||||
"fj-math",
|
"fj-math",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "fj-kernel"
|
|
||||||
version = "0.46.0"
|
|
||||||
dependencies = [
|
|
||||||
"anyhow",
|
|
||||||
"fj-interop",
|
|
||||||
"fj-math",
|
|
||||||
"iter_fixed",
|
|
||||||
"itertools",
|
|
||||||
"parking_lot",
|
|
||||||
"pretty_assertions",
|
|
||||||
"robust 1.1.0",
|
|
||||||
"spade",
|
|
||||||
"thiserror",
|
|
||||||
"type-map",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fj-math"
|
name = "fj-math"
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
|
|
12
Cargo.toml
12
Cargo.toml
|
@ -1,9 +1,9 @@
|
||||||
[workspace]
|
[workspace]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = [
|
members = [
|
||||||
|
"crates/fj-core",
|
||||||
"crates/fj-export",
|
"crates/fj-export",
|
||||||
"crates/fj-interop",
|
"crates/fj-interop",
|
||||||
"crates/fj-kernel",
|
|
||||||
"crates/fj-math",
|
"crates/fj-math",
|
||||||
"crates/fj-viewer",
|
"crates/fj-viewer",
|
||||||
"crates/fj-window",
|
"crates/fj-window",
|
||||||
|
@ -17,9 +17,9 @@ members = [
|
||||||
"tools/release-operator",
|
"tools/release-operator",
|
||||||
]
|
]
|
||||||
default-members = [
|
default-members = [
|
||||||
|
"crates/fj-core",
|
||||||
"crates/fj-export",
|
"crates/fj-export",
|
||||||
"crates/fj-interop",
|
"crates/fj-interop",
|
||||||
"crates/fj-kernel",
|
|
||||||
"crates/fj-math",
|
"crates/fj-math",
|
||||||
"crates/fj-viewer",
|
"crates/fj-viewer",
|
||||||
]
|
]
|
||||||
|
@ -42,6 +42,10 @@ categories = ["encoding", "mathematics", "rendering"]
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
path = "crates/fj"
|
path = "crates/fj"
|
||||||
|
|
||||||
|
[workspace.dependencies.fj-core]
|
||||||
|
version = "0.46.0"
|
||||||
|
path = "crates/fj-core"
|
||||||
|
|
||||||
[workspace.dependencies.fj-export]
|
[workspace.dependencies.fj-export]
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
path = "crates/fj-export"
|
path = "crates/fj-export"
|
||||||
|
@ -54,10 +58,6 @@ path = "crates/fj-host"
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
path = "crates/fj-interop"
|
path = "crates/fj-interop"
|
||||||
|
|
||||||
[workspace.dependencies.fj-kernel]
|
|
||||||
version = "0.46.0"
|
|
||||||
path = "crates/fj-kernel"
|
|
||||||
|
|
||||||
[workspace.dependencies.fj-math]
|
[workspace.dependencies.fj-math]
|
||||||
version = "0.46.0"
|
version = "0.46.0"
|
||||||
path = "crates/fj-math"
|
path = "crates/fj-math"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[package]
|
[package]
|
||||||
name = "fj-kernel"
|
name = "fj-core"
|
||||||
version.workspace = true
|
version.workspace = true
|
||||||
edition.workspace = true
|
edition.workspace = true
|
||||||
description.workspace = true
|
description.workspace = true
|
|
@ -12,12 +12,12 @@ itertools = "0.10.5"
|
||||||
version = "4.3.0"
|
version = "4.3.0"
|
||||||
features = ["derive"]
|
features = ["derive"]
|
||||||
|
|
||||||
|
[dependencies.fj-core]
|
||||||
|
path = "../../crates/fj-core"
|
||||||
|
|
||||||
[dependencies.fj-export]
|
[dependencies.fj-export]
|
||||||
path = "../../crates/fj-export"
|
path = "../../crates/fj-export"
|
||||||
|
|
||||||
[dependencies.fj-kernel]
|
|
||||||
path = "../../crates/fj-kernel"
|
|
||||||
|
|
||||||
[dependencies.fj-math]
|
[dependencies.fj-math]
|
||||||
path = "../../crates/fj-math"
|
path = "../../crates/fj-math"
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
use fj_kernel::{
|
use fj_core::{
|
||||||
algorithms::sweep::Sweep,
|
algorithms::sweep::Sweep,
|
||||||
objects::{Sketch, Solid},
|
objects::{Sketch, Solid},
|
||||||
operations::{BuildSketch, Insert},
|
operations::{BuildSketch, Insert},
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use std::{ops::Deref, path::PathBuf};
|
use std::{ops::Deref, path::PathBuf};
|
||||||
|
|
||||||
use fj_kernel::algorithms::{approx::Tolerance, triangulate::Triangulate};
|
use fj_core::algorithms::{approx::Tolerance, triangulate::Triangulate};
|
||||||
|
|
||||||
fn main() -> anyhow::Result<()> {
|
fn main() -> anyhow::Result<()> {
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
|
|
|
@ -13,18 +13,18 @@ fn main() -> anyhow::Result<()> {
|
||||||
let targets = [
|
let targets = [
|
||||||
Target {
|
Target {
|
||||||
triple: "aarch64-apple-ios",
|
triple: "aarch64-apple-ios",
|
||||||
crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
|
crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
|
||||||
},
|
},
|
||||||
Target {
|
Target {
|
||||||
triple: "aarch64-linux-android",
|
triple: "aarch64-linux-android",
|
||||||
crates: &["fj-export", "fj-interop", "fj-kernel", "fj-math"],
|
crates: &["fj-core", "fj-export", "fj-interop", "fj-math"],
|
||||||
},
|
},
|
||||||
Target {
|
Target {
|
||||||
triple: "wasm32-unknown-unknown",
|
triple: "wasm32-unknown-unknown",
|
||||||
crates: &[
|
crates: &[
|
||||||
|
"fj-core",
|
||||||
"fj-export",
|
"fj-export",
|
||||||
"fj-interop",
|
"fj-interop",
|
||||||
"fj-kernel",
|
|
||||||
"fj-math",
|
"fj-math",
|
||||||
"fj-viewer",
|
"fj-viewer",
|
||||||
],
|
],
|
||||||
|
|
Loading…
Reference in New Issue