diff --git a/src/bin/envmap/perlin.wgsl b/shaders/perlin.wgsl similarity index 100% rename from src/bin/envmap/perlin.wgsl rename to shaders/perlin.wgsl diff --git a/src/bin/envmap/main.rs b/src/bin/envmap/main.rs index 98fb418..0a976b2 100644 --- a/src/bin/envmap/main.rs +++ b/src/bin/envmap/main.rs @@ -1,15 +1,13 @@ use std::error::Error; use glam::{vec2, vec3}; -use perlin::{Pipeline, Vertex}; +use raytracing3::perlin::{self, Pipeline, Vertex}; use winit::{ event::{Event, WindowEvent}, event_loop::EventLoop, window::{Window, WindowAttributes}, }; -mod perlin; - fn make_viewport(w: u32, h: u32) -> [Vertex; 4] { let w = w as f32; let h = h as f32; diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..dc06e2a --- /dev/null +++ b/src/lib.rs @@ -0,0 +1 @@ +pub mod perlin; diff --git a/src/bin/envmap/perlin.rs b/src/perlin.rs similarity index 97% rename from src/bin/envmap/perlin.rs rename to src/perlin.rs index 3e20c0b..2fb3a48 100644 --- a/src/bin/envmap/perlin.rs +++ b/src/perlin.rs @@ -42,7 +42,7 @@ impl Pipeline { mapped_at_creation: false, }); - let shader = fs::read_to_string("src/bin/envmap/perlin.wgsl").unwrap(); + let shader = fs::read_to_string("shaders/perlin.wgsl").unwrap(); let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor { label: None, source: wgpu::ShaderSource::Wgsl(shader.into()),