Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract fj-host from fj-app #381

Merged
merged 1 commit into from
Mar 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"fj",
"fj-app",
"fj-debug",
"fj-host",
"fj-kernel",
"fj-math",
"fj-operations",
Expand All @@ -18,6 +19,7 @@ members = [
default-members = [
"fj-app",
"fj-debug",
"fj-host",
"fj-kernel",
"fj-math",
"fj-operations",
Expand Down
6 changes: 4 additions & 2 deletions fj-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ categories = ["mathematics", "rendering"]
anyhow = "1.0.56"
bytemuck = "1.8.0"
futures = "0.3.21"
libloading = "0.7.2"
nalgebra = "0.30.0"
notify = "5.0.0-pre.14"
parry3d-f64 = "0.8.0"
thiserror = "1.0.30"
threemf = "0.2.0"
Expand All @@ -42,6 +40,10 @@ path = "../fj"
version = "0.5.0"
path = "../fj-debug"

[dependencies.fj-host]
version = "0.5.0"
path = "../fj-host"

[dependencies.fj-math]
version = "0.5.0"
path = "../fj-math"
Expand Down
3 changes: 1 addition & 2 deletions fj-app/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ mod config;
mod graphics;
mod input;
mod mesh;
mod model;
mod window;

use std::path::PathBuf;
use std::{collections::HashMap, time::Instant};

use fj_debug::DebugInfo;
use fj_host::Model;
use fj_math::{Aabb, Scalar, Triangle};
use fj_operations::ToShape as _;
use futures::executor::block_on;
Expand All @@ -28,7 +28,6 @@ use crate::{
config::Config,
graphics::{DrawConfig, Renderer},
mesh::MeshMaker,
model::Model,
window::Window,
};

Expand Down
235 changes: 0 additions & 235 deletions fj-app/src/model.rs

This file was deleted.

13 changes: 12 additions & 1 deletion fj-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ version = "0.5.0"
edition = "2021"

description = "The world needs another CAD program."
readme = "README.md"
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"

[dependencies.fj]
version = "0.5.0"
path = "../fj"
1 change: 0 additions & 1 deletion fj-host/README.md

This file was deleted.

Loading