feat(render) WIP: textures, using a fixed size texture array

currently using an 8 long texture array with seperate samplers.

also move to a trait for resolving textures from the bsp file rather than adding them manually. currently stuck with one static implementation though. this means all textures in the file are loaded when the map is.

not currently drawing with anything other than the first texture array, so files with >8 textures will fail.

2 files changed, 4 insertions, 4 deletions

diff --git a/stockton-render/src/draw/data/stockton.frag b/stockton-render/src/draw/data/stockton.frag
index c50e1b9..5c6e1d7 100644
--- a/stockton-render/src/draw/data/stockton.frag
+++ b/stockton-render/src/draw/data/stockton.frag
@@ -1,8 +1,8 @@
 #version 450
 
 // DescriptorSet 0 = Textures
-layout(set = 0, binding = 0) uniform texture2D tex[2];
-layout(set = 0, binding = 1) uniform sampler samp[2];
+layout(set = 0, binding = 0) uniform texture2D tex[8];
+layout(set = 0, binding = 1) uniform sampler samp[8];
 
 layout (location = 1) in vec2 frag_uv;
 layout (location = 2) in flat int frag_tex;
diff --git a/stockton-render/src/draw/data/stockton.vert b/stockton-render/src/draw/data/stockton.vert
index 3146a25..aaee1a5 100644
--- a/stockton-render/src/draw/data/stockton.vert
+++ b/stockton-render/src/draw/data/stockton.vert
@@ -6,8 +6,8 @@ layout (push_constant) uniform PushConsts {
 } push;
 
 layout (location = 0) in vec3 position;
-layout (location = 1) in vec2 uv;
-layout (location = 2) in int tex;
+layout (location = 1) in int tex;
+layout (location = 2) in vec2 uv;
 
 out gl_PerVertex {
 	vec4 gl_Position;