From 30c67f5dc67706434f29032c390a8a804b7f10ed Mon Sep 17 00:00:00 2001 From: djonker Date: Sun, 5 Nov 2023 04:53:41 +0100 Subject: [PATCH] little cleanup --- Makefile | 18 +++++------ cub3d.h | 10 +++--- src/{ => draw}/draw.c | 4 +-- src/{ => draw}/raycast.c | 6 ++-- src/{ => input}/keys.c | 6 ++-- src/{ => main}/error.c | 4 +-- src/{ => main}/init.c | 4 +-- src/{ => main}/main.c | 69 +++++++++++++++++++--------------------- src/{ => parse}/map.c | 5 ++- src/{ => parse}/parse.c | 4 +-- 10 files changed, 63 insertions(+), 67 deletions(-) rename src/{ => draw}/draw.c (98%) rename src/{ => draw}/raycast.c (95%) rename src/{ => input}/keys.c (97%) rename src/{ => main}/error.c (91%) rename src/{ => main}/init.c (95%) rename src/{ => main}/main.c (77%) rename src/{ => parse}/map.c (97%) rename src/{ => parse}/parse.c (97%) diff --git a/Makefile b/Makefile index f865a4c..7fb8375 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: houtworm +#+ # # +#+ # # Created: 2023/10/26 10:46:29 by houtworm #+# #+# # -# Updated: 2023/11/04 02:26:44 by houtworm ######## odam.nl # +# Updated: 2023/11/05 04:43:47 by houtworm ######## odam.nl # # # # **************************************************************************** # @@ -16,14 +16,14 @@ FC =-Wall -Werror -Wextra -Wunreachable-code -flto -Ofast -march=native -g #-f HEAD =-I ./include -I $(MLX)/include RM =rm -rf LIB =libft/libft.a getnextline/get_next_line.a mlx/build/libmlx42.a -ldl -lglfw -pthread -lm -SRC =src/main.c\ - src/init.c\ - src/parse.c\ - src/keys.c\ - src/draw.c\ - src/error.c\ - src/raycast.c\ - src/map.c +SRC =src/main/main.c\ + src/main/init.c\ + src/draw/draw.c\ + src/main/error.c\ + src/draw/raycast.c\ + src/input/keys.c\ + src/parse/parse.c\ + src/parse/map.c OBJ =$(SRC:src/%.c=obj/%.o) all: libft getnextline mlx/build/mlx42.a $(NAME) diff --git a/cub3d.h b/cub3d.h index 39b0848..89649f9 100644 --- a/cub3d.h +++ b/cub3d.h @@ -6,7 +6,7 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 10:46:35 by houtworm #+# #+# */ -/* Updated: 2023/11/05 04:15:30 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:50:43 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -33,7 +33,7 @@ typedef struct s_varlist { mlx_t *mlx; mlx_image_t *img; - mlx_image_t *fps; + mlx_image_t *fstat; mlx_image_t *tstat; mlx_image_t *kstat; mlx_texture_t *curtext; @@ -61,6 +61,7 @@ typedef struct s_varlist double planey; int vaim; int jump; + double run; double raydirx; double raydiry; double sidedistx; @@ -70,7 +71,6 @@ typedef struct s_varlist double perpwalldist; int lineheight; int side; - double run; double oldmouseposx; double oldmouseposy; int32_t fcolor; @@ -92,13 +92,13 @@ t_varlist ft_parseconfigfile(t_varlist vl, char *filename); // map.c char **ft_getmap(t_varlist *vl, int fd); // keys.c -void ft_movementkeys(t_varlist *vl); +void ft_processinput(t_varlist *vl); void keyhook(mlx_key_data_t kd, void *param); void scrollhook(double xdelta, double ydelta, void *param); void resizehook(int x, int y, void *param); void cursorhook(double x, double y, void *param); // raycast.c -void ft_raycast(t_varlist *vl); +void ft_drawwalls(t_varlist *vl); // draw.c void ft_drawline(int x, t_varlist *vl, int drawstart, int drawend); void ft_drawsprites(t_varlist *vl); diff --git a/src/draw.c b/src/draw/draw.c similarity index 98% rename from src/draw.c rename to src/draw/draw.c index 392376d..4157b80 100644 --- a/src/draw.c +++ b/src/draw/draw.c @@ -6,11 +6,11 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:54:20 by houtworm #+# #+# */ -/* Updated: 2023/11/05 04:13:07 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:11 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" mlx_texture_t *ft_selectsprite(t_varlist *vl, int type) { diff --git a/src/raycast.c b/src/draw/raycast.c similarity index 95% rename from src/raycast.c rename to src/draw/raycast.c index 0df8c92..34ca66f 100644 --- a/src/raycast.c +++ b/src/draw/raycast.c @@ -6,13 +6,13 @@ /* By: djonker +#+ */ /* +#+ */ /* Created: 2023/10/27 14:36:42 by djonker #+# #+# */ -/* Updated: 2023/11/05 04:12:59 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:50:09 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" -void ft_raycast(t_varlist *vl) +void ft_drawwalls(t_varlist *vl) { int x; int drawstart; diff --git a/src/keys.c b/src/input/keys.c similarity index 97% rename from src/keys.c rename to src/input/keys.c index f18b8a6..fca90e7 100644 --- a/src/keys.c +++ b/src/input/keys.c @@ -6,13 +6,13 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:50:23 by houtworm #+# #+# */ -/* Updated: 2023/11/05 04:05:51 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:20 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" -void ft_movementkeys(t_varlist *vl) +void ft_processinput(t_varlist *vl) { double temp; double distance; diff --git a/src/error.c b/src/main/error.c similarity index 91% rename from src/error.c rename to src/main/error.c index 1b8f6e3..dcada8e 100644 --- a/src/error.c +++ b/src/main/error.c @@ -6,11 +6,11 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 17:13:58 by houtworm #+# #+# */ -/* Updated: 2023/10/26 17:16:06 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:25 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" int ft_errorexit(char *reason, char *function, int code) { diff --git a/src/init.c b/src/main/init.c similarity index 95% rename from src/init.c rename to src/main/init.c index 0192860..9c5fc8b 100644 --- a/src/init.c +++ b/src/main/init.c @@ -6,11 +6,11 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:49:12 by houtworm #+# #+# */ -/* Updated: 2023/11/05 04:13:14 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:29 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" t_varlist initvarlist(void) { diff --git a/src/main.c b/src/main/main.c similarity index 77% rename from src/main.c rename to src/main/main.c index 3a0e022..ded717b 100644 --- a/src/main.c +++ b/src/main/main.c @@ -6,45 +6,35 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 14:13:07 by houtworm #+# #+# */ -/* Updated: 2023/11/05 04:01:49 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:53:15 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" void ft_printstats(t_varlist *vl) { - char *enemies; - char *kills; - char *treasure; - char *found; + char *total; + char *current; char *temp; - enemies = ft_itoa(vl->enemies); - kills = ft_itoa(vl->kills); - temp = ft_vastrjoin(4, "Kills: ", kills, "/", enemies); + current = ft_itoa(1 / vl->frametime); + temp = ft_strjoin(current, " FPS"); + vl->fstat = mlx_put_string(vl->mlx, temp, 10, 10); + ft_vafree(2, temp, current); + total = ft_itoa(vl->enemies); + current = ft_itoa(vl->kills); + temp = ft_vastrjoin(4, "Kills: ", current, "/", total); vl->tstat = mlx_put_string(vl->mlx, temp, 10, 30); - free(temp); - treasure = ft_itoa(vl->tottreasure); - found = ft_itoa(vl->treasure); - temp = ft_vastrjoin(4, "Treasure: ", found, "/", treasure); + ft_vafree(3, temp, total, current); + total = ft_itoa(vl->tottreasure); + current = ft_itoa(vl->treasure); + temp = ft_vastrjoin(4, "Treasure: ", current, "/", total); vl->kstat = mlx_put_string(vl->mlx, temp, 10, 50); + ft_vafree(3, temp, total, current); + mlx_set_instance_depth(vl->fstat->instances, 2); mlx_set_instance_depth(vl->tstat->instances, 3); mlx_set_instance_depth(vl->kstat->instances, 4); - ft_vafree(5, enemies, kills, treasure, found, temp); -} - -void ft_frametime(t_varlist *vl) -{ - char *itoa; - char *print; - - vl->frametime = vl->mlx->delta_time; - itoa = ft_itoa(1 / vl->frametime); - print = ft_strjoin(itoa, " FPS"); - vl->fps = mlx_put_string(vl->mlx, print, 10, 10); - mlx_set_instance_depth(vl->fps->instances, 2); - ft_vafree(2, itoa, print); } void ft_pickup(t_varlist *vl) @@ -70,22 +60,30 @@ void ft_pickup(t_varlist *vl) } } +void ft_replaceimage(t_varlist *vl) +{ + mlx_delete_image(vl->mlx, vl->img); + mlx_delete_image(vl->mlx, vl->fstat); + mlx_delete_image(vl->mlx, vl->kstat); + mlx_delete_image(vl->mlx, vl->tstat); + vl->img = mlx_new_image(vl->mlx, vl->w, vl->h); +} + void mainloop(void *param) { t_varlist *vl; vl = param; - mlx_delete_image(vl->mlx, vl->img); - mlx_delete_image(vl->mlx, vl->fps); - mlx_delete_image(vl->mlx, vl->tstat); - mlx_delete_image(vl->mlx, vl->kstat); - vl->img = mlx_new_image(vl->mlx, vl->w, vl->h); - ft_raycast(vl); + ft_replaceimage(vl); + /*ft_drawceiling(vl);*/ + ft_drawwalls(vl); + /*ft_drawfloor(vl);*/ ft_pickup(vl); ft_drawsprites(vl); - ft_frametime(vl); + /*ft_drawweapon(vl);*/ + vl->frametime = vl->mlx->delta_time; ft_printstats(vl); - ft_movementkeys(vl); + ft_processinput(vl); if (!vl->img || (mlx_image_to_window(vl->mlx, vl->img, 0, 0) < 0)) ft_errorexit("image to window failed ", "mainloop", 1); mlx_set_instance_depth(vl->img->instances, 1); @@ -116,7 +114,6 @@ int main(int argc, char **argv) mlx_delete_texture(vl.southtext); mlx_delete_texture(vl.westtext); mlx_delete_texture(vl.barreltext); - mlx_delete_image(vl.mlx, vl.fps); mlx_delete_image(vl.mlx, vl.img); mlx_terminate(vl.mlx); exit (0); diff --git a/src/map.c b/src/parse/map.c similarity index 97% rename from src/map.c rename to src/parse/map.c index 39820a1..47df730 100644 --- a/src/map.c +++ b/src/parse/map.c @@ -6,12 +6,11 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 17:33:50 by houtworm #+# #+# */ -/* Updated: 2023/11/04 04:09:24 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:40 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" -#include +#include "../../cub3d.h" char ft_setplayerpos(t_varlist *vl, char dir, int x, int y) { diff --git a/src/parse.c b/src/parse/parse.c similarity index 97% rename from src/parse.c rename to src/parse/parse.c index dbf936e..285ff68 100644 --- a/src/parse.c +++ b/src/parse/parse.c @@ -6,11 +6,11 @@ /* By: houtworm +#+ */ /* +#+ */ /* Created: 2023/10/26 16:48:55 by houtworm #+# #+# */ -/* Updated: 2023/11/01 15:42:55 by houtworm ######## odam.nl */ +/* Updated: 2023/11/05 04:42:46 by houtworm ######## odam.nl */ /* */ /* ************************************************************************** */ -#include "../cub3d.h" +#include "../../cub3d.h" int ft_settexture(t_varlist *vl, char *line, int direction) {