ray-tracer-challenge/ray-tracer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

completed rename. merged crates to features

Browse Source
This commit is contained in:
Jon Janzen
2021-06-13 09:53:38 -06:00
parent 90d3148335
commit 29bccd78fe
20 changed files with 7839 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Cargo.lock generated
View File

@@ -18,27 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "canvas"
version = "0.1.0"
dependencies = [
"color",
]
[[package]]
name = "color"
name = "features"
version = "0.1.0"
dependencies = [
"approx",
]
[[package]]
name = "matrix"
version = "0.1.0"
dependencies = [
"approx",
"structs",
]
[[package]]
name = "num-traits"
version = "0.2.14"
@@ -49,18 +34,8 @@ dependencies = [
]
[[package]]
name = "structs"
name = "ray-tracer"
version = "0.1.0"
dependencies = [
"approx",
]
[[package]]
name = "tuples"
version = "0.1.0"
dependencies = [
"canvas",
"color",
"matrix",
"structs",
"features",
]

7
Cargo.toml
View File

@@ -1,5 +1,5 @@
[package]
name = "tuples"
name = "ray-tracer"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
@@ -7,7 +7,4 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
canvas = { path = "canvas" }
color = { path = "color" }
structs = { path = "structs" }
matrix = { path = "matrix" }
features = { path = "features" }

39
canvas/Cargo.lock generated
View File

@@ -1,39 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "approx"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
dependencies = [
"num-traits",
]
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "canvas"
version = "0.1.0"
dependencies = [
"color",
]
[[package]]
name = "color"
version = "0.1.0"
dependencies = [
"approx",
]
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]

10
canvas/Cargo.toml
View File

@@ -1,10 +0,0 @@
[package]
name = "canvas"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
color = { path = "../color" }

32
color/Cargo.lock generated
View File

@@ -1,32 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "approx"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
dependencies = [
"num-traits",
]
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "color"
version = "0.1.0"
dependencies = [
"approx",
]
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]

16
tuples/Cargo.lock → features/Cargo.lock generated
View File

@@ -1,5 +1,7 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
version = 3
[[package]]
name = "approx"
version = "0.4.0"
@@ -15,6 +17,13 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "features"
version = "0.1.0"
dependencies = [
"approx",
]
[[package]]
name = "num-traits"
version = "0.2.14"
@@ -23,10 +32,3 @@ checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]
[[package]]
name = "tuples"
version = "0.1.0"
dependencies = [
"approx",
]

3
color/Cargo.toml → features/Cargo.toml
View File

@@ -1,7 +1,6 @@
[package]
name = "color"
name = "features"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
canvas/src/lib.rs → features/src/canvas.rs
View File

@@ -1,4 +1,4 @@
use color::Color;
use crate::color::Color;
pub struct Canvas {
width: usize,

3
color/src/lib.rs → features/src/color.rs
View File

@@ -1,6 +1,3 @@
#[macro_use]
extern crate approx;
use std::ops;
#[derive(Debug, Copy, Clone)]

15
features/src/lib.rs Normal file
View File

@@ -0,0 +1,15 @@
#[macro_use]
extern crate approx;
pub mod structs;
pub mod color;
pub mod canvas;
pub mod matrix;
#[cfg(test)]
mod tests {
#[test]
fn it_works() {
assert_eq!(2 + 2, 4);
}
}

5
matrix/src/lib.rs → features/src/matrix.rs
View File

@@ -1,7 +1,4 @@
#[macro_use]
extern crate approx;
use structs::Tuple;
use crate::structs::Tuple;
use std::ops::{Index, IndexMut};

3
structs/src/lib.rs → features/src/structs.rs
View File

@@ -1,6 +1,3 @@
#[macro_use]
extern crate approx;
use std::fmt;
use std::ops;

0
tuples/src/lib.rs → features/src/tuples.rs
View File

40
matrix/Cargo.lock generated
View File

@@ -1,40 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "approx"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
dependencies = [
"num-traits",
]
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "matrix"
version = "0.1.0"
dependencies = [
"approx",
"structs",
]
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]
[[package]]
name = "structs"
version = "0.1.0"
dependencies = [
"approx",
]

11
matrix/Cargo.toml
View File

@@ -1,11 +0,0 @@
[package]
name = "matrix"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
approx = "0.4"
structs = { path = "../structs" }

7803
out.ppm Normal file
View File

File diff suppressed because it is too large Load Diff

8
src/main.rs
View File

@@ -1,7 +1,7 @@
use canvas::Canvas;
use color::Color;
use structs::Tuple;
use matrix::Matrix;
use features::canvas::Canvas;
use features::color::Color;
use features::structs::Tuple;
use features::matrix::Matrix;
use std::fmt;
use std::fs::File;

32
structs/Cargo.lock generated
View File

@@ -1,32 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "approx"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278"
dependencies = [
"num-traits",
]
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]
[[package]]
name = "structs"
version = "0.1.0"
dependencies = [
"approx",
]

10
structs/Cargo.toml
View File

@@ -1,10 +0,0 @@
[package]
name = "structs"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
approx = "0.4"

10
tuples/Cargo.toml
View File

@@ -1,10 +0,0 @@
[package]
name = "tuples"
version = "0.1.0"
authors = ["Jon Janzen <jonjanzen@me.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
approx = "0.4"