From 1db8d530c50c06093413c9ca0000567fd52b88f7 Mon Sep 17 00:00:00 2001 From: sam Date: Mon, 19 Aug 2024 16:20:49 +1200 Subject: [PATCH] testing --- shaders/transform.glsl | 4 +++- src/main.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/shaders/transform.glsl b/shaders/transform.glsl index c678dd5..bc7e2a3 100644 --- a/shaders/transform.glsl +++ b/shaders/transform.glsl @@ -1,3 +1,4 @@ +@ctype vec2 HMM_Vec2 @ctype mat4 HMM_Mat4 @vs vs in vec4 pos; @@ -6,6 +7,7 @@ in vec2 texcoord0; uniform vs_params { mat4 mvp; + vec2 texture_scale; }; out vec4 color; @@ -14,7 +16,7 @@ out vec2 uv; void main() { gl_Position = mvp * pos; color = color0; - uv = texcoord0; + uv = texcoord0 * texture_scale; } @end diff --git a/src/main.c b/src/main.c index dd09c76..c48a9c2 100644 --- a/src/main.c +++ b/src/main.c @@ -60,11 +60,11 @@ static void init(void) { .height = 2, .data.subimage[0][0] = SG_RANGE(pixels), .label = "triangle-texture", - .pixel_format = SG_PIXELFORMAT_BGRA8, + .pixel_format = SG_PIXELFORMAT_RGBA8, }); bind->fs.samplers[SLOT_smp] = sg_make_sampler(&(sg_sampler_desc){ - .label = "triangle-sampler" + .label = "triangle-sampler", }); sg_shader shd = sg_make_shader(transform_shader_desc(sg_query_backend())); @@ -110,7 +110,8 @@ void frame(void) { HMM_Mat4 mvp = HMM_MulM4(view_proj, model); vs_params_t params = { - .mvp = mvp + .mvp = mvp, + .texture_scale = HMM_V2(1.0f, 1.0f), }; sg_apply_bindings(state.bindings.data[i]);