diff --git a/Cargo.lock b/Cargo.lock index 657d257..bc8f7b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -254,7 +254,7 @@ dependencies = [ "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", "scoped_threadpool 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", "sobol 0.1.0", - "spectra_xyz 0.1.0", + "spectral_upsampling 0.1.0", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "trifloat 0.1.0", ] @@ -440,7 +440,7 @@ name = "sobol" version = "0.1.0" [[package]] -name = "spectra_xyz" +name = "spectral_upsampling" version = "0.1.0" dependencies = [ "float4 0.1.0", diff --git a/Cargo.toml b/Cargo.toml index de9710a..1e51807 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ "sub_crates/mem_arena", "sub_crates/oct32norm", "sub_crates/sobol", - "sub_crates/spectra_xyz", + "sub_crates/spectral_upsampling", "sub_crates/trifloat" ] @@ -61,8 +61,8 @@ path = "sub_crates/oct32norm" [dependencies.sobol] path = "sub_crates/sobol" -[dependencies.spectra_xyz] -path = "sub_crates/spectra_xyz" +[dependencies.spectral_upsampling] +path = "sub_crates/spectral_upsampling" [dependencies.trifloat] path = "sub_crates/trifloat" \ No newline at end of file diff --git a/src/color.rs b/src/color.rs index e2b2e35..a5e17a2 100644 --- a/src/color.rs +++ b/src/color.rs @@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign}; pub use color::{rec709_e_to_xyz, rec709_to_xyz, xyz_to_rec709, xyz_to_rec709_e}; use float4::Float4; -use spectra_xyz::{spectrum_xyz_to_p_4, EQUAL_ENERGY_REFLECTANCE}; +use spectral_upsampling::{spectrum_xyz_to_p_4, EQUAL_ENERGY_REFLECTANCE}; use crate::{lerp::Lerp, math::fast_exp}; diff --git a/sub_crates/spectra_xyz/Cargo.toml b/sub_crates/spectral_upsampling/Cargo.toml similarity index 77% rename from sub_crates/spectra_xyz/Cargo.toml rename to sub_crates/spectral_upsampling/Cargo.toml index b46401a..3dfa2d0 100644 --- a/sub_crates/spectra_xyz/Cargo.toml +++ b/sub_crates/spectral_upsampling/Cargo.toml @@ -1,12 +1,12 @@ [package] -name = "spectra_xyz" +name = "spectral_upsampling" version = "0.1.0" authors = ["Nathan Vegdahl "] edition = "2018" license = "MIT" [lib] -name = "spectra_xyz" +name = "spectral_upsampling" path = "src/lib.rs" # Local crate dependencies diff --git a/sub_crates/spectra_xyz/src/generate_spectra_tables.py b/sub_crates/spectral_upsampling/src/generate_spectra_tables.py similarity index 100% rename from sub_crates/spectra_xyz/src/generate_spectra_tables.py rename to sub_crates/spectral_upsampling/src/generate_spectra_tables.py diff --git a/sub_crates/spectra_xyz/src/lib.rs b/sub_crates/spectral_upsampling/src/lib.rs similarity index 100% rename from sub_crates/spectra_xyz/src/lib.rs rename to sub_crates/spectral_upsampling/src/lib.rs diff --git a/sub_crates/spectra_xyz/src/spectra_tables.rs b/sub_crates/spectral_upsampling/src/spectra_tables.rs similarity index 100% rename from sub_crates/spectra_xyz/src/spectra_tables.rs rename to sub_crates/spectral_upsampling/src/spectra_tables.rs diff --git a/sub_crates/spectra_xyz/src/xyz_5nm_360_830.csv b/sub_crates/spectral_upsampling/src/xyz_5nm_360_830.csv similarity index 100% rename from sub_crates/spectra_xyz/src/xyz_5nm_360_830.csv rename to sub_crates/spectral_upsampling/src/xyz_5nm_360_830.csv diff --git a/sub_crates/spectra_xyz/src/xyz_5nm_380_780.csv b/sub_crates/spectral_upsampling/src/xyz_5nm_380_780.csv similarity index 100% rename from sub_crates/spectra_xyz/src/xyz_5nm_380_780.csv rename to sub_crates/spectral_upsampling/src/xyz_5nm_380_780.csv