From d6221f99c557ce88d3cae3d51c568b6a8f36e5a4 Mon Sep 17 00:00:00 2001
From: luboslenco <lubos.lenco@gmail.com>
Date: Wed, 21 Aug 2019 13:17:23 +0200
Subject: [PATCH] Organize assets

---
 Bundled/Scene.arm                       | Bin 177513 -> 177513 bytes
 Shaders/glsl/Material_voxel.vert.glsl   |   8 --------
 Shaders/glsl/armdefault_voxel.frag.glsl |   4 +---
 Shaders/hlsl/Material_voxel.vert.glsl   | Bin 838 -> 0 bytes
 Shaders/hlsl/Material_voxel.vert.hlsl   |   9 ---------
 5 files changed, 1 insertion(+), 20 deletions(-)
 delete mode 100644 Shaders/glsl/Material_voxel.vert.glsl
 delete mode 100644 Shaders/hlsl/Material_voxel.vert.glsl
 delete mode 100644 Shaders/hlsl/Material_voxel.vert.hlsl

diff --git a/Bundled/Scene.arm b/Bundled/Scene.arm
index 835cc63a6cd8f9aee37e680e081cd1cf2bad91d3..a76e8dccdfe695695a4f6932f5804d6c51725275 100644
GIT binary patch
delta 54
zcmaF)itFVoF4p_p3=9k#C3i?no*^qbxm+-RbFic&3zU=4d|$TxzAWSR`?5@3(<g68
G6951{%oNc8

delta 88
zcmaF)itFVoF3I~m3=9mnxqw7kQDSatd`V_*>Z#6-4x5dvJ0y67f#SZ2C8<T3i8+&F
c1j{x%N=mYzi>5c9mu){U%eei#EK}EX08POjE&u=k

diff --git a/Shaders/glsl/Material_voxel.vert.glsl b/Shaders/glsl/Material_voxel.vert.glsl
deleted file mode 100644
index 7b05e01f..00000000
--- a/Shaders/glsl/Material_voxel.vert.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 450
-in vec4 pos;
-in vec2 nor;
-out vec3 voxpositionGeom;
-uniform mat4 W;
-void main() {
-	voxpositionGeom = vec3(W * vec4(pos.xyz, 1.0)) / voxelgiHalfExtents;
-}
diff --git a/Shaders/glsl/armdefault_voxel.frag.glsl b/Shaders/glsl/armdefault_voxel.frag.glsl
index adb3e0d3..cbbff4ed 100644
--- a/Shaders/glsl/armdefault_voxel.frag.glsl
+++ b/Shaders/glsl/armdefault_voxel.frag.glsl
@@ -1,11 +1,9 @@
 #version 450
 #extension GL_ARB_shader_image_load_store : enable
 #include "../std/conetrace.glsl"
-#include "../std/math.glsl"
-#include "../std/imageatomic.glsl"
 in vec3 voxposition;
 uniform layout(r8) writeonly image3D voxels;
 void main() {
-	if (abs(voxposition.z) > 1.0 || abs(voxposition.x) > 1 || abs(voxposition.y) > 1) return;
+	if (abs(voxposition.z) > 1.0 || abs(voxposition.x) > 1.0 || abs(voxposition.y) > 1.0) return;
 	imageStore(voxels, ivec3(voxelgiResolution * (voxposition * 0.5 + 0.5)), vec4(1.0));
 }
diff --git a/Shaders/hlsl/Material_voxel.vert.glsl b/Shaders/hlsl/Material_voxel.vert.glsl
deleted file mode 100644
index b04e42476158cb7f6f0f51188aa74e9237f2805a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmb7By-Nad7=F(Wa)>ggTH*)?qlgYf8l=pRQ^7pBlQam#O4GPFIfWXfEr_Q6gBl{&
z{*LCxhQ_9rw(NQDL!!9B_wKpp{r>&#eTAOUClaE0-8gFMtk#Gn1q1@wdOCCQe%)<-
zd@U~-=6&TQu_hoA^AiQZaUcmt4|o7>d_-zCClhqM)B%{200qCtY`j8Mvy#NVML+~%
zKopn-SPpIa_vKzJlk1K~BhF?25J&;8JUU7WjBC-eV~-)Mx?H2SZZrq+%Q%hv<fi~0
zFL^>>uX}77eWN`PW9q6{C}|~8>oiYVrkF9#dtDuhw7DTsQOlRtk<WJv0V3cE#%Ia=
z3{f>#&nSwTCH#xxQNukZHPE&FMn%zz)uK`+t&pp~!B@daTi~-02?to7d@I7T>lz?4
z9JcIJ#6Cq^=f2pHk2!%2UAg`grw(`6XOf*OM{Kt89G~FiE#Ma;POUuW<U8kcCyuXp
q#QAKFr#<4lyKRh7tL|3spkrj#OhMLO-MO&My{3`hwbRu7&HVucXjXLq

diff --git a/Shaders/hlsl/Material_voxel.vert.hlsl b/Shaders/hlsl/Material_voxel.vert.hlsl
deleted file mode 100644
index ef31bf74..00000000
--- a/Shaders/hlsl/Material_voxel.vert.hlsl
+++ /dev/null
@@ -1,9 +0,0 @@
-	uniform float4x4 W;
-	struct SPIRV_Cross_Input { float4 pos : TEXCOORD0; };
-	struct SPIRV_Cross_Output { float4 svpos : SV_POSITION; };
-	SPIRV_Cross_Output main(SPIRV_Cross_Input stage_input) {
-	  SPIRV_Cross_Output stage_output;
-	  stage_output.svpos.xyz = mul(float4(stage_input.pos.xyz, 1.0), W).xyz / float3(1, 1, 1);
-	  stage_output.svpos.w = 1.0;
-	  return stage_output;
-	}