From 5b6040612410e8da21aad9c6855d0cc5565f20cf Mon Sep 17 00:00:00 2001
From: hugogogo <hugogogo@protonmail.com>
Date: Tue, 3 May 2022 10:18:22 +0200
Subject: [PATCH] textures start to appears

---
 headers/cube3d_struct.h |  1 +
 srcs/draw/draw_column.c | 42 ++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/headers/cube3d_struct.h b/headers/cube3d_struct.h
index 195f661..dad5fc9 100644
--- a/headers/cube3d_struct.h
+++ b/headers/cube3d_struct.h
@@ -36,6 +36,7 @@ typedef struct		s_wall
 	int				height;
 	int				delta;
 	int				posx;
+	int				imgx;
 }					t_wall;
 
 /*
diff --git a/srcs/draw/draw_column.c b/srcs/draw/draw_column.c
index 81bb9e8..71204b5 100644
--- a/srcs/draw/draw_column.c
+++ b/srcs/draw/draw_column.c
@@ -20,7 +20,19 @@ static void	draw_floor_ceiling(t_game *game, t_rcast *rcast, t_txt *txt)
 	}
 }
 
-static void	draw_txt_line(t_img *img, t_rcast *rcast, t_wall *wall, t_img *txt_img, int color)
+static int	get_texture(t_img *img, int imgx, int j, int height)
+{
+	char	*color;
+	int		y;
+	int		position;
+
+	y = (j * img->height) / height;
+	position = y * img->szl + imgx * (img->bpp / 8);
+	color = img->data + position;
+	return (*(int*)color);
+}
+
+static void	draw_txt_column(t_img *img, t_rcast *rcast, t_wall *wall, t_img *txt_img, int color)
 {
 	(void)img;
 	(void)wall;
@@ -30,26 +42,18 @@ static void	draw_txt_line(t_img *img, t_rcast *rcast, t_wall *wall, t_img *txt_i
 //	draw_line(img, &wall->vec, color);
 
 	int	img_x;
+	int	j;
 
 	img_x = (wall->posx * txt_img->width) / rcast->cell;
-printf("img_x:%i\n", img_x);
+//printf("img_x:%i - img_width:%i\n", img_x, txt_img->width);
 
-//	t_coord	dist;
-//	int		i;
-//	int		j;
-//
-//	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);
-//		if (!ft_abs(dist.x) || ft_abs(j) < ft_abs(i * dist.y / dist.x))
-//			j += ft_sign(dist.y);
-//		else
-//			i += ft_sign(dist.x);
-//	}
+	j = 0;
+	while (j < wall->height)
+	{
+		color = get_texture(txt_img, img_x, j, wall->height);
+		draw_pixel(img, wall->vec.start.x, wall->vec.start.y + j, color);
+		j++;
+	}
 }
 
 void	draw_column(t_game *game, t_rcast *rcast, t_wall *wall, t_txt *txt)
@@ -66,7 +70,7 @@ void	draw_column(t_game *game, t_rcast *rcast, t_wall *wall, t_txt *txt)
 	color_o = 0x00CCCCCC;
 	draw_floor_ceiling(game, rcast, txt);
 	if (!rcast->is_x && rcast->slope_y > 0)
-		draw_txt_line(&game->img, rcast, wall, &txt->img_n, color_n);
+		draw_txt_column(&game->img, rcast, wall, &txt->img_n, color_n);
 	if (!rcast->is_x && rcast->slope_y < 0)
 		draw_line(&game->img, &rcast->wall.vec, color_s);
 	if (rcast->is_x && rcast->slope_x > 0)