Skip to content

Commit

Permalink
added animated sprite (cloud) to-do : norm and error check then push
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mathisou
Mathisou committed Apr 2, 2022
1 parent ab11750 commit 7ca402f
Show file tree
Hide file tree
Showing 31 changed files with 7,213 additions and 141 deletions.
110 changes: 110 additions & 0 deletions WallPack/cloud.xpm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/* XPM */
static char *e62df2a9235e40def75c69233ac136d12rmtqaCDIYW6SFRV[] = {
/* columns rows colors chars-per-pixel */
"100 100 4 1 ",
" c None",
". c black",
"X c #EE0606",
"o c white",
/* pixels */
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.............................XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...............................XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXX.................................XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXX.........oooooooo.....oooooooooo...XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXX...........oooooooooo....ooooooooooo...X............XXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX................oooooooooooo...oooooooooooo..................XXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXX................oooooooooooooo...oooooooooooo...................XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXX...............oooooooooooooooo...oooooooooooo.......ooooooo.....XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX.......oooooooooooooooooooooooooooooooooooooooo...oooooooooooo....XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX.....oooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo..........XXXXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo............XXXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.............XXXXXXXXXXXX",
"XXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.....XXXXXXXXXXXX",
"XXXXXXXXXXXX...ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo....XXXXXXXXXXXX",
"XXXXXXXXXXXX....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXX",
"XXXXXXXXXXXX....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXX",
"XXXXXXXXXXXXX....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo....XXXXXXXXXXXX",
"XXXXXXXXXXXXX....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo....XXXXXXXXXXXX",
"XXXXXXXXXXXXX....oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.....XXXXXXXXXXXX",
"XXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo....XXXXXXXXXXXXX",
"XXXXXXXXXXXXXX....ooo....ooooooooooooooooooooooooooooooooooooooooooooooooooooooooo.....XXXXXXXXXXXXX",
"XXXXXXXXXXXXXX...........ooooooooooooooooooooooooooooooooooooooooooooooooooooo........XXXXXXXXXXXXXX",
"XXXXXXXXXXXXXX...........oooooooooooooooooooooooooooooooooooooooooooooooooo...........XXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXX..........oooooooooooooooooooooooooooooooooooooooooooooo..............XXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooo..........XXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooo.......XXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooooooooooooooooooooooooooooooooooooo...XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...ooooooooooooooooooooooooooooooooooooooooooooo....XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooooo....ooooooooooooo....ooooooooooo.....XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...oooooooooo......oooooooooooo.....ooooooooooo.....XXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX...................oooooooooo.......oooooooo.......XXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX....................ooooooooo.......ooooo.........XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXX....................ooooooo.......................XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX.....oooo.......X..............XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX...............XX..........XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX............XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX..........XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
" "
};
94 changes: 0 additions & 94 deletions cub3d_bonus/Makefile
View file

This file was deleted.

15 changes: 8 additions & 7 deletions cub3d_bonus/inc/include.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: maroly <maroly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/15 18:36:24 by hkovac #+# #+# */
/* Updated: 2022/03/31 17:49:15 by maroly ### ########.fr */
/* Updated: 2022/04/02 14:10:56 by maroly ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -20,8 +20,9 @@
# define WE 2
# define EA 3
# define DO 4
# define F 5
# define C 6
# define CL 5
# define F 6
# define C 7

# define DOOR

Expand All @@ -30,7 +31,7 @@

# define PI 3.1415926

/*//MacOS
//MacOS
# define UP 13
# define DOWN 1
# define LEFT 0
Expand All @@ -40,10 +41,10 @@
# define ESC 53
# define SHIFT 257
# define ARROW_UP 126
# define ARROW_DOWN 125*/
# define ARROW_DOWN 125

//LINUX
# define UP 119
/*# define UP 119
# define DOWN 115
# define LEFT 97
# define RIGHT 100
Expand All @@ -52,7 +53,7 @@
# define ESC 65307
# define SHIFT 65505
# define ARROW_UP 65362
# define ARROW_DOWN 65364
# define ARROW_DOWN 65364*/
# include <stdlib.h>
# include <sys/types.h>
# include <sys/uio.h>
Expand Down
8 changes: 4 additions & 4 deletions cub3d_bonus/inc/struct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: maroly <maroly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/15 18:35:33 by hkovac #+# #+# */
/* Updated: 2022/03/31 19:41:09 by maroly ### ########.fr */
/* Updated: 2022/04/02 14:53:09 by maroly ### ########.fr */
/* */
/* ************************************************************************** */

Expand Down Expand Up @@ -93,15 +93,15 @@ typedef struct s_gbl
{
char **map;
char **file;
char *tex_string[7];
char *tex_string[8];
unsigned int sky;
unsigned int floor;
double head;
double horizon;
bool is_mouse_hide;
int count;
int save_mapx;
int save_mapy;
double posxcloud;
double posycloud;
t_mlx *mlx;
t_rc *rc;
t_mlx **tex_tab;
Expand Down
1 change: 1 addition & 0 deletions cub3d_bonus/maps/carre.cub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ SO ./WallPack/Blue5.xpm
EA ./WallPack/Blue5.xpm
WE ./WallPack/Blue5.xpm
DO ./WallPack/Blue1.xpm
CL ./WallPack/cloud.xpm
F 33,33,33
C 89,1,238

Expand Down
4 changes: 3 additions & 1 deletion cub3d_bonus/src/check_cub.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: maroly <maroly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/16 17:58:23 by hkovac #+# #+# */
/* Updated: 2022/03/31 19:10:49 by maroly ### ########.fr */
/* Updated: 2022/04/02 14:10:21 by maroly ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -26,6 +26,8 @@ void all_param2(t_gbl *gbl, int i)
gbl->tex_string[EA] = ft_strdup(gbl->file[i] + 3);
else if (ft_strncmp("DO ", gbl->file[i], 3) == 0)
gbl->tex_string[DO] = ft_strdup(gbl->file[i] + 3);
else if (ft_strncmp("CL ", gbl->file[i], 3) == 0)
gbl->tex_string[CL] = ft_strdup(gbl->file[i] + 3);
else if (ft_strncmp("F ", gbl->file[i], 2) == 0)
gbl->tex_string[F] = ft_strdup(gbl->file[i] + 2);
else if (ft_strncmp("C ", gbl->file[i], 2) == 0)
Expand Down
6 changes: 5 additions & 1 deletion cub3d_bonus/src/controls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: maroly <maroly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/29 10:05:14 by hkovac #+# #+# */
/* Updated: 2022/03/31 18:56:10 by maroly ### ########.fr */
/* Updated: 2022/04/02 15:03:06 by maroly ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -16,12 +16,14 @@ void head_up(t_gbl *gbl, int mult)
{
gbl->head += 10 * mult;
gbl->horizon += 0.0156 * mult;
gbl->posycloud += 10;
}

void head_down(t_gbl *gbl, int mult)
{
gbl->head -= 10 * mult;
gbl->horizon -= 0.0156 * mult;
gbl->posycloud -= 10;
}

void arrow_left(t_gbl *gbl, int mult)
Expand All @@ -39,6 +41,7 @@ void arrow_left(t_gbl *gbl, int mult)
- gbl->rc->planey * sin(-0.03 * mult);
gbl->rc->planey = oldplanex * sin(-0.03 * mult)
+ gbl->rc->planey * cos(-0.03 * mult);
gbl->posxcloud += 21;
}

void arrow_right(t_gbl *gbl, int mult)
Expand All @@ -56,6 +59,7 @@ void arrow_right(t_gbl *gbl, int mult)
- gbl->rc->planey * sin(0.03 * mult);
gbl->rc->planey = oldplanex * sin(0.03 * mult)
+ gbl->rc->planey * cos(0.03 * mult);
gbl->posxcloud -= 21;
}

int controls(int keycode, t_gbl *gbl)
Expand Down
15 changes: 14 additions & 1 deletion cub3d_bonus/src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* By: maroly <maroly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2022/03/15 18:22:18 by hkovac #+# #+# */
/* Updated: 2022/03/31 18:26:35 by maroly ### ########.fr */
/* Updated: 2022/04/02 14:39:52 by maroly ### ########.fr */
/* */
/* ************************************************************************** */

Expand All @@ -16,6 +16,7 @@ int main(int ac, char **av)
{
t_gbl *gbl;
t_mlx *mlx;
t_rc rc;

if (ac != 2)
return (1);
Expand All @@ -28,6 +29,18 @@ int main(int ac, char **av)
parse_map(gbl, av[1]);
open_texture(gbl);
init_mlx(mlx, WIDTH, HEIGHT);
gbl->rc = &rc;
if (!find_pos(gbl, &rc))
return (0);
init_dir(gbl, &rc);
gbl->rc->speed = 0.15;
gbl->rc->is_running = false;
mlx_hook(gbl->mlx->mlx_win, 2, 1L >> 0, controls, gbl);
mlx_mouse_hook(gbl->mlx->mlx_win, mouse_pressed, gbl);
mlx_hook(gbl->mlx->mlx_win, 6, 1 << 6, mouse, gbl);
mlx_hook(gbl->mlx->mlx_win, 17, 0, destroy_window, gbl);
mlx_loop_hook(mlx->mlx, ray_casting, gbl);
mlx_loop(gbl->mlx->mlx);
if (!ray_casting(gbl))
{
end_free(gbl);
Expand Down
Loading

0 comments on commit 7ca402f

Please sign in to comment.