From 01e713026d462f3adf5b3e6f0b2785d0fa7c9bc2 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 30 Jan 2020 13:38:54 +0100 Subject: fixing algo --- cub3d.h | 4 +-- main.c | 2 +- parse/parse.c | 6 ++-- render.c | 46 ++++------------------------ render_state.c | 94 +++++++++++++++++++++++++--------------------------------- 5 files changed, 52 insertions(+), 100 deletions(-) diff --git a/cub3d.h b/cub3d.h index e57fea3..5f48648 100644 --- a/cub3d.h +++ b/cub3d.h @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 06:40:37 by cacharle #+# #+# */ -/* Updated: 2020/01/17 14:00:00 by cacharle ### ########.fr */ +/* Updated: 2020/01/30 12:04:26 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ #include @@ -21,7 +21,7 @@ # include "mlx.h" # include "libft.h" -# define BUFFER_SIZE 64 +# define CUB3D_BUFFER_SIZE 64 # define WINDOW_TITLE "cub3D" # define MLXK_ESC 53 diff --git a/main.c b/main.c index 5ddfa17..d596788 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 06:39:39 by cacharle #+# #+# */ -/* Updated: 2020/01/17 14:30:21 by cacharle ### ########.fr */ +/* Updated: 2020/01/30 12:47:56 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/parse/parse.c b/parse/parse.c index 3eb8846..f4b5b66 100644 --- a/parse/parse.c +++ b/parse/parse.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2019/11/15 09:29:21 by cacharle #+# #+# */ -/* Updated: 2020/01/11 12:59:58 by cacharle ### ########.fr */ +/* Updated: 2020/01/30 12:03:54 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,14 +42,14 @@ char **get_file_lines(char *filename) { int fd; int ret; - char buf[BUFFER_SIZE + 1]; + char buf[CUB3D_BUFFER_SIZE + 1]; char *file; if ((fd = open(filename, O_RDONLY)) < 0) return (NULL); if ((file = ft_strdup("")) == NULL) return (NULL); - while ((ret = read(fd, buf, BUFFER_SIZE)) > 0) + while ((ret = read(fd, buf, CUB3D_BUFFER_SIZE)) > 0) { buf[ret] = '\0'; if ((file = ft_strjoin(file, buf)) == NULL) diff --git a/render.c b/render.c index 73f36d1..756e6ce 100644 --- a/render.c +++ b/render.c @@ -1,15 +1,3 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* render.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: cacharle +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2020/01/17 14:25:49 by cacharle #+# #+# */ -/* Updated: 2020/01/17 14:50:20 by cacharle ### ########.fr */ -/* */ -/* ************************************************************************** */ - /* ************************************************************************** */ /* */ /* ::: :::::::: */ @@ -18,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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; */ diff --git a/render_state.c b/render_state.c index e9c803a..573d1f1 100644 --- a/render_state.c +++ b/render_state.c @@ -6,7 +6,7 @@ /* By: cacharle +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/01/15 14:40:14 by cacharle #+# #+# */ -/* Updated: 2020/01/17 14:48:15 by cacharle ### ########.fr */ +/* Updated: 2020/01/30 13:36:35 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -54,8 +54,8 @@ void rstate_ray(t_state *state, t_render_state *rstate) void rstate_delta(t_render_state *rstate) { - rstate->delta.x = vector_norm(rstate->ray) / rstate->ray.x; - rstate->delta.y = vector_norm(rstate->ray) / rstate->ray.y; + rstate->delta.x = fabs(1 / rstate->ray.x); //vector_norm(rstate->ray) / rstate->ray.x; + rstate->delta.y = fabs(1 / rstate->ray.y); // vector_norm(rstate->ray) / rstate->ray.y; } /* @@ -79,13 +79,21 @@ void rstate_delta(t_render_state *rstate) void rstate_init_probe(t_state *state, t_render_state *rstate) { - rstate->probe = VECTOR_SUB(state->pos, rstate->map_pos); - if (rstate->ray.x > 0) - rstate->probe.x += 1.0; - if (rstate->ray.y > 0) - rstate->probe.y += 1.0; - rstate->probe.x *= rstate->delta.x; - rstate->probe.y *= rstate->delta.y; + if (rstate->ray.x < 0) + rstate->probe.x = (state->pos.x - rstate->map_pos.x) * rstate->delta.x; + else + rstate->probe.x = (rstate->map_pos.x + 1.0 - state->pos.x) * rstate->delta.x; + if (rstate->ray.y < 0) + rstate->probe.y = (state->pos.y - rstate->map_pos.y) * rstate->delta.y; + else + rstate->probe.y = (rstate->map_pos.y + 1.0 - state->pos.y) * rstate->delta.y; + /* rstate->probe = VECTOR_SUB(state->pos, rstate->map_pos); */ + /* if (rstate->ray.x > 0) */ + /* rstate->probe.x += 1.0; */ + /* if (rstate->ray.y > 0) */ + /* rstate->probe.y += 1.0; */ + /* rstate->probe.x *= rstate->delta.x; */ + /* rstate->probe.y *= rstate->delta.y; */ } /* @@ -136,29 +144,11 @@ void rstate_next_probe(t_render_state *rstate) double rstate_perp_dist(t_state *state, t_render_state *rstate) { - double dist; - - /* printf("ray [%f %f]\n", rstate->ray.x, rstate->ray.y); */ - dist = 1.0; - if (rstate->side == SIDE_NS) - { - dist = rstate->map_pos.y - state->pos.y; - dist += rstate->map_step.y == 1 ? 1 : 0; - dist /= rstate->ray.y; - } - else if (rstate->side == SIDE_WE) - { - dist = rstate->map_pos.x - state->pos.x; - dist += rstate->map_step.x == 1 ? 1 : 0; - dist /= rstate->ray.x; - } - return dist; - - /* if (rstate->side == SIDE_NS) */ - /* return fabs(rstate->map_pos.y - state->pos.y + state->dir.y); */ - /* else if (rstate->side == SIDE_WE) */ - /* return fabs(rstate->map_pos.x - state->pos.x + state->dir.x); */ - /* return (1.0); */ + if (rstate->side == SIDE_WE) + return (rstate->map_pos.x - state->pos.x + (1 - rstate->map_step.x) / 2) / rstate->ray.x; + else + return (rstate->map_pos.y - state->pos.y + (1 - rstate->map_step.y) / 2) / rstate->ray.y; + return (1.0); } /* @@ -168,29 +158,27 @@ double rstate_perp_dist(t_state *state, t_render_state *rstate) void rstate_line_height(t_state *state, t_render_state *rstate) { - /* double perp = rstate_perp_dist(state, rstate); */ - /* printf("perp %f\n", perp); */ rstate->line_height = (int)((double)state->window.height / rstate_perp_dist(state, rstate)); } -t_image *get_tex(t_state *state, t_render_state *rstate) -{ - if (rstate->side == SIDE_NS) - { - if (rstate->probe.y < state->pos.y) - return (state->textures + TEX_NORTH); - else - return (state->textures + TEX_SOUTH); - } - else if (rstate->side == SIDE_WE) - { - if (rstate->probe.x < state->pos.x) - return (state->textures + TEX_WEST); - else - return (state->textures + TEX_EAST); - } - return (NULL); -} +/* t_image *get_tex(t_state *state, t_render_state *rstate) */ +/* { */ +/* if (rstate->side == SIDE_NS) */ +/* { */ +/* if (rstate->probe.y < state->pos.y) */ +/* return (state->textures + TEX_NORTH); */ +/* else */ +/* return (state->textures + TEX_SOUTH); */ +/* } */ +/* else if (rstate->side == SIDE_WE) */ +/* { */ +/* if (rstate->probe.x < state->pos.x) */ +/* return (state->textures + TEX_WEST); */ +/* else */ +/* return (state->textures + TEX_EAST); */ +/* } */ +/* return (NULL); */ +/* } */ /* ** Since we're drawing each column, all the texels we want to draw on the window -- cgit