fix norminette errors after update, get rid of headers just included for macros (norminette)

Author: alx-sch

include/main.h

@@ -6,7 +6,7 @@
 /*   By: aschenk <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/06 18:13:07 by aschenk           #+#    #+#             */
-/*   Updated: 2025/02/23 18:34:59 by aschenk          ###   ########.fr       */
+/*   Updated: 2025/02/26 15:51:12 by aschenk          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,10 +27,6 @@ and declaring all function prototypes.
 # include <math.h>			// for math functions, expr, e.g. sqrt(), INFINITY
 # include <fcntl.h>			// for open() macros
 
-// X11 library headers
-# include <X11/keysym.h>	// Macros for key symbols, e.g. XK_Escape
-# include <X11/X.h>			// Macros for event names, e.g. DestroyNotify
-
 // Custom headers
 # include "libft.h"			// libft
 # include "mlx.h"			// mlx
@@ -43,6 +39,12 @@ and declaring all function prototypes.
 //#############
 
 # define WINDOW_TITLE	"miniRT by Natalie Holbrook & Alex Schenk @42Berlin"
+
+// To avoid including headers solely for macros (norminette):
+// <X11/keysym.h> and <X11/X.h>
+# define XK_ESCAPE		0xff1b	// Key code for the 'Esc' key
+# define DESTROY_NOTIFY	17		// Event code for window destruction
+
 # define BG_COLOR		0x303030	// Anthracite (dark grey)
 # define EPSILON 		1e-3	// Small value to avoid floating-point errors
 # define K_DIFFUSE		0.7		// Diffuse intensity factor [0.0, 1.0]

include/main_bonus.h

@@ -6,7 +6,7 @@
 /*   By: aschenk <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/06 18:13:07 by aschenk           #+#    #+#             */
-/*   Updated: 2025/02/23 18:35:10 by aschenk          ###   ########.fr       */
+/*   Updated: 2025/02/26 15:51:15 by aschenk          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,10 +27,6 @@ and declaring all function prototypes.
 # include <math.h>			// for math functions, expr, e.g. sqrt(), INFINITY
 # include <fcntl.h>			// for open() macros
 
-// X11 library headers
-# include <X11/keysym.h>	// Macros for key symbols, e.g. XK_Escape
-# include <X11/X.h>			// Macros for event names, e.g. DestroyNotify
-
 // Custom headers
 # include "libft.h"			// libft
 # include "mlx.h"			// mlx
@@ -43,6 +39,12 @@ and declaring all function prototypes.
 //#############
 
 # define WINDOW_TITLE	"miniRT by Natalie Holbrook & Alex Schenk @42Berlin"
+
+// To avoid including headers solely for macros (norminette):
+// <X11/keysym.h> and <X11/X.h>
+# define XK_ESCAPE		0xff1b	// Key code for the 'Esc' key
+# define DESTROY_NOTIFY	17		// Event code for window destruction
+
 # define BG_COLOR		0x303030	// Anthracite (dark grey)
 # define EPSILON 		1e-3	// Small value to avoid floating-point errors
 # define K_DIFFUSE		0.7		// Diffuse intensity factor [0.0, 1.0]

include/parsing.h

@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   parsing.h                                          :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: nholbroo <nholbroo@student.42.fr>          +#+  +:+       +#+        */
+/*   By: aschenk <aschenk@student.42berlin.de>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/19 16:58:53 by nholbroo          #+#    #+#             */
-/*   Updated: 2025/02/24 15:07:53 by nholbroo         ###   ########.fr       */
+/*   Updated: 2025/02/26 15:47:23 by aschenk          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -34,7 +34,7 @@
 			C -50.0,0,20 0,0,1 70
 			∗ identifier: C
 			∗ x,y,z coordinates of the view point: -50.0,0,20
-			∗ 3d normalized orientation vector. In range [-1,1] for each x,y,z axis:
+			∗ 3d normalized orientation vector. In range [-1,1] for each axis:
 			0.0,0.0,1.0
 			∗ FOV : Horizontal field of view in degrees in range [0,180]: 70
 		Light:
@@ -66,8 +66,8 @@
 			∗ the sphere diameter: 12.6
 			∗ R,G,B colors in range [0-255]: 10, 0, 255
 
-	The program will show a descriptive error message and exit with an error code,
-	depending on what the issue was.
+	The program will show a descriptive error message and exit with an error
+	code, depending on what the issue was.
 
 	The main structure of the parsing is as follows:
 	1. Checks file related errors -- like file permissions, existence etc.

include/types.h

@@ -6,7 +6,7 @@
 /*   By: aschenk <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/12 15:55:37 by aschenk           #+#    #+#             */
-/*   Updated: 2025/02/25 19:08:11 by aschenk          ###   ########.fr       */
+/*   Updated: 2025/02/26 15:46:40 by aschenk          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -375,7 +375,7 @@ typedef struct s_scene
 /**
 Data structure holding all raytracing-related data.
 - t_mlx `mlx`:		Struct with rendering context containing MiniLibX components.
-- t_scene `scene`:	Struct with scene data, including objects, lights, and camera.
+- t_scene `scene`:	Struct with scene data, including objects, lights, and cam.
 */
 typedef struct s_rt
 {

src/2_event_handling.c

@@ -6,7 +6,7 @@
 /*   By: aschenk <[email protected]>      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/11/13 17:24:44 by aschenk           #+#    #+#             */
-/*   Updated: 2025/02/18 22:44:13 by aschenk          ###   ########.fr       */
+/*   Updated: 2025/02/26 15:49:19 by aschenk          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,7 +32,7 @@ Handles key press events:
 */
 static int	handle_keypress(int keycode, t_rt *rt)
 {
-	if (keycode == XK_Escape)
+	if (keycode == XK_ESCAPE)
 	{
 		cleanup(&rt);
 		exit(EXIT_SUCCESS);
@@ -67,6 +67,7 @@ program is terminated.
 void	start_event_loop(t_rt *rt)
 {
 	(void)mlx_key_hook(rt->mlx.win_ptr, &handle_keypress, rt);
-	(void)mlx_hook(rt->mlx.win_ptr, DestroyNotify, 0, &handle_window_close, rt);
+	(void)mlx_hook(rt->mlx.win_ptr, DESTROY_NOTIFY, 0, &handle_window_close,
+		rt);
 	(void)mlx_loop(rt->mlx.mlx_ptr);
 }