Remove aliases and add wizapp as submodule

.gitmodules

@@ -1,4 +1,3 @@
-[submodule "include/c_cpp_aliases"]
+[submodule "intern/wapp"]
-	path = include/c_cpp_aliases
+	path = intern/wapp
-	url = https://git.thewizardapprentice.com/abdelrahman/c-cpp-aliases.git
+	url = https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib.git
-	branch = main

compile

@@ -1,7 +1,10 @@
 #!/bin/bash
 
+WAPP_INCLUDE="$(find ./intern/wapp/src -type d | xargs -I{} echo -n "-I{} ")"
+WAPP_SRC="$(find ./intern/wapp/src -type f -name "*.c" | xargs -I{} echo -n "{} ")"
+
 CC=clang
-CFLAGS="-g -Wall -Werror -pedantic -Iinclude $(pkg-config --cflags sdl2)"
+CFLAGS="-g -Wall -Werror -pedantic -Iinclude $WAPP_INCLUDE $(pkg-config --cflags sdl2)"
 LIBS="$(pkg-config --libs sdl2) -lm"
 
 RAYTRACER_SRC="src/window/*.c \
@@ -17,6 +20,7 @@ RASTERISER_SRC="src/window/*.c \
 	src/list/*.c \
 	src/rasteriser/*.c \
 	src/math/*.c \
+	$WAPP_SRC \
 "
 
 BUILD=build_dir

include/math/math_utils.h

@@ -1,10 +1,16 @@
 #ifndef MATH_UTILS_H
 #define MATH_UTILS_H
 
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include <math.h>
 
 #define RADIANS(DEG) (DEG * (f32)M_PI / 180.0f)
+#define swap(T, v1, v2)                                                        \
+  {                                                                            \
+    T tmp = v1;                                                                \
+    v1 = v2;                                                                   \
+    v2 = tmp;                                                                  \
+  }
 
 f32 clamp(f32 value, f32 min, f32 max);
 

include/raytracer/raytracer.h

@@ -1,7 +1,7 @@
 #ifndef RAYTRACER_H
 #define RAYTRACER_H
 
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "scene/scene.h"
 #include "vector/vec.h"
 #include "window/window.h"

include/scene/scene.h

@@ -1,7 +1,7 @@
 #ifndef SCENE_H
 #define SCENE_H
 
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "window/window.h"
 
 typedef struct {

include/vector/vec.h

@@ -1,7 +1,7 @@
 #ifndef VEC_H
 #define VEC_H
 
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 
 typedef struct {
   i32 x;
@@ -33,12 +33,6 @@ typedef struct {
 #define vec_dot(T, v1, v2) vec_dot_##T(v1, v2)
 #define vec_magnitude(T, v) vec_magnitude_##T(v)
 #define vec_unit(T, v) vec_unit_##T(v)
-#define vec_swap(T, v1, v2)                                                    \
-  {                                                                            \
-    T tmp = v1;                                                                \
-    v1 = v2;                                                                   \
-    v2 = tmp;                                                                  \
-  }
 
 vec2i_t vec_add_vec2i_t(vec2i_t v1, vec2i_t v2);
 vec2i_t vec_sub_vec2i_t(vec2i_t v1, vec2i_t v2);

src/math/math_utils.c

@@ -1,5 +1,5 @@
 #include "math/math_utils.h"
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 
 f32 clamp(f32 value, f32 min, f32 max) {
   if (value < min) {

src/raytracer/main.c

@@ -1,4 +1,4 @@
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "raytracer/raytracer.h"
 #include "scene/scene.h"
 #include "vector/vec.h"

src/raytracer/raytracer.c

@@ -1,5 +1,5 @@
 #include "raytracer/raytracer.h"
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "vector/vec.h"
 #include "window/window.h"
 #include <math.h>

src/scene/scene.c

@@ -1,5 +1,5 @@
 #include "scene/scene.h"
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "misc/misc_utils.h"
 
 internal const sphere_t spheres[] = {

src/window/window.c

@@ -1,5 +1,5 @@
 #include "window/window.h"
-#include "c_cpp_aliases/aliases.h"
+#include "aliases.h"
 #include "math/math_utils.h"
 #include "vector/vec.h"
 #include <SDL2/SDL.h>