From 36e0ea9432bd81de6fdb38f2d22f0c3d59bb5598 Mon Sep 17 00:00:00 2001 From: numzero Date: Mon, 30 Dec 2024 20:10:22 +0300 Subject: [PATCH] Move modules to lib crate --- src/{bin/minitracer => }/anim.rs | 0 src/bin/minitracer/main.rs | 11 +++-------- src/lib.rs | 5 +++++ src/{bin/minitracer => }/present.rs | 0 src/{bin/minitracer => }/present.wgsl | 0 src/{bin/minitracer => }/trace.rs | 0 src/{bin/minitracer => }/trace.wgsl | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename src/{bin/minitracer => }/anim.rs (100%) rename src/{bin/minitracer => }/present.rs (100%) rename src/{bin/minitracer => }/present.wgsl (100%) rename src/{bin/minitracer => }/trace.rs (100%) rename src/{bin/minitracer => }/trace.wgsl (100%) diff --git a/src/bin/minitracer/anim.rs b/src/anim.rs similarity index 100% rename from src/bin/minitracer/anim.rs rename to src/anim.rs diff --git a/src/bin/minitracer/main.rs b/src/bin/minitracer/main.rs index 4b5c568..6a1d201 100644 --- a/src/bin/minitracer/main.rs +++ b/src/bin/minitracer/main.rs @@ -2,20 +2,15 @@ use std::error::Error; use glam::{mat3, uvec2, vec3, Vec3}; use image::ImageReader; -use present::Presenter; -use trace::{Tracer, TracerData, TracerEnv}; +use raytracing3::anim; +use raytracing3::present::{self, Presenter}; +use raytracing3::trace::{self, Tracer, TracerData, TracerEnv}; use winit::{ event::{Event, WindowEvent}, event_loop::EventLoop, window::{Window, WindowAttributes}, }; -mod anim; -mod present; -mod trace; - -pub use trace::Sphere; - struct CamLoc { eye: Vec3, forward: Vec3, diff --git a/src/lib.rs b/src/lib.rs index dc06e2a..14f2770 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1 +1,6 @@ +pub mod anim; pub mod perlin; +pub mod present; +pub mod trace; + +pub use trace::Sphere; diff --git a/src/bin/minitracer/present.rs b/src/present.rs similarity index 100% rename from src/bin/minitracer/present.rs rename to src/present.rs diff --git a/src/bin/minitracer/present.wgsl b/src/present.wgsl similarity index 100% rename from src/bin/minitracer/present.wgsl rename to src/present.wgsl diff --git a/src/bin/minitracer/trace.rs b/src/trace.rs similarity index 100% rename from src/bin/minitracer/trace.rs rename to src/trace.rs diff --git a/src/bin/minitracer/trace.wgsl b/src/trace.wgsl similarity index 100% rename from src/bin/minitracer/trace.wgsl rename to src/trace.wgsl