summaryrefslogtreecommitdiff
path: root/src/rendering/include/engine
diff options
context:
space:
mode:
author0scar <qgt268@alumni.ku.dk>2024-02-19 10:52:50 +0000
committer0scar <qgt268@alumni.ku.dk>2024-02-19 11:05:13 +0000
commitcbbc317a5f95e6f21b052b8ce8a9df3a4a22d580 (patch)
tree2a68b4d44030d01d8d813cdc4af5dda8b986d592 /src/rendering/include/engine
parent46788a4a246249110ebd1db3162a43fcfa436976 (diff)
Add texture to renderobject
Diffstat (limited to 'src/rendering/include/engine')
-rw-r--r--src/rendering/include/engine/rendering/rendering.h4
1 files changed, 3 insertions, 1 deletions
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);