From 534a7d70977603381301fd1b1a7009daaadc4f59 Mon Sep 17 00:00:00 2001 From: hal8174 Date: Mon, 7 Oct 2024 22:41:38 +0200 Subject: [PATCH] Add clap to tev --- Cargo.lock | 114 +++++++++++++++++++++++++++++++++ ray-tracing-tev/Cargo.toml | 1 + ray-tracing-tev/src/main.rs | 124 ++++++++++++++++++++---------------- 3 files changed, 185 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 829cc4d..d2bee9d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,6 +29,55 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1" +[[package]] +name = "anstream" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" + +[[package]] +name = "anstyle-parse" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.89" @@ -192,12 +241,58 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "clap" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + [[package]] name = "color_quant" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" + [[package]] name = "crc32fast" version = "1.4.2" @@ -419,6 +514,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.12.1" @@ -882,6 +983,7 @@ dependencies = [ name = "ray-tracing-tev" version = "0.1.0" dependencies = [ + "clap", "rand", "ray-tracing-core", "ray-tracing-renderer", @@ -1015,6 +1117,12 @@ dependencies = [ "lock_api", ] +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "supports-color" version = "3.0.1" @@ -1176,6 +1284,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "v_frame" version = "0.3.8" diff --git a/ray-tracing-tev/Cargo.toml b/ray-tracing-tev/Cargo.toml index 5093c57..b2426f3 100644 --- a/ray-tracing-tev/Cargo.toml +++ b/ray-tracing-tev/Cargo.toml @@ -10,3 +10,4 @@ ray-tracing-scene = { path = "../ray-tracing-scene" } ray-tracing-renderer = { path = "../ray-tracing-renderer" } rayon = "1.10.0" rand = { version = "0.8.5", features = ["small_rng"] } +clap = { version = "4.5.19", features = ["derive"] } diff --git a/ray-tracing-tev/src/main.rs b/ray-tracing-tev/src/main.rs index c425637..1c26f4a 100644 --- a/ray-tracing-tev/src/main.rs +++ b/ray-tracing-tev/src/main.rs @@ -1,3 +1,4 @@ +use clap::Parser; use rand::{rngs::SmallRng, SeedableRng}; use ray_tracing_core::{ camera::{BasicCamera, Camera}, @@ -9,12 +10,24 @@ use ray_tracing_renderer::{ depth_renderer::DepthRenderer, path_tracer::PathTracer, path_tracer_importance::PathTracerImportance, }; -use ray_tracing_scene::examples::cornell2; -use ray_tracing_scene::triangle_bvh::TriangleBVH; +use ray_tracing_scene::examples::example_scenes; use rayon::prelude::*; use std::net::TcpStream; use tev_client::{PacketCreateImage, PacketUpdateImage, TevClient, TevError}; +#[derive(Parser)] +struct Args { + #[arg(default_value = "127.0.0.1:14158")] + tev: String, + scenes: Vec, + #[arg(default_value_t = 400)] + width: u32, + #[arg(default_value_t = 400)] + height: u32, + #[arg(default_value_t = 1024)] + samples_per_pixel: usize, +} + fn render_image< R: ClassicalRenderer + Sync, S: Scene + Sync, @@ -69,63 +82,66 @@ fn render_image< Ok(()) } -fn get_scene() -> (TriangleBVH, BasicCamera) { - let s = cornell2(); - - let c = BasicCamera::new( - 400, - 400, - s.camera_pos, - s.camera_dir, - s.camera_up, - s.horizontal_fov, - ); - - (s.scene, c) -} - fn main() { - let mut client = TevClient::wrap(TcpStream::connect("127.0.0.1:14158").unwrap()); + let args = Args::parse(); - let (s, c) = get_scene(); - let width = 400; - let height = 400; + let mut client = TevClient::wrap(TcpStream::connect(args.tev).unwrap()); - let r = DepthRenderer::new(width, height); - render_image("depth renderer", &r, &s, &c, 128, &mut client).unwrap(); + let map = example_scenes(); - let samples_per_pixel = 1024; + let scenes: Vec<&str> = if args.scenes.is_empty() { + map.keys().copied().collect() + } else { + args.scenes.iter().map(|s| s.as_str()).collect() + }; - let r = PathTracer::new(width, height); - render_image( - "example path tracer", - &r, - &s, - &c, - samples_per_pixel, - &mut client, - ) - .unwrap(); + for scene in scenes { + let f = map.get(scene).unwrap(); + let e = f(); - let r = PathTracerImportance::new(width, height); - render_image( - "example path tracer importance 1024", - &r, - &s, - &c, - samples_per_pixel, - &mut client, - ) - .unwrap(); + let c = BasicCamera::new( + args.width, + args.height, + e.camera_pos, + e.camera_dir, + e.camera_up, + e.horizontal_fov, + ); + let s = e.scene; - let r = PathTracerImportance::new(width, height); - render_image( - "example path tracer importance 2048", - &r, - &s, - &c, - 2048, - &mut client, - ) - .unwrap(); + let r = DepthRenderer::new(args.width, args.height); + render_image( + format!("{scene} - depth renderer"), + &r, + &s, + &c, + 128, + &mut client, + ) + .unwrap(); + + let samples_per_pixel = 1024; + + let r = PathTracer::new(args.width, args.height); + render_image( + format!("{scene} - path tracer"), + &r, + &s, + &c, + samples_per_pixel, + &mut client, + ) + .unwrap(); + + let r = PathTracerImportance::new(args.width, args.height); + render_image( + format!("{scene} - path tracer importance"), + &r, + &s, + &c, + samples_per_pixel, + &mut client, + ) + .unwrap(); + } }