Merge branch 'master' of https://git.z.xinu.tv/wathiede/raytracers

rtiow/Cargo.toml

@@ -2,6 +2,7 @@
 
 members = [
   "noise_explorer",
+  "noise_explorer_warp",
   "renderer",
   "tracer",
 ]

rtiow/noise_explorer/Cargo.toml

@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 actix-web = "0.7.8"
 askama = "0.7.1"
-image = "0.19.0"
+image = "0.22.3"
 log = "0.4.5"
 rand = "0.5.5"
 renderer = { path = "../renderer" }

rtiow/noise_explorer/src/main.rs

@@ -418,7 +418,6 @@ fn noise_marble(
     np: Path<NoiseParamsMarble>,
     optional: Option<Query<OptionalParams>>,
 ) -> Result<HttpResponse> {
-    info!("optional {:?}", optional);
     noise(NoiseParams {
         width: np.width,
         height: np.height,

rtiow/noise_explorer_warp/Cargo.toml

@@ -0,0 +1,19 @@
+[package]
+name = "noise_explorer_warp"
+version = "0.1.0"
+authors = ["Bill Thiede <git@xinu.tv>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+askama = "0.7.1"
+image = "0.22.3"
+log = "0.4.5"
+rand = "0.5.5"
+renderer = { path = "../renderer" }
+serde = "1.0.79"
+serde_derive = "1.0.79"
+stderrlog = "0.4.1"
+structopt = "0.2.10"
+warp = "0.1.20"

rtiow/noise_explorer_warp/src/main.rs

@@ -0,0 +1,5 @@
+use warp;
+
+fn main() {
+    println!("Hello, world!");
+}

rtiow/renderer/src/human.rs

@@ -6,7 +6,7 @@
 //! Print some human readable strings
 //!
 //! ```rust
-//! use rtiow::human;
+//! use renderer::human;
 //!
 //! // "1.00 k"
 //! let tmpStr = human::Formatter::new()