fixing algo

1 files changed, 5 insertions, 41 deletions

diff --git a/render.c b/render.c
index 73f36d1..756e6ce 100644
--- a/render.c
+++ b/render.c
@@ -5,20 +5,8 @@
 /*                                                    +:+ +:+         +:+     */
 /*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2020/01/17 14:25:49 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/17 14:50:20 by cacharle         ###   ########.fr       */
-/*                                                                            */
-/* ************************************************************************** */
-
-/* ************************************************************************** */
-/*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   render.c                                           :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: cacharle <marvin@42.fr>                    +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/01/11 13:37:17 by cacharle          #+#    #+#             */
-/*   Updated: 2020/01/17 14:25:04 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/01/30 13:38:35 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -33,8 +21,9 @@ int		render_update(void *param)
 	{
 		state_destroy(state);
 		exit(EXIT_SUCCESS);
+		return (0);
 	}
-	/* ft_bzero(state->window.data, state->window.width * state->window.height * 4);	 */
+	ft_bzero(state->window.data, state->window.width * state->window.height * 4);
 	render_update_window(state);
 	mlx_put_image_to_window(state->mlx_ptr, state->window_ptr, state->window.id, 0, 0);
 	return (0);
@@ -46,11 +35,7 @@ void	render_update_window(t_state *state)
 
 	x = -1;
 	while (++x < state->window.width)
-	{
-	/* x = state->window.width / 2 + 1; */
-		/* printf("\nx %d\n", x); */
 		render_column(state, x);
-	}
 }
 
 void	render_column(t_state *state, int x)
@@ -58,43 +43,25 @@ void	render_column(t_state *state, int x)
 	t_render_state	rstate;
 
 	rstate.x = x;
-	/* printf("1\n"); */
 	rstate_ray(state, &rstate);
-	/* printf("ray [%f %f]\n", rstate.ray.x, rstate.ray.y); */
 	rstate.map_pos = vector_new((double)((int)state->pos.x), (double)((int)state->pos.y)); //floor?
-	/* printf("map_pos [%f %f]\n", rstate.map_pos.x, rstate.map_pos.y); */
 	rstate_delta(&rstate);
-	/* printf("delta [%f %f]\n", rstate.delta.x, rstate.delta.y); */
 	rstate_init_probe(state, &rstate);
-	/* printf("probe [%f %f]\n", rstate.probe.x, rstate.probe.y); */
 	rstate.map_step = vector_new(rstate.ray.x < 0.0 ? -1.0 : 1.0, rstate.ray.y < 0.0 ? -1.0 : 1.0);
-	/* printf("map_step [%f %f]\n", rstate.map_step.x, rstate.map_step.y); */
 	while (TRUE)
 	{
 		rstate.side = rstate.probe.x < rstate.probe.y ? SIDE_WE : SIDE_NS;
-		/* printf("side %s\n", rstate.side == SIDE_WE ? "side we" : "side ns"); */
 		rstate_next_probe(&rstate);
-		/* printf("2\n"); */
-		/* printf("> [%d %d]\n", (int)rstate.map_pos.x, (int)rstate.map_pos.y); */
 		if (state->map[(int)rstate.map_pos.y][(int)rstate.map_pos.x] == CELL_WALL)
 			break ;
-		/* printf("3\n"); */
 	}
-		/* printf("[%d %d]\n", (int)rstate.map_pos.x, (int)rstate.map_pos.y); */
 	rstate_line_height(state, &rstate);
-	/* printf("perp dist %f\n", rstate_perp_dist(state, &rstate)); */
-	/* printf("line height %d\n", rstate.line_height); */
-
-
 	rstate.draw_start = state->window.height / 2 - rstate.line_height / 2;
 	rstate.draw_end = state->window.height / 2 + rstate.line_height / 2;
 	if (rstate.draw_start < 0)
 		rstate.draw_start = 0;
 	if (rstate.draw_end > state->window.height - 1)
 		rstate.draw_end = state->window.height - 1;
-	/* printf("%d -> %d\n", rstate.draw_start, rstate.draw_end); */
-	/* rstate.draw_start = 10; */
-	/* rstate.draw_end = 20; */
 	render_window_column(state, &rstate);
 }
 
@@ -107,16 +74,13 @@ void	render_window_column(t_state *state, t_render_state *rstate)
 	white.hexcode = 0x00ffffff;
 	black.hexcode = 0x00000000;
 	i = 0;
-	/* printf("%p\n", state->window.data); */
 	while (i < rstate->draw_start)
-		((t_color*)state->window.data)[i++ * state->window.width + rstate->x] = black;
-	/* i = rstate->draw_start - 1; */
+		((t_color*)state->window.data)[i++ * state->window.width + rstate->x] = state->ceilling_color;
 	while (i < rstate->draw_end)
 		((t_color*)state->window.data)[i++ * state->window.width + rstate->x] = white;
 	while (i < state->window_height)
-		((t_color*)state->window.data)[i++ * state->window.width + rstate->x] = black;
+		((t_color*)state->window.data)[i++ * state->window.width + rstate->x] = state->floor_color;
 
-	/* printf("%d -> %d\n", rstate->draw_start, rstate->draw_end); */
 	/* while (++i < rstate->draw_start) */
 	/* 	((t_color*)state->window.data)[i * state->window.width + rstate->x] = */
 	/* 		state->ceilling_color; */