WIP: render texture, raycasting algorithm doc

1 files changed, 32 insertions, 7 deletions

diff --git a/render.c b/render.c
index 1ee0bc2..77eb3b9 100644
--- a/render.c
+++ b/render.c
@@ -50,7 +50,7 @@ void	render_column(t_state *state, int x)
 	map_pos = vector_new((double)((int)state->pos.x), (double)((int)state->pos.y));
 	delta = get_delta(ray);
 	current = get_init_delta(state, ray, map_pos, delta);
-	map_step = get_map_step(&ray);
+	map_step = vector_new(ray.x < 0.0 ? -1.0 : 1.0, ray.y < 0.0 ? -1.0 : 1.0));
 	while (TRUE)
 	{
 		side = current.x < current.y ? SIDE_WE : SIDE_WE;
@@ -58,12 +58,12 @@ void	render_column(t_state *state, int x)
 		if (state->map[(int)map_pos.y][(int)map_pos.x] == CELL_WALL)
 			break;
 	}
-	line_height = get_line_height(state, get_perp_dist(), side);
-	render_window_column(state, x, WINDOW_MID_HEIGHT(state) - line_height / 2,
-								WINDOW_MID_HEIGHT(state) + line_height / 2);
+	line_height = get_line_height(state, get_perp_dist(state, &current, side), side);
+	render_window_column(state, x, side, WINDOW_MID_HEIGHT(state) - line_height / 2,
+										WINDOW_MID_HEIGHT(state) + line_height / 2);
 }
 
-void	render_window_column(t_state *state, int x, int start, int end)
+void	render_window_column(t_state *state, int x, t_side side, int start, int end)
 {
 	int		i;
 	t_color	white;
@@ -72,8 +72,33 @@ void	render_window_column(t_state *state, int x, int start, int end)
 	i = -1;
 	while (++i < draw_start)
 		((t_color*)state->window.data)[i * state->window.width + x] = state->ceilling_color;
-	while (++i < draw_end)
-		((t_color*)state->window.data)[i * state->window.width + x] = white;
+	i = render_texture(state, side, start, end);
 	while (++i < state->window_height)
 		((t_color*)state->window.data)[i * state->window.width + x] = state->floor_color;
 }
+
+int		render_texture(t_state *state, t_side side, int start, int end)
+{
+	int i;
+	int tex_x;
+	double step;
+	double tex_pos;
+	int tex_y;
+	t_image *texture;
+
+	texture = get_tex(state, side);
+	tex_x = get_tex_x();
+
+	step = 1.0 * texture->height / line_height;
+	texPos = (start - state->window.height / 2 + line_height / 2) * step;
+
+	i = start - 1;
+	while (++i < end)
+	{
+		tex_y = (int)tex_pos & (texture->height - 1);
+		tex_pos += step;
+		((t_color*)state->window.data)[i * state->window.width + x] =
+			texture[texHeight * texY + texX];
+	}
+	return (end);
+}