[Core/...] [GUI]: Add Nix and add a GUI

* [Render|Core]: Fix return, and add CMakePresets * [GUI]: Add ImGui, fix whitespace, and update some code * [GUI]: Add ImGui Docking * [Core]: Add a partial debugger, and ImGui test * [GUI]: Fix Linux complaining * [Config]: Allow nixpkgs to use older toml * [Config]: Change default paths if on Linux * [Config]: Adjust fonts dir Fix logic bug in checking userDir to account for Linux Change fonts structure to better facilitate Nix * [SFCX]: Fix error messages * [...]: Fix whitespace and code formatting * add nix support * [PPC] Fix missing semi-colon in FPU * [GUI] Default to not opening the debugger * [Linux\Nix]: Enable direnv * [Core] [Nix] Restructure folders and add Linux docs, Fix nix builds * [Config]: Fix first time init with append path * [SFCX] [Config] Fix debug prints, Fix path for nix * [Refactor] Fix non-UTF8 character --------- Co-authored-by: Michael Bishop <cleverca22@gmail.com>
xenon-emu · Mar 4, 2025 · 7b10ec3 · 7b10ec3
1 parent b398b83
commit 7b10ec3
Show file tree

Hide file tree

Showing 140 changed files with 3,744 additions and 2,612 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1,2 @@
+use flake
+watch_file flake.nix
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -101,3 +101,13 @@ jobs:
       with:
         name: Xenon-linux64
         path: ${{github.workspace}}/build/Xenon
+
+  linux_nix:
+    name: Linux (nix)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+      - name: Build Xenon
+        run: nix build .#xenon -L
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,7 @@
 	path = third_party/fmt
 	url = https://github.com/fmtlib/fmt.git
 	shallow = true
+[submodule "third_party/ImGui"]
+	path = third_party/ImGui
+	url = https://github.com/ocornut/imgui
+	branch = docking
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,9 +29,9 @@ function(create_target_directory_groups target_name)
     endforeach()
 endfunction()
 
-find_package(fmt 11.1.3 CONFIG)
+find_package(fmt 10.2.1 CONFIG)
 find_package(SDL3 3.2.4 CONFIG)
-find_package(toml11 4.3.0 CONFIG)
+find_package(toml11 3.7.1 CONFIG)
 
 add_subdirectory(third_party)
 
@@ -153,15 +153,39 @@ set(XCPU
     Xenon/Core/XCPU/PPU/PowerPC.h
 )
 
+set(IMGUI_DIR third_party/ImGui)
+set(IMGUI
+    ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_opengl3.h
+    ${IMGUI_DIR}/backends/imgui_impl_sdl3.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_sdl3.h
+    ${IMGUI_DIR}/imconfig.h
+    ${IMGUI_DIR}/imgui.cpp
+    ${IMGUI_DIR}/imgui.h
+    ${IMGUI_DIR}/imgui_demo.cpp
+    ${IMGUI_DIR}/imgui_internal.h
+    ${IMGUI_DIR}/imgui_draw.cpp
+    ${IMGUI_DIR}/imgui_tables.cpp
+    ${IMGUI_DIR}/imgui_widgets.cpp
+    ${IMGUI_DIR}/imstb_rectpack.h
+    ${IMGUI_DIR}/imstb_textedit.h
+    ${IMGUI_DIR}/imstb_truetype.h
+)
+
 set(OPENGL
     third_party/glad/src/glad.c
 )
 
 set(RENDER
     ${OPENGL}
+    ${IMGUI}
     Xenon/Render/Abstractions/Texture.h
     Xenon/Render/Implementations/OGLTexture.cpp
-    Xenon/Render/Implementations/OGLTexture.h
+    Xenon/Render/Implementations/OGLTexture.h 
+    Xenon/Render/GUI/Implementations/OpenGL.cpp
+    Xenon/Render/GUI/Implementations/OpenGL.h
+    Xenon/Render/GUI/GUI.cpp
+    Xenon/Render/GUI/GUI.h
     Xenon/Render/Renderer.cpp
     Xenon/Render/Renderer.h
 )
@@ -204,7 +228,7 @@ endif()
 # Include OPENGL Directory
 include_directories(Xenon third_party/glad/include)
 
-target_include_directories(Xenon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(Xenon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${IMGUI_DIR})
 target_link_libraries(Xenon PRIVATE fmt::fmt SDL3::SDL3 toml11::toml11)
 
 add_definitions(-DNTDDI_VERSION=0x0A000006 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00)
@@ -218,4 +242,4 @@ endif()
 
 if (WIN32)
     target_sources(Xenon PRIVATE Xenon/Xenon.rc)
-endif()
+endif()
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -0,0 +1,81 @@
+{
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "windows-base",
+            "hidden": true,
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "installDir": "${sourceDir}/install/${presetName}",
+            "cacheVariables": {
+                "CMAKE_C_COMPILER": "cl.exe",
+                "CMAKE_CXX_COMPILER": "cl.exe"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
+        },
+        {
+            "name": "x64-debug",
+            "displayName": "x64 Debug",
+            "inherits": "windows-base",
+            "architecture": {
+                "value": "x64",
+                "strategy": "external"
+            },
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "x64-release",
+            "displayName": "x64 Release",
+            "inherits": "x64-debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "x86-debug",
+            "displayName": "x86 Debug",
+            "inherits": "windows-base",
+            "architecture": {
+                "value": "x86",
+                "strategy": "external"
+            },
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            }
+        },
+        {
+            "name": "x86-release",
+            "displayName": "x86 Release",
+            "inherits": "x86-debug",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release"
+            }
+        },
+        {
+            "name": "linux-debug",
+            "displayName": "Linux Debug",
+            "generator": "Ninja",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "installDir": "${sourceDir}/install/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            },
+            "vendor": {
+                "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
+                    "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
+                }
+            }
+        }
+    ]
+}
diff --git a/Deps/Building/building-linux-nix.md b/Deps/Building/building-linux-nix.md
@@ -0,0 +1,2 @@
+# Compiling Xenon with Nix
+TODO
diff --git a/Deps/Building/building-linux-ubuntu.md b/Deps/Building/building-linux-ubuntu.md
@@ -0,0 +1,2 @@
+# Compiling Xenon with Ubuntu
+TODO
diff --git a/Deps/Building/building-linux.md b/Deps/Building/building-linux.md
@@ -0,0 +1,4 @@
+# Building Xenon for Linux
+### Currently, we only offically support 2 ways to do it.
+## [**Nix**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux-nix.md)
+## [**Ubuntu**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux-ubuntu.md)
diff --git a/Docs/Building/building-windows.md → Deps/Building/building-windows.md b/Docs/Building/building-windows.md → Deps/Building/building-windows.md
@@ -1,4 +1,4 @@
-# Compile Xenon with Visual Studio 2022
+# Compiling Xenon with Visual Studio 2022
 
 ### (Prerequisite) Download [**Git for Windows**](https://git-scm.com/download/win)
 

diff --git a/Docs/CBEA_v1.01_3Oct2006.pdf → Deps/Docs/CBEA_v1.01_3Oct2006.pdf b/Docs/CBEA_v1.01_3Oct2006.pdf → Deps/Docs/CBEA_v1.01_3Oct2006.pdf
diff --git a/Docs/CBE_Public_Registers.v1_5.02APR2007.pdf → ...s/CBE_Public_Registers.v1_5.02APR2007.pdf b/Docs/CBE_Public_Registers.v1_5.02APR2007.pdf → ...s/CBE_Public_Registers.v1_5.02APR2007.pdf
diff --git a/Docs/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf → ...s/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf b/Docs/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf → ...s/IBM_CBE_Handbook_v1.1_24APR2007_pub.pdf
diff --git a/Docs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf → ...cs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf b/Docs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf → ...cs/IBM_CellBE_HIG_65nm_v1.01_8Jun2007.pdf
diff --git a/Docs/Language_Extensions_for_CBEA_2.4.pdf → ...Docs/Language_Extensions_for_CBEA_2.4.pdf b/Docs/Language_Extensions_for_CBEA_2.4.pdf → ...Docs/Language_Extensions_for_CBEA_2.4.pdf
diff --git a/Docs/PPC_Vers202_Book1_public.pdf → Deps/Docs/PPC_Vers202_Book1_public.pdf b/Docs/PPC_Vers202_Book1_public.pdf → Deps/Docs/PPC_Vers202_Book1_public.pdf
diff --git a/Docs/PPC_Vers202_Book2_public.pdf → Deps/Docs/PPC_Vers202_Book2_public.pdf b/Docs/PPC_Vers202_Book2_public.pdf → Deps/Docs/PPC_Vers202_Book2_public.pdf
diff --git a/Docs/PPC_Vers202_Book3_public.pdf → Deps/Docs/PPC_Vers202_Book3_public.pdf b/Docs/PPC_Vers202_Book3_public.pdf → Deps/Docs/PPC_Vers202_Book3_public.pdf
diff --git a/Docs/Xbox 360 Overview.pdf → Deps/Docs/Xbox 360 Overview.pdf b/Docs/Xbox 360 Overview.pdf → Deps/Docs/Xbox 360 Overview.pdf
diff --git a/Docs/screenshots/1BL_Boot.png → Deps/Screenshots/1BL_Boot.png b/Docs/screenshots/1BL_Boot.png → Deps/Screenshots/1BL_Boot.png
diff --git a/Docs/screenshots/WinDBG.png → Deps/Screenshots/WinDBG.png b/Docs/screenshots/WinDBG.png → Deps/Screenshots/WinDBG.png
diff --git a/Docs/screenshots/Xell_Reloaded.png → Deps/Screenshots/Xell_Reloaded.png b/Docs/screenshots/Xell_Reloaded.png → Deps/Screenshots/Xell_Reloaded.png
diff --git a/Deps/fonts/Roboto-Black.ttf b/Deps/fonts/Roboto-Black.ttf
diff --git a/Deps/fonts/Roboto-BlackItalic.ttf b/Deps/fonts/Roboto-BlackItalic.ttf
diff --git a/Deps/fonts/Roboto-Bold.ttf b/Deps/fonts/Roboto-Bold.ttf
diff --git a/Deps/fonts/Roboto-BoldItalic.ttf b/Deps/fonts/Roboto-BoldItalic.ttf
diff --git a/Deps/fonts/Roboto-ExtraBold.ttf b/Deps/fonts/Roboto-ExtraBold.ttf
diff --git a/Deps/fonts/Roboto-ExtraBoldItalic.ttf b/Deps/fonts/Roboto-ExtraBoldItalic.ttf
diff --git a/Deps/fonts/Roboto-ExtraLight.ttf b/Deps/fonts/Roboto-ExtraLight.ttf
diff --git a/Deps/fonts/Roboto-ExtraLightItalic.ttf b/Deps/fonts/Roboto-ExtraLightItalic.ttf
diff --git a/Deps/fonts/Roboto-Italic.ttf b/Deps/fonts/Roboto-Italic.ttf
diff --git a/Deps/fonts/Roboto-Light.ttf b/Deps/fonts/Roboto-Light.ttf
diff --git a/Deps/fonts/Roboto-LightItalic.ttf b/Deps/fonts/Roboto-LightItalic.ttf
diff --git a/Deps/fonts/Roboto-Medium.ttf b/Deps/fonts/Roboto-Medium.ttf
diff --git a/Deps/fonts/Roboto-MediumItalic.ttf b/Deps/fonts/Roboto-MediumItalic.ttf
diff --git a/Deps/fonts/Roboto-Regular.ttf b/Deps/fonts/Roboto-Regular.ttf
diff --git a/Deps/fonts/Roboto-SemiBold.ttf b/Deps/fonts/Roboto-SemiBold.ttf
diff --git a/Deps/fonts/Roboto-SemiBoldItalic.ttf b/Deps/fonts/Roboto-SemiBoldItalic.ttf
diff --git a/Deps/fonts/Roboto-Thin.ttf b/Deps/fonts/Roboto-Thin.ttf
diff --git a/Deps/fonts/Roboto-ThinItalic.ttf b/Deps/fonts/Roboto-ThinItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Black.ttf b/Deps/fonts/Roboto_Condensed-Black.ttf
diff --git a/Deps/fonts/Roboto_Condensed-BlackItalic.ttf b/Deps/fonts/Roboto_Condensed-BlackItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Bold.ttf b/Deps/fonts/Roboto_Condensed-Bold.ttf
diff --git a/Deps/fonts/Roboto_Condensed-BoldItalic.ttf b/Deps/fonts/Roboto_Condensed-BoldItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-ExtraBold.ttf b/Deps/fonts/Roboto_Condensed-ExtraBold.ttf
diff --git a/Deps/fonts/Roboto_Condensed-ExtraBoldItalic.ttf b/Deps/fonts/Roboto_Condensed-ExtraBoldItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-ExtraLight.ttf b/Deps/fonts/Roboto_Condensed-ExtraLight.ttf
diff --git a/Deps/fonts/Roboto_Condensed-ExtraLightItalic.ttf b/Deps/fonts/Roboto_Condensed-ExtraLightItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Italic.ttf b/Deps/fonts/Roboto_Condensed-Italic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Light.ttf b/Deps/fonts/Roboto_Condensed-Light.ttf
diff --git a/Deps/fonts/Roboto_Condensed-LightItalic.ttf b/Deps/fonts/Roboto_Condensed-LightItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Medium.ttf b/Deps/fonts/Roboto_Condensed-Medium.ttf
diff --git a/Deps/fonts/Roboto_Condensed-MediumItalic.ttf b/Deps/fonts/Roboto_Condensed-MediumItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Regular.ttf b/Deps/fonts/Roboto_Condensed-Regular.ttf
diff --git a/Deps/fonts/Roboto_Condensed-SemiBold.ttf b/Deps/fonts/Roboto_Condensed-SemiBold.ttf
diff --git a/Deps/fonts/Roboto_Condensed-SemiBoldItalic.ttf b/Deps/fonts/Roboto_Condensed-SemiBoldItalic.ttf
diff --git a/Deps/fonts/Roboto_Condensed-Thin.ttf b/Deps/fonts/Roboto_Condensed-Thin.ttf
diff --git a/Deps/fonts/Roboto_Condensed-ThinItalic.ttf b/Deps/fonts/Roboto_Condensed-ThinItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Black.ttf b/Deps/fonts/Roboto_SemiCondensed-Black.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-BlackItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-BlackItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Bold.ttf b/Deps/fonts/Roboto_SemiCondensed-Bold.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-BoldItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-BoldItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-ExtraBold.ttf b/Deps/fonts/Roboto_SemiCondensed-ExtraBold.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-ExtraBoldItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-ExtraBoldItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-ExtraLight.ttf b/Deps/fonts/Roboto_SemiCondensed-ExtraLight.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-ExtraLightItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-ExtraLightItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Italic.ttf b/Deps/fonts/Roboto_SemiCondensed-Italic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Light.ttf b/Deps/fonts/Roboto_SemiCondensed-Light.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-LightItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-LightItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Medium.ttf b/Deps/fonts/Roboto_SemiCondensed-Medium.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-MediumItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-MediumItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Regular.ttf b/Deps/fonts/Roboto_SemiCondensed-Regular.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-SemiBold.ttf b/Deps/fonts/Roboto_SemiCondensed-SemiBold.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-SemiBoldItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-SemiBoldItalic.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-Thin.ttf b/Deps/fonts/Roboto_SemiCondensed-Thin.ttf
diff --git a/Deps/fonts/Roboto_SemiCondensed-ThinItalic.ttf b/Deps/fonts/Roboto_SemiCondensed-ThinItalic.ttf
diff --git a/README.md b/README.md
@@ -17,8 +17,8 @@
 
 <p align="center">
   <a href="https://discord.gg/TDvbdXRRQ6">
-  <img src="https://github.com/xenon-emu/Xenon/blob/main/Docs/screenshots/Xell_Reloaded.png" width="450">
-  <img src="https://github.com/xenon-emu/Xenon/blob/main/Docs/screenshots/WinDBG.png" width="510">
+  <img src="https://github.com/xenon-emu/Xenon/blob/main/Deps/Screenshots/Xell_Reloaded.png" width="450">
+  <img src="https://github.com/xenon-emu/Xenon/blob/main/Deps/Screenshots/WinDBG.png" width="510">
 </p>
 
 # Xenon
@@ -40,7 +40,9 @@ We need talented developers more than ever to contribute to the project and move
 </a>
 
 # Building
-Check the build instructions for [**Windows**](https://github.com/xenon-emu/Xenon/blob/main/Docs/Building/building-windows.md).
+#### [**Windows**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-windows.md)
+####
+#### [**Linux**](https://github.com/xenon-emu/Xenon/blob/main/Deps/Building/building-linux.md)
 
 # License
 - [**GPL-2.0 license**](https://github.com/xenon-emu/Xenon/blob/main/LICENSE)
diff --git a/Xenon/.vscode/settings.json b/Xenon/.vscode/settings.json
@@ -0,0 +1,77 @@
+{
+    "files.associations": {
+        "xtr1common": "cpp",
+        "xstring": "cpp",
+        "algorithm": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "filesystem": "cpp",
+        "format": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "iterator": "cpp",
+        "limits": "cpp",
+        "list": "cpp",
+        "locale": "cpp",
+        "map": "cpp",
+        "memory": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "queue": "cpp",
+        "ratio": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "string": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "typeinfo": "cpp",
+        "unordered_map": "cpp",
+        "utility": "cpp",
+        "vector": "cpp",
+        "xfacet": "cpp",
+        "xhash": "cpp",
+        "xiosbase": "cpp",
+        "xlocale": "cpp",
+        "xlocbuf": "cpp",
+        "xlocinfo": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "xmemory": "cpp",
+        "xstddef": "cpp",
+        "xtree": "cpp",
+        "xutility": "cpp"
+    }
+}
diff --git a/Xenon/Base/Alignment.h b/Xenon/Base/Alignment.h
@@ -6,40 +6,40 @@ namespace Base {
 
 template <typename T>
 [[nodiscard]] constexpr T AlignUp(T value, size_t size) {
-    static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
-    auto mod{static_cast<T>(value % size)};
-    value -= mod;
-    return static_cast<T>(mod == T{0} ? value : value + size);
+  static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
+  auto mod{static_cast<T>(value % size)};
+  value -= mod;
+  return static_cast<T>(mod == T{0} ? value : value + size);
 }
 
 template <typename T>
 [[nodiscard]] constexpr T AlignDown(T value, size_t size) {
-    static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
-    return static_cast<T>(value - value % size);
+  static_assert(std::is_unsigned_v<T>, "T must be an unsigned value.");
+  return static_cast<T>(value - value % size);
 }
 
 template <typename T>
-    requires std::is_integral_v<T>
+  requires std::is_integral_v<T>
 [[nodiscard]] constexpr bool IsAligned(T value, size_t alignment) {
-    return (value & (alignment - 1)) == 0;
+  return (value & (alignment - 1)) == 0;
 }
 
 template <typename T>
-    requires std::is_integral_v<T>
+  requires std::is_integral_v<T>
 [[nodiscard]] constexpr bool Is16KBAligned(T value) {
-    return (value & 0x3FFF) == 0;
+  return (value & 0x3FFF) == 0;
 }
 
 template <typename T>
-    requires std::is_integral_v<T>
+  requires std::is_integral_v<T>
 [[nodiscard]] constexpr bool Is64KBAligned(T value) {
-    return (value & 0xFFFF) == 0;
+  return (value & 0xFFFF) == 0;
 }
 
 template <typename T>
-    requires std::is_integral_v<T>
+  requires std::is_integral_v<T>
 [[nodiscard]] constexpr bool Is2MBAligned(T value) {
-    return (value & 0x1FFFFF) == 0;
+  return (value & 0x1FFFFF) == 0;
 }
 
 } // namespace Base
diff --git a/Xenon/Base/Assert.cpp b/Xenon/Base/Assert.cpp
@@ -18,19 +18,19 @@
 #endif // _MSVC_VER
 
 void assert_fail_impl() {
-    Base::Log::Stop();
-    std::fflush(stdout);
-    Crash();
+  Base::Log::Stop();
+  std::fflush(stdout);
+  Crash();
 }
 
 [[noreturn]] void unreachable_impl() {
-    Base::Log::Stop();
-    std::fflush(stdout);
-    Crash();
-    throw std::runtime_error("Unreachable code");
+  Base::Log::Stop();
+  std::fflush(stdout);
+  Crash();
+  throw std::runtime_error("Unreachable code");
 }
 
 void assert_fail_debug_msg(const std::string& msg) {
-    LOG_CRITICAL(Debug, "Assertion Failed!\n{}", msg.data());
-    assert_fail_impl();
+  LOG_CRITICAL(Debug, "Assertion Failed!\n{}", msg.data());
+  assert_fail_impl();
 }