Extract fj-operations from fj-app

This commit is contained in:
Hanno Braun 2022-03-17 17:51:51 +01:00
parent 761b1fd865
commit a6bf96ed44
12 changed files with 52 additions and 7 deletions

14
Cargo.lock generated
View File

@ -631,8 +631,8 @@ dependencies = [
"figment", "figment",
"fj", "fj",
"fj-debug", "fj-debug",
"fj-kernel",
"fj-math", "fj-math",
"fj-operations",
"futures", "futures",
"libloading", "libloading",
"nalgebra", "nalgebra",
@ -684,6 +684,18 @@ dependencies = [
"parry3d-f64", "parry3d-f64",
] ]
[[package]]
name = "fj-operations"
version = "0.5.0"
dependencies = [
"fj",
"fj-debug",
"fj-kernel",
"fj-math",
"nalgebra",
"parry3d-f64",
]
[[package]] [[package]]
name = "flate2" name = "flate2"
version = "1.0.22" version = "1.0.22"

View File

@ -6,6 +6,7 @@ members = [
"fj-debug", "fj-debug",
"fj-kernel", "fj-kernel",
"fj-math", "fj-math",
"fj-operations",
"models/cuboid", "models/cuboid",
"models/group", "models/group",
@ -19,4 +20,5 @@ default-members = [
"fj-debug", "fj-debug",
"fj-kernel", "fj-kernel",
"fj-math", "fj-math",
"fj-operations",
] ]

View File

@ -42,14 +42,14 @@ path = "../fj"
version = "0.5.0" version = "0.5.0"
path = "../fj-debug" path = "../fj-debug"
[dependencies.fj-kernel]
version = "0.5.0"
path = "../fj-kernel"
[dependencies.fj-math] [dependencies.fj-math]
version = "0.5.0" version = "0.5.0"
path = "../fj-math" path = "../fj-math"
[dependencies.fj-operations]
version = "0.5.0"
path = "../fj-operations"
[dependencies.serde] [dependencies.serde]
version = "1.0.136" version = "1.0.136"
features = ["derive"] features = ["derive"]

View File

@ -5,7 +5,6 @@ mod graphics;
mod input; mod input;
mod mesh; mod mesh;
mod model; mod model;
mod operations;
mod window; mod window;
use std::collections::HashSet; use std::collections::HashSet;
@ -15,6 +14,7 @@ use std::{collections::HashMap, sync::mpsc, time::Instant};
use fj_debug::DebugInfo; use fj_debug::DebugInfo;
use fj_math::Scalar; use fj_math::Scalar;
use fj_operations::ToShape as _;
use futures::executor::block_on; use futures::executor::block_on;
use notify::Watcher as _; use notify::Watcher as _;
use tracing::trace; use tracing::trace;
@ -32,7 +32,6 @@ use crate::{
graphics::{DrawConfig, Renderer}, graphics::{DrawConfig, Renderer},
mesh::MeshMaker, mesh::MeshMaker,
model::Model, model::Model,
operations::ToShape as _,
window::Window, window::Window,
}; };

32
fj-operations/Cargo.toml Normal file
View File

@ -0,0 +1,32 @@
[package]
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"]
[dependencies]
nalgebra = "0.30.0"
parry3d-f64 = "0.8.0"
[dependencies.fj]
version = "0.5.0"
path = "../fj"
[dependencies.fj-math]
version = "0.5.0"
path = "../fj-math"
[dependencies.fj-debug]
version = "0.5.0"
path = "../fj-debug"
[dependencies.fj-kernel]
version = "0.5.0"
path = "../fj-kernel"