starnakin/42_cube3D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ça compile maintenant

Browse Source
This commit is contained in:
Etienne Rey-bethbeder 2023-06-01 13:49:12 +02:00
parent 88298e79b2
commit ab4e7e7034
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -7,9 +7,9 @@ SRCS := ${SRCS_MAP} \
${SRCS_GAME} ${SRCS_GAME}
OBJS := ${SRCS:.c=.o} OBJS := ${SRCS:.c=.o}
CC := clang CC := gcc
LIBS := libftx/libftx.a MLX42/build/libmlx42.a -ldl -lglfw -lm LIBS := libftx/libftx.a MLX42/build/libmlx42.a -ldl -lglfw -lm
CFLAGS := -g -Wall -Wextra -Werror -Wno-conversion #-Ofast CFLAGS := -g -Wall -Wextra -Werror #-Wno-conversion -Ofast -fsanitize=leak
NAME := cub3D NAME := cub3D
all: ${NAME} all: ${NAME}

6
game/init.c
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/05/19 17:03:52 by erey-bet ### ########.fr */ /* Updated: 2023/06/01 13:28:15 by erey-bet ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -14,8 +14,8 @@
void init_ply(t_map map, t_ply *ply) void init_ply(t_map map, t_ply *ply)
{ {
ply->pos_x = map.ply_x - 0.5; ply->pos_x = map.ply_x + 0.5;
ply->pos_y = map.ply_y - 0.5; ply->pos_y = map.ply_y + 0.5;
ply->dir_x = 0.0; ply->dir_x = 0.0;
ply->dir_y = 0.0; ply->dir_y = 0.0;
if (map.direction == 'N') if (map.direction == 'N')

4
libftx/gnl/Makefile
View File

@ -6,7 +6,7 @@
# By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ # # By: cchauvet <cchauvet@student.42angouleme.fr +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/12/14 15:49:18 by cchauvet #+# #+# # # Created: 2022/12/14 15:49:18 by cchauvet #+# #+# #
# Updated: 2023/01/05 19:22:40 by cchauvet ### ########.fr # # Updated: 2023/06/01 13:23:51 by erey-bet ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -16,7 +16,7 @@ OBJS = ${SRCS:.c=.o}
NAME = get_next_line.a NAME = get_next_line.a
CFLAGS = -Wall -Werror -Wextra -g CFLAGS = -fPIE -Wall -Werror -Wextra -g
CC = clang CC = clang

4
libftx/printf/Makefile
View File

@ -6,7 +6,7 @@
# By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ # # By: cchauvet <cchauvet@student.42angoulem +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2022/09/27 08:39:27 by cchauvet #+# #+# # # Created: 2022/09/27 08:39:27 by cchauvet #+# #+# #
# Updated: 2023/02/01 16:19:19 by cchauvet ### ########.fr # # Updated: 2023/06/01 13:24:02 by erey-bet ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -18,7 +18,7 @@ OBJS = ${SRCS:.c=.o}
NAME = ft_printf.a NAME = ft_printf.a
CFLAG = -Wall -Werror -Wextra -g CFLAG = -fPIE -Wall -Werror -Wextra -g
%.o: %.c %.o: %.c
${CC} ${CFLAG} -c -o $@ $< ${CC} ${CFLAG} -c -o $@ $<

11
maps/test1.cub
View File

@ -5,21 +5,14 @@ EA ./assets/purple.png
F 200,100,0 F 200,100,0
C 225,30,0 C 225,30,0
EA ./path_to_the_east_texture
NO ./path_to_the_north_texture
WE ./path_to_the_west_texture
F 200,100,0
11111111111111111111111111 11111111111111111111111111
101100000111000000000000001 N 101100000111000000000000001
101100000111000000000000001 101100000111000000000000001
101100000111000000000000001 1111 101100000111000000000000001 1111
1011000001110000000000000011111100001 1011000001110000000000000011111100001
1011000001110000000000000000000000001 101100000111000000000000000000000W001
1011000001110000000000000011111100001 1011000001110000000000000011111100001
101100000111000000000000001 10101 101100000111000000000000001 10101
101100000111000000000000001 11111 101100000111000000000000001 11111