Added ability to print the debug data of a data tree file.
This is purely for debug purposes, to make sure everything is working correctly. Should be removed in the future.
This commit is contained in:
parent
6268a61770
commit
147b22b861
22
src/main.rs
22
src/main.rs
|
@ -17,6 +17,9 @@ mod bvh;
|
||||||
mod halton;
|
mod halton;
|
||||||
|
|
||||||
use std::mem;
|
use std::mem;
|
||||||
|
use std::io;
|
||||||
|
use std::io::Read;
|
||||||
|
use std::fs::File;
|
||||||
|
|
||||||
use docopt::Docopt;
|
use docopt::Docopt;
|
||||||
|
|
||||||
|
@ -25,6 +28,7 @@ use ray::Ray;
|
||||||
use camera::Camera;
|
use camera::Camera;
|
||||||
use renderer::Renderer;
|
use renderer::Renderer;
|
||||||
use surface::triangle_mesh::TriangleMesh;
|
use surface::triangle_mesh::TriangleMesh;
|
||||||
|
use parse::DataTree;
|
||||||
|
|
||||||
// ----------------------------------------------------------------
|
// ----------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -35,11 +39,12 @@ Psychopath <VERSION>
|
||||||
|
|
||||||
Usage:
|
Usage:
|
||||||
psychopath [options] <imgpath>
|
psychopath [options] <imgpath>
|
||||||
|
psychopath [options] -i <file>
|
||||||
psychopath (-h | --help)
|
psychopath (-h | --help)
|
||||||
psychopath --version
|
psychopath --version
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
-i <input_file> Input .psy file
|
-i <file>, --input <file> Input .psy file
|
||||||
-s <n>, --spp <n> Number of samples per pixel [default: 16].
|
-s <n>, --spp <n> Number of samples per pixel [default: 16].
|
||||||
-h, --help Show this screen.
|
-h, --help Show this screen.
|
||||||
--version Show version.
|
--version Show version.
|
||||||
|
@ -48,7 +53,7 @@ Options:
|
||||||
#[derive(Debug, RustcDecodable)]
|
#[derive(Debug, RustcDecodable)]
|
||||||
struct Args {
|
struct Args {
|
||||||
arg_imgpath: String,
|
arg_imgpath: String,
|
||||||
flag_input_file: Option<String>,
|
flag_input: Option<String>,
|
||||||
flag_spp: Option<u32>,
|
flag_spp: Option<u32>,
|
||||||
flag_version: bool,
|
flag_version: bool,
|
||||||
}
|
}
|
||||||
|
@ -68,6 +73,19 @@ fn main() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// =======================
|
||||||
|
// Print tree from psy file if passed as an argument.
|
||||||
|
// TODO: remove this, because it's for debugging
|
||||||
|
if let Some(fp) = args.flag_input {
|
||||||
|
let mut f = io::BufReader::new(File::open(fp).unwrap());
|
||||||
|
let mut s = String::new();
|
||||||
|
let _ = f.read_to_string(&mut s);
|
||||||
|
let dt = DataTree::from_str(&s);
|
||||||
|
println!("{:#?}", dt);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// =======================
|
||||||
|
|
||||||
let samples_per_pixel = args.flag_spp.unwrap_or_else(|| 16);
|
let samples_per_pixel = args.flag_spp.unwrap_or_else(|| 16);
|
||||||
println!("Sample count: {}", samples_per_pixel);
|
println!("Sample count: {}", samples_per_pixel);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user