Refactoring to the point before started refactoring, without crash on texture binding

1 files changed, 23 insertions, 52 deletions

diff --git a/src/color.c b/src/color.c
index 166eaaf..6321e24 100644
--- a/src/color.c
+++ b/src/color.c
@@ -6,60 +6,31 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/05/13 11:53:53 by charles           #+#    #+#             */
-/*   Updated: 2020/05/14 13:58:15 by charles          ###   ########.fr       */
+/*   Updated: 2020/05/14 16:42:21 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "scop.h"
 
-/* float	*color_new(size_t n) */
-/* { */
-/* 	size_t			i; */
-/* 	float			step; */
-/* 	float			*colors; */
-/* 	union u_color	c; */
-/*  */
-/* 	if ((colors = malloc(sizeof(float) * (n * 4))) == NULL) */
-/* 		return (NULL); */
-/* 	step = 0.8 / (float)n; */
-/* 	i = 0; */
-/* 	c.r = 0.1; */
-/* 	c.g = 0.1; */
-/* 	c.b = 0.1; */
-/* 	c.a = 1.0; */
-/* 	while (i < n) */
-/* 	{ */
-/* 		c.r += step; */
-/* 		c.g += step; */
-/* 		c.b += step; */
-/* 		ft_memcpy(&colors[i * 4], c.data, 4 * sizeof(float)); */
-/* 		i++; */
-/* 	} */
-/* 	return (colors); */
-/* } */
-/*  */
-/* bool	color_merge_vertices(t_model_data *data, float *coords) */
-/* { */
-/* 	size_t	i; */
-/* 	float	*colors; */
-/* 	float	*new_vertices; */
-/*  */
-/* 	if ((colors = color_new(data->vertices_len)) == NULL) */
-/* 		return (false); */
-/* 	if ((new_vertices = malloc(sizeof(float) * data->vertices_len * (4 + 4 + 2))) == NULL) */
-/* 	{ */
-/* 		free(colors); */
-/* 		return (false); */
-/* 	} */
-/* 	i = 0; */
-/* 	while (i < data->vertices_size) */
-/* 	{ */
-/* 		ft_memcpy(&new_vertices[i * (4 + 4 + 2)], &data->vertices[i * 4], 4 * sizeof(float)); */
-/* 		ft_memcpy(&new_vertices[i * (4 + 4 + 2) + 4], &colors[i * 4], 4 * sizeof(float)); */
-/* 		ft_memcpy(&new_vertices[i * (4 + 4 + 2) + 8], &coords[i * 2], 2 * sizeof(float)); */
-/* 		i++; */
-/* 	} */
-/* 	free(data->vertices); */
-/* 	data->vertices = new_vertices; */
-/* 	return (true); */
-/* } */
+void	color_init(float *vertices, size_t vertices_num)
+{
+	size_t			i;
+	float			step;
+	union u_color	color;
+
+	step = 0.8 / (float)(vertices_num / VERTEX_COUNT);
+	i = 0;
+	color.r = 0.1;
+	color.g = 0.1;
+	color.b = 0.1;
+	color.a = 1.0;
+	while (i < vertices_num)
+	{
+		color.r += step;
+		color.g += step;
+		color.b += step;
+		ft_memcpy(&vertices[i + VERTEX_COLOR_OFFSET],
+				color.data, 4 * sizeof(float));
+		i += VERTEX_COUNT;
+	}
+}