Merge branch 'master' of git.sr.ht:~xamora/cube3D

This commit is contained in:
Camille Chauvet 2023-06-16 16:35:16 +00:00
commit 735a8b335c
7 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/04/27 14:50:22 by erey-bet #+# #+# */ /* Created: 2023/04/27 14:50:22 by erey-bet #+# #+# */
/* Updated: 2023/06/13 13:13:00 by erey-bet ### ########.fr */ /* Updated: 2023/06/16 17:48:34 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -57,7 +57,7 @@ int init(t_map map, t_game *game)
{ {
if (init_textures(map, game->textures)) if (init_textures(map, game->textures))
return (2); return (2);
game->mlx = mlx_init(WIDTH, HEIGHT, "jan lili", false); game->mlx = mlx_init(WIDTH, HEIGHT, "jan lili meli", false);
if (!game->mlx) if (!game->mlx)
return (1); return (1);
game->map = map; game->map = map;

View File

@ -6,7 +6,7 @@
/* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */ /* By: erey-bet <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/05/11 14:19:16 by erey-bet #+# #+# */ /* Created: 2023/05/11 14:19:16 by erey-bet #+# #+# */
/* Updated: 2023/05/11 14:19:19 by erey-bet ### ########.fr */ /* Updated: 2023/06/16 17:45:58 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -39,12 +39,12 @@ uint32_t get_pixel_color(mlx_texture_t *texture, uint32_t x, uint32_t y)
int get_texture_side(t_dda *dda) int get_texture_side(t_dda *dda)
{ {
if (dda->side == 0 && dda->step_x < 0) if (dda->side == 0 && dda->step_x < 0)
return (0); return (3);
if (dda->side == 0 && dda->step_x > 0) if (dda->side == 0 && dda->step_x > 0)
return (1); return (1);
if (dda->side == 1 && dda->step_y < 0) if (dda->side == 1 && dda->step_y < 0)
return (2); return (2);
if (dda->side == 1 && dda->step_y > 0) if (dda->side == 1 && dda->step_y > 0)
return (3); return (0);
return (0); return (0);
} }

BIN
libftx/extra/extra.a Normal file

Binary file not shown.

BIN
libftx/gnl/get_next_line.a Normal file

Binary file not shown.

BIN
libftx/libft/libft.a Normal file

Binary file not shown.

BIN
libftx/libftx.a Normal file

Binary file not shown.

BIN
libftx/printf/ft_printf.a Normal file

Binary file not shown.