game image created but all wrong

headers/cube3d_proto.h

@@ -63,7 +63,7 @@ int	is_wall(t_game *game, int cell_x, int cell_y);
 // -------------------------------
 // draw.c
 void	draw_pixel(t_img *img, int x, int y, int color);
-void	draw_line(t_img *img, t_vec vec, int color);
+void	draw_line(t_img *img, t_vec *vec, int color);
 void	draw(t_game *game);
 // raycast.c
 void	raycast(t_game *game, t_rcast *rcast);

headers/cube3d_struct.h

@@ -35,7 +35,9 @@ typedef struct		s_rcast
 	t_vec			screen_dist;
 	t_vec			screen_size;
 	t_vec			ray;
-	int				screen_def;
+	t_vec			wall;
+	int				screen_width;
+	int				screen_height;
 	int				cell;
 	int				cell_x;
 	int				cell_y;
@@ -53,8 +55,6 @@ typedef struct		s_rcast
 	int				ray_step_y;
 	int				is_x;
 	int				ray_nb;
-	int				wall_height;
-	int				screen_center;
 	double			ratio;
 }					t_rcast;
 

srcs/draw/draw.c

@@ -22,19 +22,19 @@ void	draw_pixel(t_img *img, int x, int y, int color)
 	*(unsigned int*)(img->data + position) = color;
 }
 
-void	draw_line(t_img *img, t_vec vec, int color)
+void	draw_line(t_img *img, t_vec *vec, int color)
 {
 	t_coord	dist;
 	int		i;
 	int		j;
 
-	dist.x = vec.end.x - vec.start.x;
-	dist.y = vec.end.y - vec.start.y;
+	dist.x = (*vec).end.x - (*vec).start.x;
+	dist.y = (*vec).end.y - (*vec).start.y;
 	i = 0;
 	j = 0;
 	while (ft_abs(i) <= ft_abs(dist.x) && ft_abs(j) <= ft_abs(dist.y))
 	{
-		draw_pixel(img, vec.start.x + i, vec.start.y + j, color);
+		draw_pixel(img, (*vec).start.x + i, (*vec).start.y + j, color);
 		if (!ft_abs(dist.x) || ft_abs(j) < ft_abs(i * dist.y / dist.x))
 			j += ft_sign(dist.y);
 		else
@@ -113,14 +113,14 @@ void	draw_line(t_img *img, t_vec vec, int color)
 		screen.end.x = rcast->screen_size.end.x + game->plr.pos.x;
 		screen.end.y = rcast->screen_size.end.y + game->plr.pos.y;
 		rotate(&(game->plr), &(screen.end));
-		draw_line(&game->map_img, screen, 0x00FFFFFF);
+		draw_line(&game->map_img, &screen, 0x00FFFFFF);
 		// draw screen dist
 		screen.start.x = rcast->screen_dist.start.x + game->plr.pos.x;
 		screen.start.y = rcast->screen_dist.start.y + game->plr.pos.y;
 		screen.end.x = rcast->screen_dist.end.x + game->plr.pos.x;
 		screen.end.y = rcast->screen_dist.end.y + game->plr.pos.y;
 		rotate(&(game->plr), &(screen.end));
-		draw_line(&game->map_img, screen, 0x00FFFFFF);
+		draw_line(&game->map_img, &screen, 0x00FFFFFF);
 	}
 // tmp end
 
@@ -137,5 +137,5 @@ void	draw(t_game *game)
 		mlx_put_image_to_window(game->mlx_ptr, game->map_win.ptr, game->map_img.ptr, 0, SCREEN_HEIGHT);
 	// tmp end
 
-//	mlx_put_image_to_window(game->mlx_ptr, game->win.ptr, game->img.ptr, 0, 0);
+	mlx_put_image_to_window(game->mlx_ptr, game->win.ptr, game->img.ptr, 0, 0);
 }

srcs/draw/ray_intersect.c

@@ -3,7 +3,6 @@
 static void	init_raycast(t_rcast *rcast, t_vec *ray)
 {
 	rcast->is_x = 0;
-	rcast->wall_height = 0;
 	// ray sign
 	rcast->ray_sign_x = 1;
 	if (ray->start.x < ray->end.x)

srcs/draw/raycast.c

@@ -30,27 +30,44 @@
 	}
 // tmp end
 
-void	draw_column(t_game *game, t_rcast *rcast, t_vec *ray)
+static void	calcul_wall(t_rcast *rcast)
 {
-	t_vec	wall;
+	int	height;
 
-	(void)game;
-	(void)rcast;
-	(void)ray;
-	(void)wall;
-
-	wall.start.x = rcast->ray_nb;
-	wall.end.x = rcast->ray_nb;
+	rcast->wall.start.x = rcast->ray_nb;
+	rcast->wall.end.x = rcast->ray_nb;
 	if (rcast->is_x == 1 && rcast->slope_y != 0)
+		height = (rcast->next_x - rcast->ray_step_x) / ft_abs(rcast->slope_y);
+	if (rcast->is_x == 0 && rcast->slope_x != 0)
+		height = (rcast->next_y - rcast->ray_step_y) / ft_abs(rcast->slope_x);
+	if (height > rcast->screen_height)
+		height = rcast->screen_height;
+	rcast->wall.start.y = rcast->screen_height / 2 + height / 2;
+	rcast->wall.end.y   = rcast->screen_height / 2 - height / 2;
+}
+
+void	draw_column(t_game *game, t_rcast *rcast)
+{
+	t_vec	floor;
+	t_vec	ceilling;
+
+	if (rcast->wall.start.y > 0)
 	{
-		rcast->wall_height = rcast->next_x - rcast->ray_step_x;
-		rcast->wall_height /= ft_abs(rcast->slope_y);
-		rcast->wall_height /= 2;
-//printf("rcast->wall: %i\n", rcast->wall_height);
-		wall.start.y = rcast->screen_center / 2 + rcast->wall_height;
-		wall.end.y   = rcast->screen_center / 2 - rcast->wall_height;
+		floor.start.x = rcast->ray_nb;
+		floor.end.x = rcast->ray_nb;
+		floor.start.y = rcast->screen_height;
+		floor.end.y = rcast->wall.start.y;
+		draw_line(&game->img, &floor, 0x00FF0000);
 	}
-//	draw_line(&game->img, wall, 0x00FF0000);
+	if (rcast->wall.start.y < rcast->screen_height)
+	{
+		ceilling.start.x = rcast->ray_nb;
+		ceilling.end.x = rcast->ray_nb;
+		ceilling.start.y = rcast->wall.end.y;
+		ceilling.end.y = 0;
+		draw_line(&game->img, &ceilling, 0x00FF0000);
+	}
+	draw_line(&game->img, &rcast->wall, 0x00FF00FF);
 }
 
 void	raycast(t_game *game, t_rcast *rcast)
@@ -58,16 +75,17 @@ void	raycast(t_game *game, t_rcast *rcast)
 	t_vec	ray;
 
 	rcast->ray_nb = 0;
-	while (rcast->ray_nb <= rcast->screen_def)
+	while (rcast->ray_nb <= rcast->screen_width)
 	{
 		ray_intersect(game, rcast, &ray);
 
 		// tmp, to draw the map
 			calcul_ray_end(rcast, &ray);
-			draw_line(&game->map_img, ray, 0x00FF00FF);
+			draw_line(&game->map_img, &ray, 0x00FF00FF);
 		// tmp end
 
-		draw_column(game, rcast, &ray);
+		calcul_wall(rcast);
+		draw_column(game, rcast);
 		(rcast->ray_nb)++;
 	}
 }

srcs/init/init_struct.c

@@ -68,8 +68,8 @@ static void	init_raycast(t_rcast *rcast)
 
 	dist = (SCREEN_FOCAL / 2) * M_PI / 180;
 	dist = cos(dist) * ((SCREEN_WIDTH / 2) / sin(dist));
-	rcast->screen_def = SCREEN_WIDTH;
-	rcast->screen_center = SCREEN_HEIGHT / 2;
+	rcast->screen_width = SCREEN_WIDTH;
+	rcast->screen_height = SCREEN_HEIGHT;
 	// screen dist
 	rcast->screen_dist.start.x = 0;
 	rcast->screen_dist.start.y = 0;