added more textures also put mlx outside include for norm checking

Anarbb · Jun 11, 2023 · 0425763 · 0425763
1 parent 246d039
commit 0425763
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 10 deletions.
diff --git a/include/MLX42/MLX42.h → MLX42/MLX42.h b/include/MLX42/MLX42.h → MLX42/MLX42.h
diff --git a/include/MLX42/MLX42_Input.h → MLX42/MLX42_Input.h b/include/MLX42/MLX42_Input.h → MLX42/MLX42_Input.h
diff --git a/include/MLX42/MLX42_Int.h → MLX42/MLX42_Int.h b/include/MLX42/MLX42_Int.h → MLX42/MLX42_Int.h
diff --git a/Makefile b/Makefile
@@ -1,12 +1,12 @@
 NAME	:= cub3D
 CC		:= cc
-CFLAGS	:= -Iinclude #-Wall -Wextra -Werror -Ofast
+CFLAGS	:= -Iinclude -Wall -Wextra -Werror -Ofast
 HEADERS	:= include/cub3d.h
 LIBFT	:= libs/libft.a
 MLX		:= libs/libmlx.a
-# LIBS	:= -lglfw -L/Volumes/L/.brew/opt/glfw/lib 
+LIBS	:= -lglfw -L/Volumes/L/.brew/opt/glfw/lib 
 # LIBS	:= -ldl -lglfw -pthread -lm -lglfw
-LIBS	:= -lglfw -L/Users/ybenlafk/.brew/opt/glfw/lib/
+# LIBS	:= -lglfw -L/Users/ybenlafk/.brew/opt/glfw/lib/
 SRCS := srcs/main.c \
 		srcs/parsing/parse.c \
 		srcs/engine/raycast.c \

diff --git a/assets/maps/def.cub b/assets/maps/def.cub
@@ -1,7 +1,7 @@
-NO  ./assets/textures/STARG3_64.png
-WE  ./assets/textures/STARG3_64.png
-EA  ./assets/textures/STARG2_64.png
-SO  ./assets/textures/STARG2_64.png
+NO  ./assets/textures/hl-wall.png
+WE  ./assets/textures/hl-wall2.png
+EA  ./assets/textures/hl-wall2.png
+SO  ./assets/textures/hl-wall.png
 
 F 58, 58, 59
 C 147, 148, 255

diff --git a/assets/textures/dink.png b/assets/textures/dink.png
diff --git a/assets/textures/hl-wall.png b/assets/textures/hl-wall.png
diff --git a/assets/textures/hl-wall2.png b/assets/textures/hl-wall2.png
diff --git a/assets/textures/hl-wall3.png b/assets/textures/hl-wall3.png
diff --git a/assets/textures/hl-win.png b/assets/textures/hl-win.png
diff --git a/include/cub3d.h b/include/cub3d.h
@@ -3,17 +3,17 @@
 /*                                                        :::      ::::::::   */
 /*   cub3d.h                                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: ybenlafk <ybenlafk@student.42.fr>          +#+  +:+       +#+        */
+/*   By: aarbaoui <aarbaoui@student.1337.ma>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/03/29 00:34:22 by aarbaoui          #+#    #+#             */
-/*   Updated: 2023/06/10 19:21:54 by ybenlafk         ###   ########.fr       */
+/*   Updated: 2023/06/11 15:29:00 by aarbaoui         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #ifndef CUB3D_H
 # define CUB3D_H
 
-# include "MLX42/MLX42.h"
+# include "../MLX42/MLX42.h"
 # include "get_next_line.h"
 # include "libft.h"
 # include <math.h>

diff --git a/test b/test
@@ -0,0 +1,2 @@
+Error
+🚨: Image error