Refactoring: move files into bin project

fremag · Feb 1, 2024 · 3789662 · 3789662
1 parent cb43921
commit 3789662
Show file tree

Hide file tree

Showing 23 changed files with 198 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /target
 /.idea
 /.vscode/
+/ray-tracer-cli/target
+/ray-tracer-lib/target
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,12 +1,3 @@
-workspace = { members = [ "ray-tracer-lib"] }
-
-[package]
-name = "ray_tracer_rust"
-version = "0.1.0"
-edition = "2021"
+workspace = { members = [ "ray-tracer-lib", "ray-tracer-cli"], resolver = "2" }
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-rand = { version = "0.8.5", features = [] }
-ray-tracer-lib = { version = "0.1.0", path = "ray-tracer-lib" }
diff --git a/ray-tracer-cli/Cargo.lock b/ray-tracer-cli/Cargo.lock
diff --git a/ray-tracer-cli/Cargo.toml b/ray-tracer-cli/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ray-tracer-cli"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+rand = { version = "0.8.5", features = [] }
+ray-tracer-lib = { version = "0.1.0", path = "../ray-tracer-lib" }
diff --git a/src/main.rs → ray-tracer-cli/src/main.rs b/src/main.rs → ray-tracer-cli/src/main.rs
@@ -1,13 +1,13 @@
-mod ray_tracer;
-mod tests;
 mod scenes;
+mod ray_tracer;
 mod scene;
+mod tests;
 
 use std::env;
 use std::process::exit;
 use ray_tracer_lib::patterns::pattern::Pattern;
 use scenes::clover_scene::CloverScene;
-use scene::Scene;
+use crate::scene::Scene;
 use crate::scenes::basic_refraction_scene::BasicRefractionScene;
 use crate::scenes::clover_triangles_scene::CloverTriangleScene;
 use crate::scenes::cone_scene::ConeScene;

diff --git a/src/ray_tracer.rs → ray-tracer-cli/src/ray_tracer.rs b/src/ray_tracer.rs → ray-tracer-cli/src/ray_tracer.rs
diff --git a/src/scene.rs → ray-tracer-cli/src/scene.rs b/src/scene.rs → ray-tracer-cli/src/scene.rs
diff --git a/src/scenes/basic_refraction_scene.rs → ...-cli/src/scenes/basic_refraction_scene.rs b/src/scenes/basic_refraction_scene.rs → ...-cli/src/scenes/basic_refraction_scene.rs
diff --git a/src/scenes/clover_scene.rs → ray-tracer-cli/src/scenes/clover_scene.rs b/src/scenes/clover_scene.rs → ray-tracer-cli/src/scenes/clover_scene.rs
@@ -3,8 +3,8 @@ use ray_tracer_lib::core::math::{Float, PI};
 use ray_tracer_lib::core::transform::view_transform;
 use ray_tracer_lib::core::tuple::{point, Tuple, vector};
 use crate::ray_tracer::{build_mesh, curve_sweep_mesh};
-use crate::scene::Scene;
 use ray_tracer_lib::world::World;
+use crate::scene::Scene;
 
 pub struct CloverScene {
     from_x: Float,

diff --git a/src/scenes/clover_triangles_scene.rs → ...-cli/src/scenes/clover_triangles_scene.rs b/src/scenes/clover_triangles_scene.rs → ...-cli/src/scenes/clover_triangles_scene.rs
diff --git a/src/scenes/cone_scene.rs → ray-tracer-cli/src/scenes/cone_scene.rs b/src/scenes/cone_scene.rs → ray-tracer-cli/src/scenes/cone_scene.rs
diff --git a/src/scenes/cube_scene.rs → ray-tracer-cli/src/scenes/cube_scene.rs b/src/scenes/cube_scene.rs → ray-tracer-cli/src/scenes/cube_scene.rs
diff --git a/src/scenes/cylinder_scene.rs → ray-tracer-cli/src/scenes/cylinder_scene.rs b/src/scenes/cylinder_scene.rs → ray-tracer-cli/src/scenes/cylinder_scene.rs
diff --git a/src/scenes/group_scene.rs → ray-tracer-cli/src/scenes/group_scene.rs b/src/scenes/group_scene.rs → ray-tracer-cli/src/scenes/group_scene.rs
@@ -7,9 +7,9 @@ use ray_tracer_lib::lights::point_light::PointLight;
 use ray_tracer_lib::material::Material;
 use ray_tracer_lib::object::{build_cylinder, build_plane, build_sphere, Object};
 use ray_tracer_lib::patterns::pattern::Pattern;
-use crate::scene::Scene;
 use ray_tracer_lib::shapes::group::Group;
 use ray_tracer_lib::world::World;
+use crate::scene::Scene;
 
 pub struct GroupScene {
 

diff --git a/src/scenes/mod.rs → ray-tracer-cli/src/scenes/mod.rs b/src/scenes/mod.rs → ray-tracer-cli/src/scenes/mod.rs
diff --git a/src/scenes/patterns_scene.rs → ray-tracer-cli/src/scenes/patterns_scene.rs b/src/scenes/patterns_scene.rs → ray-tracer-cli/src/scenes/patterns_scene.rs
diff --git a/src/scenes/refraction_sphere_scene.rs → ...cli/src/scenes/refraction_sphere_scene.rs b/src/scenes/refraction_sphere_scene.rs → ...cli/src/scenes/refraction_sphere_scene.rs
diff --git a/src/scenes/stripe_pattern_scene.rs → ...er-cli/src/scenes/stripe_pattern_scene.rs b/src/scenes/stripe_pattern_scene.rs → ...er-cli/src/scenes/stripe_pattern_scene.rs
diff --git a/src/tests/mod.rs → ray-tracer-cli/src/tests/mod.rs b/src/tests/mod.rs → ray-tracer-cli/src/tests/mod.rs
diff --git a/src/tests/projectile_tests.rs → ray-tracer-cli/src/tests/projectile_tests.rs b/src/tests/projectile_tests.rs → ray-tracer-cli/src/tests/projectile_tests.rs
diff --git a/ray-tracer-lib/Cargo.lock b/ray-tracer-lib/Cargo.lock
diff --git a/ray-tracer-lib/Cargo.toml b/ray-tracer-lib/Cargo.toml
@@ -2,7 +2,6 @@
 name = "ray-tracer-lib"
 version = "0.1.0"
 edition = "2021"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]