clean up includes (#932)

.github/workflows/tidy-format-validation.yml

@@ -50,7 +50,7 @@ jobs:
           mkdir clang-tidy-result
       - name: Analyze
         run: |
-          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
+          git diff -U0 HEAD^ -- 'src' 'include' ':!include/libultraship/color.h' ':!include/libultraship/libultra/*' ':!src/libultraship/libultra/*' ':!src/fast/*' ':!include/fast/*' ':!src/ship/utils/AppleFolderManager.mm' | clang-tidy-diff -p1 -path build -export-fixes clang-tidy-result/fixes.yml
       - name: Save PR metadata
         run: |
           echo ${{ github.event.number }} > clang-tidy-result/pr-id.txt

include/fast/interpreter.h

@@ -11,7 +11,7 @@
 #include <string>
 
 #include "fast/lus_gbi.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 #include "fast/ucodehandlers.h"
 #include "backends/gfx_rendering_api.h"
 

include/fast/resource/type/Matrix.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "ship/resource/Resource.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 
 namespace Fast {
 class Matrix final : public Ship::Resource<Mtx> {

include/fast/types.h

@@ -0,0 +1,25 @@
+#pragma once
+
+typedef int Mtx_t[4][4];
+typedef union {
+    Mtx_t m;
+    struct {
+        unsigned short int intPart[4][4];
+        unsigned short int fracPart[4][4];
+    };
+    long long int forc_structure_alignment;
+} MtxS;
+
+typedef float MtxF_t[4][4];
+typedef union {
+    MtxF_t mf;
+    struct {
+        float xx, yx, zx, wx, xy, yy, zy, wy, xz, yz, zz, wz, xw, yw, zw, ww;
+    };
+} MtxF;
+
+#ifndef GBI_FLOATS
+typedef MtxS Mtx;
+#else
+typedef MtxF Mtx;
+#endif

include/libultraship/libultra/types.h

@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <fast/types.h>
 
 typedef signed char s8;
 typedef unsigned char u8;
@@ -30,27 +31,3 @@ typedef s32 ptrdiff_t;
 typedef s32 intptr_t;
 typedef u32 uintptr_t;
 #endif
-
-typedef int Mtx_t[4][4];
-typedef union {
-    Mtx_t m;
-    struct {
-        u16 intPart[4][4];
-        u16 fracPart[4][4];
-    };
-    long long int forc_structure_alignment;
-} MtxS;
-
-typedef float MtxF_t[4][4];
-typedef union {
-    MtxF_t mf;
-    struct {
-        float xx, yx, zx, wx, xy, yy, zy, wy, xz, yz, zz, wz, xw, yw, zw, ww;
-    };
-} MtxF;
-
-#ifndef GBI_FLOATS
-typedef MtxS Mtx;
-#else
-typedef MtxF Mtx;
-#endif

src/fast/backends/gfx_metal.cpp

@@ -38,7 +38,7 @@
 #include "ship/Context.h"
 #include "ship/config/ConsoleVariable.h"
 
-#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
+#define ARRAY_COUNT(arr) (int32_t)(sizeof(arr) / sizeof(arr[0]))
 
 // MARK: - Helpers
 namespace Fast {

src/fast/interpreter.cpp

@@ -21,7 +21,7 @@
 #define _LANGUAGE_C
 #endif
 #include "fast/debug/GfxDebugger.h"
-#include "libultraship/libultra/types.h"
+#include "fast/types.h"
 #include <string>
 
 #include "fast/interpreter.h"