move files

assemble_trace.sh

@@ -3,20 +3,20 @@
 rm -r shaders_out
 mkdir -p shaders_out
 
-glslangValidator --spirv-val -gVS -S vert --target-env vulkan1.3 -o shaders_out/fullscreen.vert.spv src/fullscreen.vert.glsl
+glslangValidator --spirv-val -gVS -S vert --target-env vulkan1.3 -o shaders_out/fullscreen.vert.spv src/shaders/fullscreen.vert.glsl
-glslangValidator --spirv-val -gVS -S frag --target-env vulkan1.3 -o shaders_out/lighting.frag.spv src/lighting.frag.glsl
+glslangValidator --spirv-val -gVS -S frag --target-env vulkan1.3 -o shaders_out/lighting.frag.spv src/shaders/lighting.frag.glsl
-glslangValidator --spirv-val -gVS -S vert --target-env vulkan1.3 -o shaders_out/trace.vert.spv src/trace.vert.glsl
+glslangValidator --spirv-val -gVS -S vert --target-env vulkan1.3 -o shaders_out/trace.vert.spv src/shaders/trace.vert.glsl
 
-echo src/trace.frag.glsl
+echo src/shaders/trace.frag.glsl
-glslangValidator --spirv-val --spirv-dis -g0 -S frag --target-env vulkan1.3 --quiet src/trace.frag.glsl > shaders_out/trace.spv-dis
+glslangValidator --spirv-val --spirv-dis -g0 -S frag --target-env vulkan1.3 --quiet src/shaders/trace.frag.glsl > shaders_out/trace.spv-dis
 sed -i '/%11 =/,/OpFunctionEnd/d' shaders_out/trace.spv-dis
 sed -i 's/%11\b/%1000/g' shaders_out/trace.spv-dis
 spirv-as --preserve-numeric-ids --target-env vulkan1.3 -o shaders_out/trace.recompiled.spv shaders_out/trace.spv-dis
 rm frag.spv
 # rm shaders_out/trace.spv-dis
 
-echo src/normals.frag.glsl
+echo src/shaders/normals.frag.glsl
-glslangValidator --spirv-val --spirv-dis -g0 -S frag --target-env vulkan1.3 --quiet src/normals.frag.glsl > shaders_out/normals.spv-dis
+glslangValidator --spirv-val --spirv-dis -g0 -S frag --target-env vulkan1.3 --quiet src/shaders/normals.frag.glsl > shaders_out/normals.spv-dis
 sed -i '/%11 =/,/OpFunctionEnd/d' shaders_out/normals.spv-dis
 sed -i 's/%11\b/%1000/g' shaders_out/normals.spv-dis
 spirv-as --preserve-numeric-ids --target-env vulkan1.3 -o shaders_out/normals.recompiled.spv shaders_out/normals.spv-dis

build.rs

@@ -6,7 +6,7 @@ fn main() {
     println!("cargo:rerun-if-changed=Cargo.lock");
     println!("cargo:rerun-if-changed=assemble_trace.sh");
 
-    let paths = read_dir("src").unwrap();
+    let paths = read_dir("src/shaders").unwrap();
     for path in paths {
         if let Ok(path) = path {
             if path

src/main.rs

@@ -542,7 +542,7 @@ impl App {
 
         #[cfg(target_os = "linux")]
         {
-            let paths = std::fs::read_dir("src").unwrap();
+            let paths = std::fs::read_dir("src/shaders").unwrap();
             for path in paths {
                 if let Ok(path) = path {
                     if path

src/objects.rs

@@ -15,7 +15,7 @@ use vulkano::{
 
 use crate::{ssa::SSATape, trace_vs::Object};
 
-pub(crate) const PLATONIC_SOLIDS: [(&str, &[u8]); 1] = [("Buny", include_bytes!("bunny.obj"))];
+pub(crate) const PLATONIC_SOLIDS: [(&str, &[u8]); 1] = [("Buny", include_bytes!("data/bunny.obj"))];
 
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Default, Zeroable, Pod, Vertex)]