Houtworm/cub3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moving around now works perfectly

Browse Source
This commit is contained in:
djonker 2023-10-29 06:37:54 +01:00
parent 3131eb717f
commit d6f462f9bf
3 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -6,7 +6,7 @@
# By: houtworm <codam@houtworm.net> +#+ # # By: houtworm <codam@houtworm.net> +#+ #
# +#+ # # +#+ #
# Created: 2023/10/26 10:46:29 by houtworm #+# #+# # # Created: 2023/10/26 10:46:29 by houtworm #+# #+# #
# Updated: 2023/10/27 14:45:10 by djonker ######## odam.nl # # Updated: 2023/10/29 06:31:28 by houtworm ######## odam.nl #
# # # #
# **************************************************************************** # # **************************************************************************** #

52
src/keys.c
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/27 15:16:02 by djonker ######## odam.nl */ /* Updated: 2023/10/29 06:34:27 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,22 +21,56 @@ void ft_movementkeys(t_varlist *vl)
ft_putendl("shoot"); ft_putendl("shoot");
if (mlx_is_key_down(vl->mlx, MLX_KEY_W)) if (mlx_is_key_down(vl->mlx, MLX_KEY_W))
{ {
if (vl->map[(int)vl->posx + (int)vl->dirx * (int)vl->movespeed][(int)vl->posy] == false) /*if (!vl->map[(int)vl->posx + (int)vl->dirx * (int)vl->movespeed][(int)vl->posy])*/
vl->posx += vl->dirx * vl->movespeed; /*{*/
if (vl->map[(int)vl->posx][(int)vl->posy + (int)vl->diry * (int)vl->movespeed] == false)
vl->posx += vl->dirx * vl->movespeed; vl->posx += vl->dirx * vl->movespeed;
vl->posy += vl->diry * vl->movespeed;
/*}*/
/*if (!vl->map[(int)vl->posx][(int)vl->posy + (int)vl->diry * (int)vl->movespeed])*/
/*{*/
/*vl->posx += vl->dirx * vl->movespeed;*/
/*vl->posy += vl->diry * vl->movespeed;*/
/*}*/
} }
if (mlx_is_key_down(vl->mlx, MLX_KEY_A)) if (mlx_is_key_down(vl->mlx, MLX_KEY_A))
ft_putendl("A is pressed"); {
/*if (!vl->map[(int)vl->posx - (int)vl->dirx * (int)vl->movespeed][(int)vl->posy])*/
/*{*/
/*vl->posx -= vl->diry * vl->movespeed;*/
/*vl->posy += vl->dirx * vl->movespeed;*/
/*}*/
/*if (!vl->map[(int)vl->posx][(int)vl->posy - (int)vl->diry * (int)vl->movespeed])*/
/*{*/
vl->posx -= vl->diry * vl->movespeed;
vl->posy += vl->dirx * vl->movespeed;
/*}*/
}
if (mlx_is_key_down(vl->mlx, MLX_KEY_S)) if (mlx_is_key_down(vl->mlx, MLX_KEY_S))
{ {
if (vl->map[(int)vl->posx - (int)vl->dirx * (int)vl->movespeed][(int)vl->posy] == false) /*if (!vl->map[(int)vl->posx - (int)vl->dirx * (int)vl->movespeed][(int)vl->posy])*/
vl->posx -= vl->dirx * vl->movespeed; /*{*/
if (vl->map[(int)vl->posx][(int)vl->posy - (int)vl->diry * (int)vl->movespeed] == false) /*vl->posx -= vl->dirx * vl->movespeed;*/
/*vl->posy -= vl->diry * vl->movespeed;*/
/*}*/
/*if (!vl->map[(int)vl->posx][(int)vl->posy - (int)vl->diry * (int)vl->movespeed])*/
/*{*/
vl->posx -= vl->dirx * vl->movespeed; vl->posx -= vl->dirx * vl->movespeed;
vl->posy -= vl->diry * vl->movespeed;
/*}*/
} }
if (mlx_is_key_down(vl->mlx, MLX_KEY_D)) if (mlx_is_key_down(vl->mlx, MLX_KEY_D))
ft_putendl("D is pressed"); {
/*if (!vl->map[(int)vl->posx + (int)vl->dirx * (int)vl->movespeed][(int)vl->posy])*/
/*{*/
vl->posx += vl->diry * vl->movespeed;
vl->posy -= vl->dirx * vl->movespeed;
/*}*/
/*if (!vl->map[(int)vl->posx][(int)vl->posy + (int)vl->diry * (int)vl->movespeed])*/
/*{*/
/*vl->posx += vl->diry * vl->movespeed;*/
/*vl->posy -= vl->dirx * vl->movespeed;*/
/*}*/
}
if (mlx_is_key_down(vl->mlx, MLX_KEY_LEFT)) if (mlx_is_key_down(vl->mlx, MLX_KEY_LEFT))
{ {
olddirx = vl->dirx; olddirx = vl->dirx;

6
src/raycast.c
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/27 15:02:06 by djonker ######## odam.nl */ /* Updated: 2023/10/29 05:53:32 by houtworm ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -38,7 +38,7 @@ void ft_raycast(t_varlist *vl)
else else
{ {
vl->stepx = 1; vl->stepx = 1;
vl->sidedistx = (vl->posx + 1.0 - vl->mapx) * vl->deltadistx; vl->sidedistx = (vl->mapx + 1.0 - vl->posx) * vl->deltadistx;
} }
if (vl->raydiry < 0) if (vl->raydiry < 0)
{ {
@ -48,7 +48,7 @@ void ft_raycast(t_varlist *vl)
else else
{ {
vl->stepy = 1; vl->stepy = 1;
vl->sidedisty = (vl->posy + 1.0 - vl->mapy) * vl->deltadisty; vl->sidedisty = (vl->mapy + 1.0 - vl->posy) * vl->deltadisty;
} }
while (vl->hit == 0) while (vl->hit == 0)
{ {