diff --git a/pathtracer/src/lib.rs b/pathtracer/src/lib.rs index e601b3d..200dd50 100644 --- a/pathtracer/src/lib.rs +++ b/pathtracer/src/lib.rs @@ -11,7 +11,7 @@ pub type Point2D = nalgebra::Point2; pub mod core; pub mod light; pub mod material; -pub mod render; +pub mod scene; pub mod serialize; pub mod shape; pub mod texture; diff --git a/pathtracer/src/main.rs b/pathtracer/src/main.rs index b07c149..3425e73 100644 --- a/pathtracer/src/main.rs +++ b/pathtracer/src/main.rs @@ -1,4 +1,4 @@ -use pathtracer::render::Scene; +use pathtracer::scene::Scene; use std::path::PathBuf; use structopt::StructOpt; diff --git a/pathtracer/src/render/light_aggregate.rs b/pathtracer/src/scene/light_aggregate.rs similarity index 97% rename from pathtracer/src/render/light_aggregate.rs rename to pathtracer/src/scene/light_aggregate.rs index 48070c2..acd0a82 100644 --- a/pathtracer/src/render/light_aggregate.rs +++ b/pathtracer/src/scene/light_aggregate.rs @@ -23,7 +23,7 @@ impl LightAggregate { /// # Examples /// /// ``` - /// # use pathtracer::render::LightAggregate; + /// # use pathtracer::scene::LightAggregate; /// # /// let la = LightAggregate::empty(); /// assert_eq!(la.ambient_lights_iter().count(), 0); @@ -40,7 +40,7 @@ impl LightAggregate { /// # Examples /// /// ``` - /// # use pathtracer::render::LightAggregate; + /// # use pathtracer::scene::LightAggregate; /// # /// let la = LightAggregate::new( /// Vec::new(), diff --git a/pathtracer/src/render/mesh.rs b/pathtracer/src/scene/mesh.rs similarity index 100% rename from pathtracer/src/render/mesh.rs rename to pathtracer/src/scene/mesh.rs diff --git a/pathtracer/src/render/mod.rs b/pathtracer/src/scene/mod.rs similarity index 100% rename from pathtracer/src/render/mod.rs rename to pathtracer/src/scene/mod.rs diff --git a/pathtracer/src/render/object.rs b/pathtracer/src/scene/object.rs similarity index 98% rename from pathtracer/src/render/object.rs rename to pathtracer/src/scene/object.rs index ee2b61f..21720d9 100644 --- a/pathtracer/src/render/object.rs +++ b/pathtracer/src/scene/object.rs @@ -30,7 +30,7 @@ impl Object { /// ``` /// # use pathtracer::core::{LightProperties, LinearColor}; /// # use pathtracer::material::UniformMaterial; - /// # use pathtracer::render::Object; + /// # use pathtracer::scene::Object; /// # use pathtracer::shape::Sphere; /// # use pathtracer::texture::UniformTexture; /// # use pathtracer::Point; diff --git a/pathtracer/src/render/scene.rs b/pathtracer/src/scene/scene.rs similarity index 99% rename from pathtracer/src/render/scene.rs rename to pathtracer/src/scene/scene.rs index ece4308..f0fb60b 100644 --- a/pathtracer/src/render/scene.rs +++ b/pathtracer/src/scene/scene.rs @@ -37,7 +37,7 @@ impl Scene { /// ``` /// # use pathtracer::core::{Camera, LightProperties, LinearColor}; /// # use pathtracer::material::UniformMaterial; - /// # use pathtracer::render::{LightAggregate, Object, Scene}; + /// # use pathtracer::scene::{LightAggregate, Object, Scene}; /// # use pathtracer::shape::Sphere; /// # use pathtracer::texture::UniformTexture; /// # use pathtracer::Point; @@ -354,7 +354,7 @@ mod test { #[test] fn empty_scene() { use crate::core::Camera; - use crate::render::{LightAggregate, Scene}; + use crate::scene::{LightAggregate, Scene}; let _scene = Scene::new( Camera::default(), diff --git a/pathtracer/src/render/utils.rs b/pathtracer/src/scene/utils.rs similarity index 100% rename from pathtracer/src/render/utils.rs rename to pathtracer/src/scene/utils.rs