From cbbc317a5f95e6f21b052b8ce8a9df3a4a22d580 Mon Sep 17 00:00:00 2001 From: 0scar Date: Mon, 19 Feb 2024 11:52:50 +0100 Subject: Add texture to renderobject --- src/rendering/include/engine/rendering/rendering.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/rendering/include') diff --git a/src/rendering/include/engine/rendering/rendering.h b/src/rendering/include/engine/rendering/rendering.h index 1412cb4..e6feab9 100644 --- a/src/rendering/include/engine/rendering/rendering.h +++ b/src/rendering/include/engine/rendering/rendering.h @@ -71,6 +71,8 @@ typedef struct { u32 col; /* MVP (a uniform from the shader) */ u32 mvp; + + u32 texture; } RenderObject; typedef enum { @@ -145,7 +147,7 @@ typedef struct { } data; } RenderDrawCall; -RenderObject RenderObject_new(float* model, Shader* shader, usize sz, float* uv, usize uv_sz); +RenderObject RenderObject_new(float* model, Shader* shader, usize sz, float* uv, usize uv_sz, u32 texture); Shader compile_shader(const char* file_path, const ShaderType shader_type); Shader compose_shader(Shader *shaders, usize shaders_len); -- cgit v1.3