resolved local state conflict

This commit is contained in:
2026-06-22 08:46:01 +02:00
parent 4db5cbbad2
commit 83e3f2e41b
8 changed files with 9 additions and 9 deletions

View File

@@ -27,7 +27,7 @@ pub struct Camera {
defocus_disk_v: Vec3, defocus_disk_v: Vec3,
} }
// FIXME: kinda out of place in this file. // FIXME (low priority): kinda out of place in this file.
fn deg_to_rad(deg: f32) -> f32 { fn deg_to_rad(deg: f32) -> f32 {
deg * PI / 180. deg * PI / 180.
} }

View File

@@ -15,12 +15,12 @@ use crate::scenes::scene::Scene;
use crate::vec3::Vec3; use crate::vec3::Vec3;
use dotenv::dotenv; use dotenv::dotenv;
// TODO: implement scene serialization // TODO (low priority): implement scene serialization
fn main() { fn main() {
dotenv().ok(); dotenv().ok();
pretty_env_logger::init(); pretty_env_logger::init();
// TODO: better cli parsing || add random flag to generate random scene // TODO (medium priority): better cli parsing || add random flag to generate random scene
let mut json_file = "./scenes/scene.json"; let mut json_file = "./scenes/scene.json";
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
if args.len() > 1 { if args.len() > 1 {

View File

@@ -61,7 +61,7 @@ impl Hittable for Circle {
fn to_uv(&self, point: &Vec3) -> Vec3 { fn to_uv(&self, point: &Vec3) -> Vec3 {
let p = *point - self.center; let p = *point - self.center;
// TODO: add rotated texture support // TODO (low priority): add rotated texture support
Vec3::new( Vec3::new(
0.5 + p.y().atan2(*p.x()) / (2. * PI), 0.5 + p.y().atan2(*p.x()) / (2. * PI),
1. - (p.z() / self.radius).acos() / PI, 1. - (p.z() / self.radius).acos() / PI,

View File

@@ -43,7 +43,7 @@ impl Hittable for Cube {
} }
fn to_uv(&self, _point: &Vec3) -> Vec3 { fn to_uv(&self, _point: &Vec3) -> Vec3 {
// TODO: map to [0.1] relative to specific face // TODO (low priority): map to [0.1] relative to specific face
todo!() todo!()
} }
} }

View File

@@ -80,7 +80,7 @@ impl Hit {
(self.u, self.v) (self.u, self.v)
} }
// TODO: use front_face to discard back-hits for culling // TODO (low priority): use front_face to discard back-hits for culling
pub fn hit_list(hittables: &Vec<Arc<dyn Hittable>>, r: &Ray) -> Option<Hit> { pub fn hit_list(hittables: &Vec<Arc<dyn Hittable>>, r: &Ray) -> Option<Hit> {
let mut closest: Option<Hit> = None; let mut closest: Option<Hit> = None;
for hittable in hittables { for hittable in hittables {

View File

@@ -74,7 +74,7 @@ impl Hittable for Sphere {
fn to_uv(&self, point: &Vec3) -> Vec3 { fn to_uv(&self, point: &Vec3) -> Vec3 {
let p = *point - self.center; let p = *point - self.center;
// TODO: add rotated texture support // TODO (medium priority): add rotated texture support
Vec3::new( Vec3::new(
0.5 + p.y().atan2(*p.x()) / (2. * PI), 0.5 + p.y().atan2(*p.x()) / (2. * PI),
1. - (p.z() / self.radius).acos() / PI, 1. - (p.z() / self.radius).acos() / PI,

View File

@@ -26,7 +26,7 @@ pub fn write_image(filename: &str, pixels: &[u8], width: u32, height: u32) {
pub fn render(scene: &mut Scene) { pub fn render(scene: &mut Scene) {
scene.init(); scene.init();
// TODO: currently splits per vertical line, but could be more granular (per chunk) // TODO (low priority): currently splits per vertical line, but could be more granular (per chunk)
let mut pixels = vec![0_u8; (scene.get_image_width() * scene.get_image_height() * 3) as usize]; let mut pixels = vec![0_u8; (scene.get_image_width() * scene.get_image_height() * 3) as usize];
let scanlines: Vec<(usize, &mut [u8])> = pixels let scanlines: Vec<(usize, &mut [u8])> = pixels
.chunks_mut(scene.get_image_width() as usize * 3) .chunks_mut(scene.get_image_width() as usize * 3)

View File

@@ -28,7 +28,7 @@ pub struct Scene {
image_width: u32, image_width: u32,
image_height: u32, image_height: u32,
// raytracing // TODO: think about organisation of these vars, also in Camera // raytracing
max_depth: u32, max_depth: u32,
} }