From 01d2c2d973fc030bd6cf14d401d437543b240950 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Mon, 23 Mar 2020 23:46:56 +0100 Subject: [PATCH] project: move to Cargo workspace --- Cargo.toml | 41 ++----------------- pathtracer/Cargo.toml | 38 +++++++++++++++++ .../examples}/colorful.yaml | 0 {examples => pathtracer/examples}/scene.yaml | 0 .../examples}/triangles.yaml | 0 {src => pathtracer/src}/core/camera.rs | 0 {src => pathtracer/src}/core/color.rs | 0 {src => pathtracer/src}/core/film.rs | 0 .../src}/core/light_properties.rs | 0 {src => pathtracer/src}/core/mod.rs | 0 {src => pathtracer/src}/lib.rs | 0 .../src}/light/ambient_light.rs | 0 .../src}/light/directional_light.rs | 0 {src => pathtracer/src}/light/mod.rs | 0 {src => pathtracer/src}/light/point_light.rs | 0 {src => pathtracer/src}/light/spot_light.rs | 0 {src => pathtracer/src}/main.rs | 0 {src => pathtracer/src}/material/mod.rs | 0 {src => pathtracer/src}/material/uniform.rs | 0 .../src}/render/light_aggregate.rs | 0 {src => pathtracer/src}/render/mod.rs | 0 {src => pathtracer/src}/render/object.rs | 0 {src => pathtracer/src}/render/scene.rs | 0 {src => pathtracer/src}/render/utils.rs | 0 .../src}/serialize/coefficient.rs | 0 {src => pathtracer/src}/serialize/mod.rs | 0 {src => pathtracer/src}/serialize/vector.rs | 0 {src => pathtracer/src}/shape/mod.rs | 0 {src => pathtracer/src}/shape/sphere.rs | 0 {src => pathtracer/src}/shape/triangle.rs | 0 {src => pathtracer/src}/texture/mod.rs | 0 {src => pathtracer/src}/texture/uniform.rs | 0 32 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 pathtracer/Cargo.toml rename {examples => pathtracer/examples}/colorful.yaml (100%) rename {examples => pathtracer/examples}/scene.yaml (100%) rename {examples => pathtracer/examples}/triangles.yaml (100%) rename {src => pathtracer/src}/core/camera.rs (100%) rename {src => pathtracer/src}/core/color.rs (100%) rename {src => pathtracer/src}/core/film.rs (100%) rename {src => pathtracer/src}/core/light_properties.rs (100%) rename {src => pathtracer/src}/core/mod.rs (100%) rename {src => pathtracer/src}/lib.rs (100%) rename {src => pathtracer/src}/light/ambient_light.rs (100%) rename {src => pathtracer/src}/light/directional_light.rs (100%) rename {src => pathtracer/src}/light/mod.rs (100%) rename {src => pathtracer/src}/light/point_light.rs (100%) rename {src => pathtracer/src}/light/spot_light.rs (100%) rename {src => pathtracer/src}/main.rs (100%) rename {src => pathtracer/src}/material/mod.rs (100%) rename {src => pathtracer/src}/material/uniform.rs (100%) rename {src => pathtracer/src}/render/light_aggregate.rs (100%) rename {src => pathtracer/src}/render/mod.rs (100%) rename {src => pathtracer/src}/render/object.rs (100%) rename {src => pathtracer/src}/render/scene.rs (100%) rename {src => pathtracer/src}/render/utils.rs (100%) rename {src => pathtracer/src}/serialize/coefficient.rs (100%) rename {src => pathtracer/src}/serialize/mod.rs (100%) rename {src => pathtracer/src}/serialize/vector.rs (100%) rename {src => pathtracer/src}/shape/mod.rs (100%) rename {src => pathtracer/src}/shape/sphere.rs (100%) rename {src => pathtracer/src}/shape/triangle.rs (100%) rename {src => pathtracer/src}/texture/mod.rs (100%) rename {src => pathtracer/src}/texture/uniform.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 770e871..6e54766 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,38 +1,5 @@ -[package] -name = "pathtracer" -version = "0.1.0" -authors = [ - "Bruno BELANYI ", - "Antoine Martin " +[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"] diff --git a/pathtracer/Cargo.toml b/pathtracer/Cargo.toml new file mode 100644 index 0000000..770e871 --- /dev/null +++ b/pathtracer/Cargo.toml @@ -0,0 +1,38 @@ +[package] +name = "pathtracer" +version = "0.1.0" +authors = [ + "Bruno BELANYI ", + "Antoine Martin " +] +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"] diff --git a/examples/colorful.yaml b/pathtracer/examples/colorful.yaml similarity index 100% rename from examples/colorful.yaml rename to pathtracer/examples/colorful.yaml diff --git a/examples/scene.yaml b/pathtracer/examples/scene.yaml similarity index 100% rename from examples/scene.yaml rename to pathtracer/examples/scene.yaml diff --git a/examples/triangles.yaml b/pathtracer/examples/triangles.yaml similarity index 100% rename from examples/triangles.yaml rename to pathtracer/examples/triangles.yaml diff --git a/src/core/camera.rs b/pathtracer/src/core/camera.rs similarity index 100% rename from src/core/camera.rs rename to pathtracer/src/core/camera.rs diff --git a/src/core/color.rs b/pathtracer/src/core/color.rs similarity index 100% rename from src/core/color.rs rename to pathtracer/src/core/color.rs diff --git a/src/core/film.rs b/pathtracer/src/core/film.rs similarity index 100% rename from src/core/film.rs rename to pathtracer/src/core/film.rs diff --git a/src/core/light_properties.rs b/pathtracer/src/core/light_properties.rs similarity index 100% rename from src/core/light_properties.rs rename to pathtracer/src/core/light_properties.rs diff --git a/src/core/mod.rs b/pathtracer/src/core/mod.rs similarity index 100% rename from src/core/mod.rs rename to pathtracer/src/core/mod.rs diff --git a/src/lib.rs b/pathtracer/src/lib.rs similarity index 100% rename from src/lib.rs rename to pathtracer/src/lib.rs diff --git a/src/light/ambient_light.rs b/pathtracer/src/light/ambient_light.rs similarity index 100% rename from src/light/ambient_light.rs rename to pathtracer/src/light/ambient_light.rs diff --git a/src/light/directional_light.rs b/pathtracer/src/light/directional_light.rs similarity index 100% rename from src/light/directional_light.rs rename to pathtracer/src/light/directional_light.rs diff --git a/src/light/mod.rs b/pathtracer/src/light/mod.rs similarity index 100% rename from src/light/mod.rs rename to pathtracer/src/light/mod.rs diff --git a/src/light/point_light.rs b/pathtracer/src/light/point_light.rs similarity index 100% rename from src/light/point_light.rs rename to pathtracer/src/light/point_light.rs diff --git a/src/light/spot_light.rs b/pathtracer/src/light/spot_light.rs similarity index 100% rename from src/light/spot_light.rs rename to pathtracer/src/light/spot_light.rs diff --git a/src/main.rs b/pathtracer/src/main.rs similarity index 100% rename from src/main.rs rename to pathtracer/src/main.rs diff --git a/src/material/mod.rs b/pathtracer/src/material/mod.rs similarity index 100% rename from src/material/mod.rs rename to pathtracer/src/material/mod.rs diff --git a/src/material/uniform.rs b/pathtracer/src/material/uniform.rs similarity index 100% rename from src/material/uniform.rs rename to pathtracer/src/material/uniform.rs diff --git a/src/render/light_aggregate.rs b/pathtracer/src/render/light_aggregate.rs similarity index 100% rename from src/render/light_aggregate.rs rename to pathtracer/src/render/light_aggregate.rs diff --git a/src/render/mod.rs b/pathtracer/src/render/mod.rs similarity index 100% rename from src/render/mod.rs rename to pathtracer/src/render/mod.rs diff --git a/src/render/object.rs b/pathtracer/src/render/object.rs similarity index 100% rename from src/render/object.rs rename to pathtracer/src/render/object.rs diff --git a/src/render/scene.rs b/pathtracer/src/render/scene.rs similarity index 100% rename from src/render/scene.rs rename to pathtracer/src/render/scene.rs diff --git a/src/render/utils.rs b/pathtracer/src/render/utils.rs similarity index 100% rename from src/render/utils.rs rename to pathtracer/src/render/utils.rs diff --git a/src/serialize/coefficient.rs b/pathtracer/src/serialize/coefficient.rs similarity index 100% rename from src/serialize/coefficient.rs rename to pathtracer/src/serialize/coefficient.rs diff --git a/src/serialize/mod.rs b/pathtracer/src/serialize/mod.rs similarity index 100% rename from src/serialize/mod.rs rename to pathtracer/src/serialize/mod.rs diff --git a/src/serialize/vector.rs b/pathtracer/src/serialize/vector.rs similarity index 100% rename from src/serialize/vector.rs rename to pathtracer/src/serialize/vector.rs diff --git a/src/shape/mod.rs b/pathtracer/src/shape/mod.rs similarity index 100% rename from src/shape/mod.rs rename to pathtracer/src/shape/mod.rs diff --git a/src/shape/sphere.rs b/pathtracer/src/shape/sphere.rs similarity index 100% rename from src/shape/sphere.rs rename to pathtracer/src/shape/sphere.rs diff --git a/src/shape/triangle.rs b/pathtracer/src/shape/triangle.rs similarity index 100% rename from src/shape/triangle.rs rename to pathtracer/src/shape/triangle.rs diff --git a/src/texture/mod.rs b/pathtracer/src/texture/mod.rs similarity index 100% rename from src/texture/mod.rs rename to pathtracer/src/texture/mod.rs diff --git a/src/texture/uniform.rs b/pathtracer/src/texture/uniform.rs similarity index 100% rename from src/texture/uniform.rs rename to pathtracer/src/texture/uniform.rs