From ba2d853319298c6114cdbd64fe09da7020e9cf17 Mon Sep 17 00:00:00 2001 From: hal8174 Date: Sat, 4 Jan 2025 23:22:04 +0100 Subject: [PATCH] Clean up renderer classes --- ray-tracing-renderer/src/depth_renderer.rs | 20 ++++--------------- .../src/next_event_estimation.rs | 20 ++++--------------- ray-tracing-renderer/src/path_tracer.rs | 20 ++++--------------- .../src/path_tracer_importance.rs | 20 ++++--------------- 4 files changed, 16 insertions(+), 64 deletions(-) diff --git a/ray-tracing-renderer/src/depth_renderer.rs b/ray-tracing-renderer/src/depth_renderer.rs index 5d2c49d..bc783b8 100644 --- a/ray-tracing-renderer/src/depth_renderer.rs +++ b/ray-tracing-renderer/src/depth_renderer.rs @@ -1,29 +1,17 @@ use ray_tracing_core::{camera::Camera, prelude::*, renderer::ClassicalRenderer, scene::Scene}; -use std::marker::PhantomData; -pub struct DepthRenderer -where - R: Rng, -{ +pub struct DepthRenderer { width: u32, height: u32, - rng: PhantomData, } -impl DepthRenderer -where - R: Rng, -{ +impl DepthRenderer { pub fn new(width: u32, height: u32) -> Self { - Self { - rng: PhantomData {}, - width, - height, - } + Self { width, height } } } -impl ClassicalRenderer for DepthRenderer +impl ClassicalRenderer for DepthRenderer where S: Scene, C: Camera, diff --git a/ray-tracing-renderer/src/next_event_estimation.rs b/ray-tracing-renderer/src/next_event_estimation.rs index 33bc695..926702c 100644 --- a/ray-tracing-renderer/src/next_event_estimation.rs +++ b/ray-tracing-renderer/src/next_event_estimation.rs @@ -1,29 +1,17 @@ use ray_tracing_core::{camera::Camera, prelude::*, renderer::ClassicalRenderer, scene::Scene}; -use std::marker::PhantomData; -pub struct NextEventEstimation -where - R: Rng, -{ +pub struct NextEventEstimation { width: u32, height: u32, - rng: PhantomData, } -impl NextEventEstimation -where - R: Rng, -{ +impl NextEventEstimation { pub fn new(width: u32, height: u32) -> Self { - Self { - width, - height, - rng: PhantomData {}, - } + Self { width, height } } } -impl ClassicalRenderer for NextEventEstimation +impl ClassicalRenderer for NextEventEstimation where S: Scene, C: Camera, diff --git a/ray-tracing-renderer/src/path_tracer.rs b/ray-tracing-renderer/src/path_tracer.rs index 46a13db..dc80615 100644 --- a/ray-tracing-renderer/src/path_tracer.rs +++ b/ray-tracing-renderer/src/path_tracer.rs @@ -1,29 +1,17 @@ use ray_tracing_core::{camera::Camera, prelude::*, renderer::ClassicalRenderer, scene::Scene}; -use std::marker::PhantomData; -pub struct PathTracer -where - R: Rng, -{ +pub struct PathTracer { width: u32, height: u32, - rng: PhantomData, } -impl PathTracer -where - R: Rng, -{ +impl PathTracer { pub fn new(width: u32, height: u32) -> Self { - Self { - width, - height, - rng: PhantomData {}, - } + Self { width, height } } } -impl ClassicalRenderer for PathTracer +impl ClassicalRenderer for PathTracer where S: Scene, C: Camera, diff --git a/ray-tracing-renderer/src/path_tracer_importance.rs b/ray-tracing-renderer/src/path_tracer_importance.rs index e7dae5a..45c2d37 100644 --- a/ray-tracing-renderer/src/path_tracer_importance.rs +++ b/ray-tracing-renderer/src/path_tracer_importance.rs @@ -1,29 +1,17 @@ use ray_tracing_core::{camera::Camera, prelude::*, renderer::ClassicalRenderer, scene::Scene}; -use std::marker::PhantomData; -pub struct PathTracerImportance -where - R: Rng, -{ +pub struct PathTracerImportance { width: u32, height: u32, - rng: PhantomData, } -impl PathTracerImportance -where - R: Rng, -{ +impl PathTracerImportance { pub fn new(width: u32, height: u32) -> Self { - Self { - width, - height, - rng: PhantomData {}, - } + Self { width, height } } } -impl ClassicalRenderer for PathTracerImportance +impl ClassicalRenderer for PathTracerImportance where S: Scene, C: Camera,