map is being parsed correctly :)

This commit is contained in:
djonker 2023-10-29 14:27:34 +01:00
parent f705f20fe8
commit 26b4e9d03d
9 changed files with 170 additions and 76 deletions

View File

@ -6,8 +6,27 @@ EA ./path_to_the_east_texture
SO ./path_to_the_south_texture SO ./path_to_the_south_texture
WE ./path_to_the_west_texture WE ./path_to_the_west_texture
111111 111111111111111111111111
100101 100000000000000000000001
101001 100000000000000000000001
1100N1 100000000000000000000001
111111 100000111110000101010001
100000100010000000000001
100000100010000100010001
100000100010000000000001
100000110110000101010001
100000000000000000000001
100000000000000000000001
100000000000100000000001
100000000000000000000001
100000000000000000000001
100000000000000000000001
100000000000000000000001
111111111000000000000001
110100001000000000000001
110000101000000000000001
110100001000000000000001
110111111000000000000001
1100000000000000N0000001
111111111000000000000001
111111111111111111111111

View File

@ -6,7 +6,7 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */ /* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */
/* Updated: 2023/10/29 11:50:54 by houtworm ######## odam.nl */ /* Updated: 2023/10/29 13:46:54 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -52,22 +52,23 @@ typedef struct s_varlist
int hit; int hit;
int side; int side;
double oldmouseposx; double oldmouseposx;
double oldmouseposy; double oldmouseposy; // only needed if we do vertical aiming
int32_t fcolor; int32_t fcolor;
int32_t ccolor; int32_t ccolor;
char *northwt; char *northwt;
char *eastwt; char *eastwt;
char *southwt; char *southwt;
char *westwt; char *westwt;
int resize;
} t_varlist; } t_varlist;
void ft_frametime(t_varlist *vl);
// init.c // init.c
t_varlist initvarlist(void); t_varlist initvarlist(void);
// parse.c // parse.c
t_varlist ft_parseconfigfile(t_varlist vl, char *filename); t_varlist ft_parseconfigfile(t_varlist vl, char *filename);
char **ft_getmap(void);
// map.c // map.c
char **ft_getmap(void); char **ft_getmap(t_varlist *vl, int fd);
// keys.c // keys.c
void ft_movementkeys(t_varlist *vl); void ft_movementkeys(t_varlist *vl);
void keyhook(mlx_key_data_t kd, void *param); void keyhook(mlx_key_data_t kd, void *param);

View File

@ -6,7 +6,7 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 16:54:20 by houtworm #+# #+# */ /* Created: 2023/10/26 16:54:20 by houtworm #+# #+# */
/* Updated: 2023/10/27 17:04:16 by djonker ######## odam.nl */ /* Updated: 2023/10/29 12:28:28 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,7 +17,7 @@ void ft_drawline(int x, t_varlist *vl, int drawstart, int drawend)
int y; int y;
y = 1; y = 1;
while (vl->h >= y) while (vl->h > y)
{ {
if (y < drawstart) if (y < drawstart)
mlx_put_pixel(vl->img, x, y, vl->ccolor); mlx_put_pixel(vl->img, x, y, vl->ccolor);

View File

@ -6,7 +6,7 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 16:49:12 by houtworm #+# #+# */ /* Created: 2023/10/26 16:49:12 by houtworm #+# #+# */
/* Updated: 2023/10/26 22:03:37 by houtworm ######## odam.nl */ /* Updated: 2023/10/29 13:52:03 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,12 +16,14 @@ t_varlist initvarlist(void)
{ {
t_varlist vl; t_varlist vl;
vl.w = 600; vl.w = 800;
vl.h = 600; vl.h = 600;
vl.posx = 22; vl.ccolor = 0;
vl.posy = 12; vl.fcolor = 0;
vl.dirx = -1; vl.northwt = NULL;
vl.diry = 0; vl.eastwt = NULL;
vl.southwt = NULL;
vl.westwt = NULL;
vl.planex = 0; vl.planex = 0;
vl.planey = 0.66; vl.planey = 0.66;
vl.mlx = mlx_init(vl.w, vl.h, "Cub3D", true); vl.mlx = mlx_init(vl.w, vl.h, "Cub3D", true);

View File

@ -6,7 +6,7 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 16:50:23 by houtworm #+# #+# */ /* Created: 2023/10/26 16:50:23 by houtworm #+# #+# */
/* Updated: 2023/10/29 12:10:26 by houtworm ######## odam.nl */ /* Updated: 2023/10/29 12:26:33 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

View File

@ -6,7 +6,7 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 14:13:07 by houtworm #+# #+# */ /* Created: 2023/10/26 14:13:07 by houtworm #+# #+# */
/* Updated: 2023/10/29 12:08:59 by houtworm ######## odam.nl */ /* Updated: 2023/10/29 12:26:20 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

View File

@ -6,55 +6,77 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 17:33:50 by houtworm #+# #+# */ /* Created: 2023/10/26 17:33:50 by houtworm #+# #+# */
/* Updated: 2023/10/27 16:25:33 by djonker ######## odam.nl */ /* Updated: 2023/10/29 14:25:40 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../cub3d.h" #include "../cub3d.h"
#include <stdio.h>
char **ft_getmap(void) char ft_setplayerpos(t_varlist *vl, char dir, int y, int x)
{
vl->posx = x;
vl->posy = y;
if (dir == 'N' || dir == 'E')
vl->dirx = -1;
else
vl->dirx = 0;
if (dir == 'S' || dir == 'W')
vl->diry = -1;
else
vl->diry = 0;
return ('0');
}
char **ft_getmap(t_varlist *vl, int fd)
{ {
int y; int y;
int x; int x;
int ret;
char **map; char **map;
char localmap[24][24] = { char *line;
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}, map = ft_calloc(512, 8);
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,1,1,1,1,1,0,0,0,0,1,0,1,0,1,0,0,0,1},
{1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,1},
{1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,1,1,0,1,1,0,0,0,0,1,0,1,0,1,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,0,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1}
};
map = ft_calloc(24, 8);
y = 0; y = 0;
while (y < 24) ret = 1;
while (y <= 512 && ret > 0)
{ {
map[y] = ft_calloc(24, 8); map[y] = ft_calloc(512, 8);
x = 0; while (ret > 0)
while (x < 24)
{ {
map[y][x] = localmap[y][x]; ret = get_next_line(fd, &line);
x++; if (line[0])
break ;
} }
y++; if (ret == 0)
{
map[y] = NULL;
int i;
i = 0;
while (i < y)
{
printf("%s\n", map[i]);
i++;
} }
free(line);
printf("xpos: %lf ypos %lf xdir %lf ydir %lf\n\n", vl->posy, vl->posx, vl->dirx, vl->diry);
return (map);
}
printf("line: %s\n", line);
x = 0;
while (x <= 512 && line[x])
{
if (ft_strchr(" 0", line[x]))
map[y][x] = '0';
else if (ft_strchr("1", line[x]))
map[y][x] = '1';
else if (ft_strchr("NESW", line[x]))
map[y][x] = ft_setplayerpos(vl, line[x], y, x);
x++;
}
free(line);
y++;
}
free(line);
return (map); return (map);
} }

View File

@ -6,14 +6,14 @@
/* By: houtworm <codam@houtworm.net> +#+ */ /* By: houtworm <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/26 16:48:55 by houtworm #+# #+# */ /* Created: 2023/10/26 16:48:55 by houtworm #+# #+# */
/* Updated: 2023/10/27 19:56:28 by djonker ######## odam.nl */ /* Updated: 2023/10/29 13:54:50 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "../cub3d.h" #include "../cub3d.h"
#include <stdio.h> #include <stdio.h>
int ft_settexture(t_varlist *vl, char *line) int ft_settexture(t_varlist *vl, char *line, int direction)
{ {
int i; int i;
@ -21,18 +21,18 @@ int ft_settexture(t_varlist *vl, char *line)
i = 0; i = 0;
while (line[i] != '.') while (line[i] != '.')
i++; i++;
if (ft_strncmp(line, "NO ", 3)) if (direction == 1)
vl->northwt = ft_strdup(&line[i]); vl->northwt = ft_strdup(&line[i]);
if (ft_strncmp(line, "EA ", 3)) if (direction == 2)
vl->eastwt = ft_strdup(&line[i]); vl->eastwt = ft_strdup(&line[i]);
if (ft_strncmp(line, "SO ", 3)) if (direction == 3)
vl->southwt = ft_strdup(&line[i]); vl->southwt = ft_strdup(&line[i]);
if (ft_strncmp(line, "WE ", 3)) if (direction == 4)
vl->westwt = ft_strdup(&line[i]); vl->westwt = ft_strdup(&line[i]);
return (0); return (0);
} }
int ft_setcolor(t_varlist *vl, char *line) int ft_setcolor(t_varlist *vl, char *line, int dest)
{ {
int i; int i;
int r; int r;
@ -53,36 +53,86 @@ int ft_setcolor(t_varlist *vl, char *line)
while (line[i] < '0' || line[i] > '9') while (line[i] < '0' || line[i] > '9')
i++; i++;
b = ft_atoi(&line[i]); b = ft_atoi(&line[i]);
if (line[0] == 'F') if (dest == 1)
vl->fcolor = (r << 24 | g << 16 | b << 8 | 255);
if (line[0] == 'C')
vl->ccolor = (r << 24 | g << 16 | b << 8 | 255); vl->ccolor = (r << 24 | g << 16 | b << 8 | 255);
if (dest == 2)
vl->fcolor = (r << 24 | g << 16 | b << 8 | 255);
return (0); return (0);
} }
int ft_checkline(t_varlist *vl, char *line) char *ft_checkline(t_varlist *vl, char *line)
{ {
if ((line[0] == 'F' || line[0] == 'C') && line[1] == ' ') if (line[0] == 'C' && line[1] == ' ')
ft_setcolor(vl, line); {
else if ((!ft_strncmp(line, "NO ", 3) || !ft_strncmp(line, "EA ", 3) || !ft_strncmp(line, "SO ", 3) || !ft_strncmp(line, "WE ", 3))) if (!vl->ccolor)
ft_settexture(vl, line); ft_setcolor(vl, line, 1);
return (0); else
return (" ceiling color");
}
else if (line[0] == 'F' && line[1] == ' ')
{
if (!vl->fcolor)
ft_setcolor(vl, line, 2);
else
return (" floor color");
}
else if (!ft_strncmp(line, "NO ", 3))
{
if (!vl->northwt)
ft_settexture(vl, line, 1);
else
return (" north texture");
}
return (NULL);
}
char *ft_checkline2(t_varlist *vl, char *line)
{
if (!ft_strncmp(line, "EA ", 3))
{
if (!vl->eastwt)
ft_settexture(vl, line, 2);
else
return (" east texture");
}
else if (!ft_strncmp(line, "SO ", 3))
{
if (!vl->southwt)
ft_settexture(vl, line, 3);
else
return (" south texture");
}
else if (!ft_strncmp(line, "WE ", 3))
{
if (!vl->westwt)
ft_settexture(vl, line, 4);
else
return (" west texture");
}
return (NULL);
} }
t_varlist ft_parseconfigfile(t_varlist vl, char *filename) t_varlist ft_parseconfigfile(t_varlist vl, char *filename)
{ {
int fd; int fd;
char *line; char *line;
char *error;
fd = open(filename, O_RDONLY); fd = open(filename, O_RDONLY);
if (fd == -1) if (fd == -1)
ft_errorexit("file does not exist", "parseconfigfile", 1); ft_errorexit("file does not exist", "parseconfigfile", 1);
while (get_next_line(fd, &line)) while (get_next_line(fd, &line))
{ {
ft_checkline(&vl, line); error = ft_checkline(&vl, line);
if (!error)
error = ft_checkline2(&vl, line);
if (error)
ft_errorexit("Double config declaration in .cub file", error, 1);
if (vl.ccolor && vl.fcolor && vl.northwt && vl.eastwt && vl.southwt && vl.westwt)
vl.map = ft_getmap(&vl, fd);
free(line); free(line);
} }
close(fd);
free(line); free(line);
vl.map = ft_getmap();
return (vl); return (vl);
} }

View File

@ -6,7 +6,7 @@
/* By: djonker <codam@houtworm.net> +#+ */ /* By: djonker <codam@houtworm.net> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2023/10/27 14:36:42 by djonker #+# #+# */ /* Created: 2023/10/27 14:36:42 by djonker #+# #+# */
/* Updated: 2023/10/29 05:53:32 by houtworm ######## odam.nl */ /* Updated: 2023/10/29 14:23:45 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -64,7 +64,7 @@ void ft_raycast(t_varlist *vl)
vl->mapy += vl->stepy; vl->mapy += vl->stepy;
vl->side = 1; vl->side = 1;
} }
if (vl->map[vl->mapx][vl->mapy] > 0) if (vl->map[vl->mapx][vl->mapy] == '1')
vl->hit = 1; vl->hit = 1;
} }
if (vl->side == 0) if (vl->side == 0)