ishan/raytracing-in-a-weekend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a minor issue

Browse Source
This commit is contained in:
Ishan Jain 2020-03-13 16:24:39 +05:30
parent 718c9688a8
commit 53d0760fc4
1 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/main.rs
View File

@ -49,7 +49,7 @@ fn main() -> Result<(), String> {
//println!("{:?} {:?} {:?}", texture.query(), texture.color_mod(), texture.alpha_mod()); //println!("{:?} {:?} {:?}", texture.query(), texture.color_mod(), texture.alpha_mod());
let mut active_demo: Box<dyn Demo> = Box::new(demos::SimpleRectangle); let mut active_demo: &dyn Demo = &demos::SimpleRectangle;
// TODO: Should update when window is unfocus since the project window retains // TODO: Should update when window is unfocus since the project window retains
// data from overlapped window // data from overlapped window
// TODO: Maybe consider using condition variable to make loop {} not run at full // TODO: Maybe consider using condition variable to make loop {} not run at full
@ -66,25 +66,61 @@ fn main() -> Result<(), String> {
} => return Ok(()), } => return Ok(()),
Event::KeyUp { keycode, .. } => { Event::KeyUp { keycode, .. } => {
match keycode { match keycode {
Some(Keycode::S) => active_demo.save_as_ppm(&buffer, width, height), Some(Keycode::S) => {
Some(Keycode::Num1) => active_demo = Box::new(demos::SimpleRectangle), active_demo.save_as_ppm(&buffer, width, height);
Some(Keycode::Num2) => { should_update = false;
active_demo = Box::new(demos::LinearGradientRectangle) }
Some(Keycode::Num1) => {
active_demo = &demos::SimpleRectangle;
should_update = true;
}
Some(Keycode::Num2) => {
active_demo = &demos::LinearGradientRectangle;
should_update = true;
}
Some(Keycode::Num3) => {
active_demo = &demos::SimpleSphere;
should_update = true;
}
Some(Keycode::Num4) => {
active_demo = &demos::SurfaceNormalSphere;
should_update = true;
}
Some(Keycode::Num5) => {
active_demo = &demos::HitableSphere;
should_update = true;
}
Some(Keycode::Num6) => {
active_demo = &demos::SimpleAntialiasing;
should_update = true;
}
Some(Keycode::Num7) => {
active_demo = &demos::DiffuseMaterials;
should_update = true;
}
Some(Keycode::Num8) => {
active_demo = &demos::Materials;
should_update = true;
}
Some(Keycode::Num9) => {
active_demo = &demos::DielectricMaterial;
should_update = true;
}
Some(Keycode::Num0) => {
active_demo = &demos::PositionableCamera;
should_update = true;
}
Some(Keycode::Minus) => {
active_demo = &demos::DefocusBlur;
should_update = true;
}
Some(Keycode::Equals) => {
active_demo = &demos::FinalScene;
should_update = true;
} }
Some(Keycode::Num3) => active_demo = Box::new(demos::SimpleSphere),
Some(Keycode::Num4) => active_demo = Box::new(demos::SurfaceNormalSphere),
Some(Keycode::Num5) => active_demo = Box::new(demos::HitableSphere),
Some(Keycode::Num6) => active_demo = Box::new(demos::SimpleAntialiasing),
Some(Keycode::Num7) => active_demo = Box::new(demos::DiffuseMaterials),
Some(Keycode::Num8) => active_demo = Box::new(demos::Materials),
Some(Keycode::Num9) => active_demo = Box::new(demos::DielectricMaterial),
Some(Keycode::Num0) => active_demo = Box::new(demos::PositionableCamera),
Some(Keycode::Minus) => active_demo = Box::new(demos::DefocusBlur),
Some(Keycode::Equals) => active_demo = Box::new(demos::FinalScene),
None => unreachable!(), None => unreachable!(),
_ => (), _ => (),
}; };
should_update = true;
} }
Event::Window { Event::Window {
win_event: WindowEvent::Resized(w, h), win_event: WindowEvent::Resized(w, h),