Remove agl folder (#12)

.clang-format

@@ -32,12 +32,14 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ForEachMacros:   []
 IncludeCategories:
-  - Regex:           '^<[Ww]indows\.h>$'
-    Priority:        1
-  - Regex:           '^<'
+  - Regex:           '^<(nn|nvn|vapours)/'
     Priority:        2
-  - Regex:           '^"'
+  - Regex:           'sead.*\.h>$'
     Priority:        3
+  - Regex:           '^<'
+    Priority:        1
+  - Regex:           '^"'
+    Priority:        4
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false

CMakeLists.txt

@@ -1,81 +1,79 @@
 project(agl CXX ASM)
 
 add_library(agl OBJECT
-  include/agl/aglGPUCommon.hpp
+  include/common/aglDisplayList.h
+  include/common/aglDrawContext.h
+  include/common/aglGPUCommon.hpp
+  include/common/aglGPUMemAddr.h
+  include/common/aglGPUMemBlock.h
+  include/common/aglRenderBuffer.h
+  include/common/aglRenderTarget.h
+  include/common/aglShader.h
+  include/common/aglShaderCompileInfo.h
+  include/common/aglShaderProgram.h
+  include/common/aglShaderProgramArchive.h
+  include/common/aglTextureData.h
+  include/common/aglTextureDataSerializer.h
+  include/common/aglTextureEnum.h
 
-  include/agl/common/aglDisplayList.h
-  include/agl/common/aglDrawContext.h
-  include/agl/common/aglGPUMemAddr.h
-  include/agl/common/aglGPUMemBlock.h
-  include/agl/common/aglRenderBuffer.h
-  include/agl/common/aglRenderTarget.h
-  include/agl/common/aglShader.h
-  include/agl/common/aglShaderCompileInfo.h
-  include/agl/common/aglShaderProgram.h
-  include/agl/common/aglShaderProgramArchive.h
-  include/agl/common/aglTextureData.h
-  include/agl/common/aglTextureEnum.h
+  include/detail/aglFileIOMgr.h
+  include/detail/aglGPUMemBlockMgr.h
+  include/detail/aglMemoryPoolHeap.h
+  include/detail/aglPrivateResource.h
+  include/detail/aglSurface.h
 
-  include/agl/detail/aglFileIOMgr.h
-  include/agl/detail/aglGPUMemBlockMgr.h
-  include/agl/detail/aglMemoryPoolHeap.h
-  include/agl/detail/aglPrivateResource.h
-  include/agl/detail/aglSurface.h
+  include/driver/aglGraphicsDriverMgr.h
+  include/driver/aglNVNMgr.h
+  include/driver/aglNVNimage.h
+  include/driver/aglNVNsampler.h
+  include/driver/aglNVNtexture.h
 
-  include/agl/driver/aglGraphicsDriverMgr.h
-  include/agl/driver/aglNVNMgr.h
-  include/agl/driver/aglNVNimage.h
-  include/agl/driver/aglNVNsampler.h
-  include/agl/driver/aglNVNtexture.h
+  include/environment/aglEnvObj.h
+  include/environment/aglEnvObjBuffer.h
+  include/environment/aglEnvObjMgr.h
+  include/environment/aglEnvObjSetMgr.h
+  include/environment/aglFog.h
+  include/environment/aglLight.h
+  include/environment/aglProjector.h
 
-  include/agl/env/aglEnvObj.h
-  include/agl/env/aglEnvObjBuffer.h
-  include/agl/env/aglEnvObjMgr.h
-  include/agl/env/aglEnvObjSetMgr.h
-  include/agl/env/aglFog.h
-  include/agl/env/aglLight.h
-  include/agl/env/aglProjector.h
+  include/effect/aglFxOfxLensFlare.h
 
-  include/agl/fx/aglFxOfxLensFlare.h
+  include/g3d/aglNW4FToNN.h
 
-  include/agl/g3d/aglNW4FToNN.h
+  include/postfx/aglBloom.h
+  include/postfx/aglDepthOfField.h
 
-  include/agl/pfx/aglBloom.h
-  include/agl/pfx/aglDepthOfField.h
+  include/shader_text/aglShaderTextClause.h
+  include/shader_text/aglShaderTextDefineLinker.h
+  include/shader_text/aglShaderTextExpressionEvaluator.h
+  include/shader_text/aglShaderTextLexer.h
+  include/shader_text/aglShaderTextPreprocessor.h
+  include/shader_text/aglShaderTextSyntaxTree.h
 
-  include/agl/shader_text/aglShaderTextClause.h
-  include/agl/shader_text/aglShaderTextDefineLinker.h
-  include/agl/shader_text/aglShaderTextExpressionEvaluator.h
-  include/agl/shader_text/aglShaderTextLexer.h
-  include/agl/shader_text/aglShaderTextPreprocessor.h
-  include/agl/shader_text/aglShaderTextSyntaxTree.h
-
-  include/agl/texture/aglTextureDataSerializer.h
-
-  include/agl/utl/aglAtomicPtrArray.h
-  include/agl/utl/aglParameter.h
-  include/agl/utl/aglParameterCurve.hpp
-  include/agl/utl/aglParameterIO.h
-  include/agl/utl/aglParameterList.h
-  include/agl/utl/aglParameterObj.h
-  include/agl/utl/aglParameterStringMgr.h
-  include/agl/utl/aglResCommon.h
-  include/agl/utl/aglResParameter.h
-  include/agl/utl/aglScreenShotMgr.h
+  include/utility/aglAtomicPtrArray.h
+  include/utility/aglParameter.h
+  include/utility/aglParameterCurve.hpp
+  include/utility/aglParameterIO.h
+  include/utility/aglParameterList.h
+  include/utility/aglParameterObj.h
+  include/utility/aglParameterStringMgr.h
+  include/utility/aglResCommon.h
+  include/utility/aglResParameter.h
+  include/utility/aglScreenShotMgr.h
 
   src/detail/aglGPUMemBlockMgr.cpp
 
   src/driver/aglGraphicsDriverMgr.cpp
   src/driver/aglNVNMgr.cpp
 
-  src/utl/aglAtomicPtrArray.cpp
-  src/utl/aglParameter.cpp
-  src/utl/aglParameterIO.cpp
-  src/utl/aglParameterList.cpp
-  src/utl/aglParameterObj.cpp
-  src/utl/aglParameterStringMgr.cpp
-  src/utl/aglResCommon.cpp
-  src/utl/aglResParameter.cpp
+  src/utility/aglAtomicPtrArray.cpp
+  src/utility/aglParameter.cpp
+  src/utility/aglParameterIO.cpp
+  src/utility/aglParameterList.cpp
+  src/utility/aglParameterObj.cpp
+  src/utility/aglParameterStringMgr.cpp
+  src/utility/aglResCommon.cpp
+  src/utility/aglResParameter.cpp
 )
 
 target_compile_options(agl PRIVATE -fno-exceptions)

include/agl/common/aglDisplayList.h → include/common/aglDisplayList.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "aglGPUMemAddr.h"
+#include "common/aglGPUMemAddr.h"
 
 namespace sead {
 class Heap;

include/agl/common/aglDrawContext.h → include/common/aglDrawContext.h

@@ -2,8 +2,8 @@
 
 #include <basis/seadTypes.h>
 #include <gfx/seadDrawContext.h>
+#include <prim/seadRuntimeTypeInfo.h>
 #include <thread/seadCriticalSection.h>
-#include "prim/seadRuntimeTypeInfo.h"
 
 namespace agl {
 

include/agl/common/aglGPUMemAddr.h → include/common/aglGPUMemAddr.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "agl/detail/aglMemoryPoolHeap.h"
-#include "aglGPUMemBlock.h"
+#include "common/aglGPUMemBlock.h"
+#include "detail/aglMemoryPoolHeap.h"
 
 namespace sead {
 class Heap;

include/agl/common/aglGPUMemBlock.h → include/common/aglGPUMemBlock.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <nn/gfx/gfx_Types.h>
 #include <container/seadPtrArray.h>
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
 #include <math/seadMathCalcCommon.h>
-#include <nn/gfx/gfx_Types.h>
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadCriticalSection.h>
-#include "agl/aglGPUCommon.hpp"
+#include "common/aglGPUCommon.hpp"
 
 namespace agl {
 

include/agl/common/aglRenderTarget.h → include/common/aglRenderTarget.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aglTextureData.h"
+#include "common/aglTextureData.h"
 
 namespace agl {
 

include/agl/common/aglShaderCompileInfo.h → include/common/aglShaderCompileInfo.h

@@ -2,7 +2,7 @@
 
 #include <container/seadPtrArray.h>
 #include <hostio/seadHostIONode.h>
-#include "agl/common/aglShader.h"
+#include "common/aglShader.h"
 
 namespace sead {
 class Heap;

include/agl/common/aglShaderProgram.h → include/common/aglShaderProgram.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "agl/common/aglDisplayList.h"
-#include "agl/common/aglShader.h"
+#include "common/aglDisplayList.h"
+#include "common/aglShader.h"
 
 namespace sead {
 class Heap;

include/agl/common/aglTextureData.h → include/common/aglTextureData.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "agl/detail/aglSurface.h"
-#include "agl/driver/aglNVNtexture.h"
+#include "detail/aglSurface.h"
+#include "driver/aglNVNtexture.h"
 
 namespace agl {
 

include/agl/texture/aglTextureDataSerializer.h → include/common/aglTextureDataSerializer.h

@@ -10,4 +10,4 @@ class TextureDataSerializerTGA {
     };
 };
 
-}  // namespace agl
+}  // namespace agl

include/agl/detail/aglGPUMemBlockMgr.h → include/detail/aglGPUMemBlockMgr.h

@@ -1,14 +1,14 @@
 #pragma once
 
-#include <agl/aglGPUCommon.hpp>
+#include <nvn/nvn.h>
 #include <container/seadPtrArray.h>
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
 #include <math/seadMathCalcCommon.h>
-#include <nvn/nvn.h>
 #include <prim/seadBitFlag.h>
 #include <prim/seadTypedBitFlag.h>
 #include <thread/seadCriticalSection.h>
+#include "common/aglGPUCommon.hpp"
 
 namespace agl::detail {
 

include/agl/detail/aglPrivateResource.h → include/detail/aglPrivateResource.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <agl/common/aglGPUMemBlock.h>
 #include <basis/seadTypes.h>
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
 #include <prim/seadSafeString.h>
+#include "common/aglGPUMemBlock.h"
 
 namespace agl::detail {
 

include/agl/detail/aglSurface.h → include/detail/aglSurface.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#include <basis/seadTypes.h>
 #include <nvn/nvn.h>
-#include "agl/common/aglTextureEnum.h"
+#include <basis/seadTypes.h>
+#include "common/aglTextureEnum.h"
 
 namespace agl::detail {
 

include/agl/driver/aglNVNMgr.h → include/driver/aglNVNMgr.h

@@ -2,7 +2,7 @@
 
 #include <heap/seadDisposer.h>
 #include <hostio/seadHostIONode.h>
-#include "agl/driver/aglGraphicsDriverMgr.h"
+#include "driver/aglGraphicsDriverMgr.h"
 
 namespace agl::driver {
 

include/agl/driver/aglNVNsampler.h → include/driver/aglNVNsampler.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <basis/seadTypes.h>
 #include <nvn/nvn.h>
+#include <basis/seadTypes.h>
 
 namespace agl::driver {
 

include/agl/driver/aglNVNtexture.h → include/driver/aglNVNtexture.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <basis/seadTypes.h>
 #include <nvn/nvn.h>
+#include <basis/seadTypes.h>
 
 namespace agl::driver {
 

include/agl/fx/aglFxOfxLensFlare.h → include/effect/aglFxOfxLensFlare.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::fx {
 

include/agl/env/aglEnvObjBuffer.h → include/environment/aglEnvObjBuffer.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <container/seadSafeArray.h>
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::env {
 

include/agl/env/aglEnvObjMgr.h → include/environment/aglEnvObjMgr.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObjBuffer.h"
+#include "environment/aglEnvObjBuffer.h"
 
 namespace agl::env {
 

include/agl/env/aglFog.h → include/environment/aglFog.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::env {
 

include/agl/env/aglLight.h → include/environment/aglLight.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::env {
 

include/agl/env/aglProjector.h → include/environment/aglProjector.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::env {
 

include/agl/pfx/aglBloom.h → include/postfx/aglBloom.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::pfx {
 

include/agl/pfx/aglDepthOfField.h → include/postfx/aglDepthOfField.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "agl/env/aglEnvObj.h"
+#include "environment/aglEnvObj.h"
 
 namespace agl::pfx {