From 0267b512527b85af6cd815bb9215bd659b75931e Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 13 May 2020 13:05:33 +0200 Subject: Added basic color --- inc/scop.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'inc') diff --git a/inc/scop.h b/inc/scop.h index 1032f1d..15e7eb1 100644 --- a/inc/scop.h +++ b/inc/scop.h @@ -6,7 +6,7 @@ /* By: charles +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/05/09 10:41:44 by charles #+# #+# */ -/* Updated: 2020/05/13 11:28:22 by charles ### ########.fr */ +/* Updated: 2020/05/13 12:15:23 by charles ### ########.fr */ /* */ /* ************************************************************************** */ @@ -26,6 +26,7 @@ # include "libftm_mat4.h" # include "libftm_vec3.h" + typedef struct { float *vertices; @@ -45,6 +46,18 @@ typedef struct int proj_location; } t_gl_state; +union u_color +{ + float data[4]; + struct + { + float r; + float g; + float b; + float a; + }; +}; + /* ** parse.c */ @@ -98,4 +111,11 @@ bool has_extension(char *filepath, char *extension); void center_mat4_init_translate(t_ftmmat4 *dst, float *vertices, size_t vertices_len); +/* +** color.c +*/ + +bool color_merge_vertices(t_object *object); + + #endif -- cgit