From 9aafeb80c2dac54aa0907bd511d931a1523dbb05 Mon Sep 17 00:00:00 2001
From: Piotrek <pibaj@ciop.pl>
Date: Tue, 13 Apr 2021 09:31:15 +0200
Subject: [PATCH] move shaders to subfolder

---
 build.rs                                  |   8 ++++----
 src/app.rs                                |   4 ++--
 src/{.bin => shaders/bin}/shader.frag.spv | Bin
 src/{.bin => shaders/bin}/shader.vert.spv | Bin
 src/{ => shaders}/shader.frag             |   0
 src/{ => shaders}/shader.vert             |   0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{.bin => shaders/bin}/shader.frag.spv (100%)
 rename src/{.bin => shaders/bin}/shader.vert.spv (100%)
 rename src/{ => shaders}/shader.frag (100%)
 rename src/{ => shaders}/shader.vert (100%)

diff --git a/build.rs b/build.rs
index fe05e6e..16c85c0 100644
--- a/build.rs
+++ b/build.rs
@@ -19,7 +19,7 @@ impl ShaderData {
         let extension = src_path.extension().expect("File has no extension").to_str().unwrap();
 
         // Create output path
-        let directory = src_path.parent().unwrap().join(".bin");
+        let directory = src_path.parent().unwrap().join("bin");
         create_dir_all(directory.clone()).expect("Failed to create output directory");
         let spv_path = directory.join(filename).with_extension(format!("{}.spv", extension));
  
@@ -45,9 +45,9 @@ fn resolve_include(inc_name: &str, _inc_type: IncludeType, src_name: &str, _dept
 
 fn main() {
     // Load all shaders
-    let vert = glob("./src/**/*.vert").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Vertex));
-    let frag = glob("./src/**/*.frag").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Fragment));
-    let comp = glob("./src/**/*.comp").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Compute));
+    let vert = glob("./src/shaders/**/*.vert").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Vertex));
+    let frag = glob("./src/shaders/**/*.frag").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Fragment));
+    let comp = glob("./src/shaders/**/*.comp").unwrap().filter_map(|p| ShaderData::load(p.unwrap(), ShaderKind::Compute));
     let shaders = vert.chain(frag).chain(comp);
 
     // Options
diff --git a/src/app.rs b/src/app.rs
index bc10574..471060d 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -60,12 +60,12 @@ impl App {
             push_constant_ranges: &[],
         });
         let vert_state = wgpu::VertexState { //vert
-            module: &device.create_shader_module(&wgpu::include_spirv!(".bin\\shader.vert.spv")),
+            module: &device.create_shader_module(&wgpu::include_spirv!("shaders\\bin\\shader.vert.spv")),
             entry_point: "main",
             buffers: &[Vertex::desc()],
         };
         let frag_state = wgpu::FragmentState { // frag
-            module: &device.create_shader_module(&wgpu::include_spirv!(".bin\\shader.frag.spv")),
+            module: &device.create_shader_module(&wgpu::include_spirv!("shaders\\bin\\shader.frag.spv")),
             entry_point: "main",
             targets: &[wgpu::ColorTargetState {
                 format: swapchain_desc.format,
diff --git a/src/.bin/shader.frag.spv b/src/shaders/bin/shader.frag.spv
similarity index 100%
rename from src/.bin/shader.frag.spv
rename to src/shaders/bin/shader.frag.spv
diff --git a/src/.bin/shader.vert.spv b/src/shaders/bin/shader.vert.spv
similarity index 100%
rename from src/.bin/shader.vert.spv
rename to src/shaders/bin/shader.vert.spv
diff --git a/src/shader.frag b/src/shaders/shader.frag
similarity index 100%
rename from src/shader.frag
rename to src/shaders/shader.frag
diff --git a/src/shader.vert b/src/shaders/shader.vert
similarity index 100%
rename from src/shader.vert
rename to src/shaders/shader.vert