adamf/rust-raytracer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added background pixels

Browse Source
This commit is contained in:
STP
2023-11-17 14:25:59 -05:00
parent 09f613f59f
commit cba39b1b53
1 changed files with 93 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
src/main.rs
View File

@@ -12,6 +12,7 @@ use error_iter::ErrorIter as _;
use nalgebra::{Point3, Vector3};
use pixels::{Error, Pixels, SurfaceTexture};
use std::env;
use std::rc::Rc;
use std::sync::Arc;
use winit::dpi::LogicalSize;
use winit::event::{Event, VirtualKeyCode};
@@ -31,16 +32,79 @@ const START_WIDTH: i32 = 600;
const START_HEIGHT: i32 = 555;
const BOX_SIZE: i16 = 64;
const EPSILON: f32 = 1e-7;
const INFINITY: f32 = 1e7;
const EPSILON: f32 = 1e-6;
const INFINITY: f32 = f32::MAX;
const EPSILON_VECTOR: Vector3<f32> = Vector3::new(EPSILON, EPSILON, EPSILON);
const INFINITY_VECTOR: Vector3<f32> = Vector3::new(INFINITY, INFINITY, INFINITY);
struct State {
scene: Scene,
camera: Camera,
rays: Vec<Ray>,
index: usize,
width: i32,
height: i32,
gui: Gui,
}
impl State {
/// Create a new `World` instance that can draw a moving box.
fn new(width: i32, height: i32, scene: Scene, camera: Camera, gui: Gui) -> Self {
let rays = camera.cast_rays(width, height);
Self {
width,
height,
index: 0,
rays,
scene,
camera,
gui,
}
}
/// Update the `World` internal state; bounce the box around the screen.
fn update(&mut self) {
let gui = &self.gui;
if gui.reset {
self.index = 0;
}
}
/// Resize the world
fn resize(&mut self, width: i32, height: i32) {
self.width = width;
self.height = height;
}
/// Draw the `World` state to the frame buffer.
///
/// Assumes the default texture format: `wgpu::TextureFormat::Rgba8UnormSrgb`
fn draw(&mut self, frame: &mut [u8]) {
for i in 0..self.gui.num_rays {
let ray = &self.rays[self.index];
let colour = raytracer::shade_ray(&self.scene, &ray);
let rgba = match colour {
Some(colour) => [colour.x, colour.y, colour.z, 255],
None => [122, 122, 122, 100],
};
frame[self.index * 4..(self.index + 1) * 4].copy_from_slice(&rgba);
self.index = self.index + 1;
}
}
fn draw_all(&mut self, frame: &mut [u8]) {
let rays = self.camera.cast_rays(self.width, self.height);
let colours = raytracer::shade_rays(&self.scene, &rays, self.width, self.height);
for (i, colour) in colours.iter().enumerate() {
let colour = colours[i];
// pixel[0] = colour.x;
// pixel[1] = colour.y;
// pixel[2] = colour.z;
// pixel[3] = 255;
}
}
}
fn main() -> Result<(), Error> {
@@ -64,57 +128,55 @@ fn main() -> Result<(), Error> {
Pixels::new(START_WIDTH as u32, START_HEIGHT as u32, surface_texture)?
};
//Camera
let eye = Point3::new(0.0, 0.0, 3.0);
let eye = Point3::new(10.0, 10.0, 10.0);
let target = Point3::new(0.0, 0.0, 0.0);
let up = Vector3::new(0.0, 1.0, 0.0);
let arc_camera = Arc::new(Camera::new(
eye,
target,
up,
180.0,
(START_WIDTH as f32 / START_HEIGHT as f32) as f32,
));
let camera = Camera::new(
eye,
target,
up,
180.0,
120.0,
(START_WIDTH as f32 / START_HEIGHT as f32) as f32,
);
let cameras: Vec<Arc<Camera>> = vec![arc_camera.clone()];
//Primitive
let arc_material = Arc::new(Material::magenta());
let cameras: Vec<Arc<Camera>> = Vec::new();
// SETUP PRIMITIVES
let mut primitives: Vec<Arc<dyn Primitive>> = Vec::new();
let arc_sphere = Arc::new(Sphere::unit(arc_material.clone()));
let arc_cone = Arc::new(Cone::unit(arc_material.clone()));
primitives.push(arc_sphere.clone());
primitives.push(arc_cone.clone());
let magenta = Arc::new(Material::magenta());
let blue = Arc::new(Material::blue());
let turquoise = Arc::new(Material::turquoise());
// let sphere = Arc::new(Sphere::unit(magenta.clone()));
// primitives.push(sphere.clone());
// let cone = Arc::new(Cone::new(0.25, 1.0, -0.5, turquoise.clone()));
// primitives.push(cone.clone());
let cube = Arc::new(Box::unit(blue.clone()));
primitives.push(cube.clone());
//Lights
let light: Arc<Light>;
let light = Arc::new(Light::white());
let lights = vec![light];
let ambient_light = Arc::new(Vector3::new(1.0, 1.0, 0.0));
let mut lights: Vec<Arc<Light>> = Vec::new();
let light_pos = Point3::new(10.0, 12.0, 10.0);
let light_colour = Vector3::new(1.0, 0.0, 1.0);
let light_falloff = [1.0, 0.00, 0.00];
let light = Arc::new(Light::new(light_colour, light_pos, light_falloff));
lights.push(light.clone());
let ambient_light = Arc::new(Vector3::new(0.0, 0.0, 0.2));
//State
let scene = Scene::new(primitives, lights, cameras, ambient_light);
let mut state = State::new(START_WIDTH, START_HEIGHT, scene, camera);
// Set up Dear ImGui
let mut gui = Gui::new(&window, &pixels);
let gui = Gui::new(&window, &pixels);
let scene = Scene::new(primitives, lights, cameras, ambient_light);
let mut state = State::new(START_WIDTH, START_HEIGHT, scene, camera, gui);
event_loop.run(move |event, _, control_flow| {
// Draw the current frame
if let Event::RedrawRequested(_) = event {
for i in 0..gui.num_rays {
state.draw(pixels.frame_mut());
}
state.draw(pixels.frame_mut());
// Draw the world
// Prepare Dear ImGui
gui.prepare(&window).expect("gui.prepare() failed");
state.gui.prepare(&window).expect("gui.prepare() failed");
// Render everything together
let render_result = pixels.render_with(|encoder, render_target, context| {
// Render the world texture
context.scaling_renderer.render(encoder, render_target);
// Render Dear ImGui
gui.render(&window, encoder, render_target, context)?;
state.gui.render(&window, encoder, render_target, context)?;
// *control_flow = ControlFlow::Exit;
Ok(())
});
@@ -127,7 +189,7 @@ fn main() -> Result<(), Error> {
}
// Handle input events
gui.handle_event(&window, &event);
state.gui.handle_event(&window, &event);
if input.update(&event) {
// Close events
if input.key_pressed(VirtualKeyCode::Escape) || input.quit() {
@@ -162,51 +224,3 @@ fn log_error<E: std::error::Error + 'static>(method_name: &str, err: E) {
error!(" Caused by: {source}");
}
}
impl State {
/// Create a new `World` instance that can draw a moving box.
fn new(width: i32, height: i32, scene: Scene, camera: Camera) -> Self {
let index = 0;
let rays = camera.cast_rays(width, height);
Self {
width,
height,
index,
rays,
scene,
camera,
}
}
/// Update the `World` internal state; bounce the box around the screen.
fn update(&mut self) {}
/// Resize the world
fn resize(&mut self, width: i32, height: i32) {
self.width = width;
self.height = height;
}
/// Draw the `World` state to the frame buffer.
///
/// Assumes the default texture format: `wgpu::TextureFormat::Rgba8UnormSrgb`
fn draw(&mut self, frame: &mut [u8]) {
let ray = &self.rays[self.index];
let colour = raytracer::shade_ray(&self.scene, &ray);
let pixel = &mut frame[self.index * 4..(self.index + 1) * 4]
.copy_from_slice(&[colour.x, colour.y, colour.z, 255]);
self.index += 1;
}
fn draw_all(&mut self, frame: &mut [u8]) {
let rays = self.camera.cast_rays(self.width, self.height);
let colours = raytracer::shade_rays(&self.scene, &rays, self.width, self.height);
for (i, colour) in colours.iter().enumerate() {
let colour = colours[i];
// pixel[0] = colour.x;
// pixel[1] = colour.y;
// pixel[2] = colour.z;
// pixel[3] = 255;
}
}
}