project: move to Cargo workspace

2020-03-23 23:46:56 +01:00 · 2020-03-23 23:46:56 +01:00 · 01d2c2d973
parent b5835b2726
commit 01d2c2d973
32 changed files with 42 additions and 37 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,38 +1,5 @@
-[package]
-name = "pathtracer"
-version = "0.1.0"
-authors = [
-    "Bruno BELANYI <brunobelanyi@gmail.com>",
-    "Antoine Martin <antoine97.martin@gmail.com>"
+[workspace]
+
+members = [
+    "pathtracer",
 ]
-edition = "2018"
-description = "A pathtracer written in Rust"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[lib]
-name = "pathtracer"
-path = "src/lib.rs"
-
-[[bin]]
-name = "pathtracer"
-path = "src/main.rs"
-
-[dependencies]
-bvh = "0.3.2"
-derive_more = "0.99.3"
-enum_dispatch = "0.2.1"
-image = "0.23.0"
-indicatif = "0.14.0"
-rand = "0.7"
-rayon = "1.3.0"
-serde_yaml = "0.8"
-structopt = "0.3"
-
-[dependencies.nalgebra]
-version = "0.20.0"
-features = ["serde-serialize"]
-
-[dependencies.serde]
-version = "1.0"
-features = ["derive"]
--- a/pathtracer/Cargo.toml
+++ b/pathtracer/Cargo.toml
@ -0,0 +1,38 @@
+[package]
+name = "pathtracer"
+version = "0.1.0"
+authors = [
+    "Bruno BELANYI <brunobelanyi@gmail.com>",
+    "Antoine Martin <antoine97.martin@gmail.com>"
+]
+edition = "2018"
+description = "A pathtracer written in Rust"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[lib]
+name = "pathtracer"
+path = "src/lib.rs"
+
+[[bin]]
+name = "pathtracer"
+path = "src/main.rs"
+
+[dependencies]
+bvh = "0.3.2"
+derive_more = "0.99.3"
+enum_dispatch = "0.2.1"
+image = "0.23.0"
+indicatif = "0.14.0"
+rand = "0.7"
+rayon = "1.3.0"
+serde_yaml = "0.8"
+structopt = "0.3"
+
+[dependencies.nalgebra]
+version = "0.20.0"
+features = ["serde-serialize"]
+
+[dependencies.serde]
+version = "1.0"
+features = ["derive"]
--- a/pathtracer/examples/colorful.yaml
+++ b/pathtracer/examples/colorful.yaml
--- a/pathtracer/examples/scene.yaml
+++ b/pathtracer/examples/scene.yaml
--- a/pathtracer/examples/triangles.yaml
+++ b/pathtracer/examples/triangles.yaml
--- a/pathtracer/src/core/camera.rs
+++ b/pathtracer/src/core/camera.rs
--- a/pathtracer/src/core/color.rs
+++ b/pathtracer/src/core/color.rs
--- a/pathtracer/src/core/film.rs
+++ b/pathtracer/src/core/film.rs
--- a/pathtracer/src/core/light_properties.rs
+++ b/pathtracer/src/core/light_properties.rs
--- a/pathtracer/src/core/mod.rs
+++ b/pathtracer/src/core/mod.rs
--- a/pathtracer/src/lib.rs
+++ b/pathtracer/src/lib.rs
--- a/pathtracer/src/light/ambient_light.rs
+++ b/pathtracer/src/light/ambient_light.rs
--- a/pathtracer/src/light/directional_light.rs
+++ b/pathtracer/src/light/directional_light.rs
--- a/pathtracer/src/light/mod.rs
+++ b/pathtracer/src/light/mod.rs
--- a/pathtracer/src/light/point_light.rs
+++ b/pathtracer/src/light/point_light.rs
--- a/pathtracer/src/light/spot_light.rs
+++ b/pathtracer/src/light/spot_light.rs
--- a/pathtracer/src/main.rs
+++ b/pathtracer/src/main.rs
--- a/pathtracer/src/material/mod.rs
+++ b/pathtracer/src/material/mod.rs
--- a/pathtracer/src/material/uniform.rs
+++ b/pathtracer/src/material/uniform.rs
--- a/pathtracer/src/render/light_aggregate.rs
+++ b/pathtracer/src/render/light_aggregate.rs
--- a/pathtracer/src/render/mod.rs
+++ b/pathtracer/src/render/mod.rs
--- a/pathtracer/src/render/object.rs
+++ b/pathtracer/src/render/object.rs
--- a/pathtracer/src/render/scene.rs
+++ b/pathtracer/src/render/scene.rs
--- a/pathtracer/src/render/utils.rs
+++ b/pathtracer/src/render/utils.rs
--- a/pathtracer/src/serialize/coefficient.rs
+++ b/pathtracer/src/serialize/coefficient.rs
--- a/pathtracer/src/serialize/mod.rs
+++ b/pathtracer/src/serialize/mod.rs
--- a/pathtracer/src/serialize/vector.rs
+++ b/pathtracer/src/serialize/vector.rs
--- a/pathtracer/src/shape/mod.rs
+++ b/pathtracer/src/shape/mod.rs
--- a/pathtracer/src/shape/sphere.rs
+++ b/pathtracer/src/shape/sphere.rs
--- a/pathtracer/src/shape/triangle.rs
+++ b/pathtracer/src/shape/triangle.rs
--- a/pathtracer/src/texture/mod.rs
+++ b/pathtracer/src/texture/mod.rs
--- a/pathtracer/src/texture/uniform.rs
+++ b/pathtracer/src/texture/uniform.rs