diff --git a/.clang-format b/.clang-format index ef86260..8f6934a 100644 --- a/.clang-format +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index ecb84b1..fb94baf 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/include/agl/common/aglDisplayList.h b/include/common/aglDisplayList.h similarity index 97% rename from include/agl/common/aglDisplayList.h rename to include/common/aglDisplayList.h index e0b3ea8..9e434fa 100644 --- a/include/agl/common/aglDisplayList.h +++ b/include/common/aglDisplayList.h @@ -1,7 +1,7 @@ #pragma once #include -#include "aglGPUMemAddr.h" +#include "common/aglGPUMemAddr.h" namespace sead { class Heap; diff --git a/include/agl/common/aglDrawContext.h b/include/common/aglDrawContext.h similarity index 96% rename from include/agl/common/aglDrawContext.h rename to include/common/aglDrawContext.h index d1ebff8..a13b23e 100644 --- a/include/agl/common/aglDrawContext.h +++ b/include/common/aglDrawContext.h @@ -2,8 +2,8 @@ #include #include +#include #include -#include "prim/seadRuntimeTypeInfo.h" namespace agl { diff --git a/include/agl/aglGPUCommon.hpp b/include/common/aglGPUCommon.hpp similarity index 100% rename from include/agl/aglGPUCommon.hpp rename to include/common/aglGPUCommon.hpp diff --git a/include/agl/common/aglGPUMemAddr.h b/include/common/aglGPUMemAddr.h similarity index 89% rename from include/agl/common/aglGPUMemAddr.h rename to include/common/aglGPUMemAddr.h index c05c0a2..0eed3e5 100644 --- a/include/agl/common/aglGPUMemAddr.h +++ b/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; diff --git a/include/agl/common/aglGPUMemBlock.h b/include/common/aglGPUMemBlock.h similarity index 97% rename from include/agl/common/aglGPUMemBlock.h rename to include/common/aglGPUMemBlock.h index b3998c1..2f9caac 100644 --- a/include/agl/common/aglGPUMemBlock.h +++ b/include/common/aglGPUMemBlock.h @@ -1,13 +1,13 @@ #pragma once +#include #include #include #include #include -#include #include #include -#include "agl/aglGPUCommon.hpp" +#include "common/aglGPUCommon.hpp" namespace agl { diff --git a/include/agl/common/aglRenderBuffer.h b/include/common/aglRenderBuffer.h similarity index 100% rename from include/agl/common/aglRenderBuffer.h rename to include/common/aglRenderBuffer.h diff --git a/include/agl/common/aglRenderTarget.h b/include/common/aglRenderTarget.h similarity index 95% rename from include/agl/common/aglRenderTarget.h rename to include/common/aglRenderTarget.h index ee3c989..22b0a53 100644 --- a/include/agl/common/aglRenderTarget.h +++ b/include/common/aglRenderTarget.h @@ -1,6 +1,6 @@ #pragma once -#include "aglTextureData.h" +#include "common/aglTextureData.h" namespace agl { diff --git a/include/agl/common/aglShader.h b/include/common/aglShader.h similarity index 100% rename from include/agl/common/aglShader.h rename to include/common/aglShader.h diff --git a/include/agl/common/aglShaderCompileInfo.h b/include/common/aglShaderCompileInfo.h similarity index 96% rename from include/agl/common/aglShaderCompileInfo.h rename to include/common/aglShaderCompileInfo.h index f88ec98..b815c2f 100644 --- a/include/agl/common/aglShaderCompileInfo.h +++ b/include/common/aglShaderCompileInfo.h @@ -2,7 +2,7 @@ #include #include -#include "agl/common/aglShader.h" +#include "common/aglShader.h" namespace sead { class Heap; diff --git a/include/agl/common/aglShaderProgram.h b/include/common/aglShaderProgram.h similarity index 95% rename from include/agl/common/aglShaderProgram.h rename to include/common/aglShaderProgram.h index 4d65c79..c56e527 100644 --- a/include/agl/common/aglShaderProgram.h +++ b/include/common/aglShaderProgram.h @@ -1,8 +1,8 @@ #pragma once #include -#include "agl/common/aglDisplayList.h" -#include "agl/common/aglShader.h" +#include "common/aglDisplayList.h" +#include "common/aglShader.h" namespace sead { class Heap; diff --git a/include/agl/common/aglShaderProgramArchive.h b/include/common/aglShaderProgramArchive.h similarity index 100% rename from include/agl/common/aglShaderProgramArchive.h rename to include/common/aglShaderProgramArchive.h diff --git a/include/agl/common/aglTextureData.h b/include/common/aglTextureData.h similarity index 94% rename from include/agl/common/aglTextureData.h rename to include/common/aglTextureData.h index c8e3a18..eefe5de 100644 --- a/include/agl/common/aglTextureData.h +++ b/include/common/aglTextureData.h @@ -1,8 +1,8 @@ #pragma once #include -#include "agl/detail/aglSurface.h" -#include "agl/driver/aglNVNtexture.h" +#include "detail/aglSurface.h" +#include "driver/aglNVNtexture.h" namespace agl { diff --git a/include/agl/texture/aglTextureDataSerializer.h b/include/common/aglTextureDataSerializer.h similarity index 87% rename from include/agl/texture/aglTextureDataSerializer.h rename to include/common/aglTextureDataSerializer.h index 1c741fe..214d934 100644 --- a/include/agl/texture/aglTextureDataSerializer.h +++ b/include/common/aglTextureDataSerializer.h @@ -10,4 +10,4 @@ class TextureDataSerializerTGA { }; }; -} // namespace agl \ No newline at end of file +} // namespace agl diff --git a/include/agl/common/aglTextureEnum.h b/include/common/aglTextureEnum.h similarity index 100% rename from include/agl/common/aglTextureEnum.h rename to include/common/aglTextureEnum.h diff --git a/include/agl/detail/aglFileIOMgr.h b/include/detail/aglFileIOMgr.h similarity index 100% rename from include/agl/detail/aglFileIOMgr.h rename to include/detail/aglFileIOMgr.h diff --git a/include/agl/detail/aglGPUMemBlockMgr.h b/include/detail/aglGPUMemBlockMgr.h similarity index 98% rename from include/agl/detail/aglGPUMemBlockMgr.h rename to include/detail/aglGPUMemBlockMgr.h index febf0db..071fc65 100644 --- a/include/agl/detail/aglGPUMemBlockMgr.h +++ b/include/detail/aglGPUMemBlockMgr.h @@ -1,14 +1,14 @@ #pragma once -#include +#include #include #include #include #include -#include #include #include #include +#include "common/aglGPUCommon.hpp" namespace agl::detail { diff --git a/include/agl/detail/aglMemoryPoolHeap.h b/include/detail/aglMemoryPoolHeap.h similarity index 100% rename from include/agl/detail/aglMemoryPoolHeap.h rename to include/detail/aglMemoryPoolHeap.h diff --git a/include/agl/detail/aglPrivateResource.h b/include/detail/aglPrivateResource.h similarity index 95% rename from include/agl/detail/aglPrivateResource.h rename to include/detail/aglPrivateResource.h index e2276bb..92ea172 100644 --- a/include/agl/detail/aglPrivateResource.h +++ b/include/detail/aglPrivateResource.h @@ -1,10 +1,10 @@ #pragma once -#include #include #include #include #include +#include "common/aglGPUMemBlock.h" namespace agl::detail { diff --git a/include/agl/detail/aglSurface.h b/include/detail/aglSurface.h similarity index 95% rename from include/agl/detail/aglSurface.h rename to include/detail/aglSurface.h index 175e664..d120a00 100644 --- a/include/agl/detail/aglSurface.h +++ b/include/detail/aglSurface.h @@ -1,8 +1,8 @@ #pragma once -#include #include -#include "agl/common/aglTextureEnum.h" +#include +#include "common/aglTextureEnum.h" namespace agl::detail { diff --git a/include/agl/driver/aglGraphicsDriverMgr.h b/include/driver/aglGraphicsDriverMgr.h similarity index 100% rename from include/agl/driver/aglGraphicsDriverMgr.h rename to include/driver/aglGraphicsDriverMgr.h diff --git a/include/agl/driver/aglNVNMgr.h b/include/driver/aglNVNMgr.h similarity index 90% rename from include/agl/driver/aglNVNMgr.h rename to include/driver/aglNVNMgr.h index 2639af1..7e2a80a 100644 --- a/include/agl/driver/aglNVNMgr.h +++ b/include/driver/aglNVNMgr.h @@ -2,7 +2,7 @@ #include #include -#include "agl/driver/aglGraphicsDriverMgr.h" +#include "driver/aglGraphicsDriverMgr.h" namespace agl::driver { diff --git a/include/agl/driver/aglNVNimage.h b/include/driver/aglNVNimage.h similarity index 100% rename from include/agl/driver/aglNVNimage.h rename to include/driver/aglNVNimage.h diff --git a/include/agl/driver/aglNVNsampler.h b/include/driver/aglNVNsampler.h similarity index 100% rename from include/agl/driver/aglNVNsampler.h rename to include/driver/aglNVNsampler.h index c78c045..5b558c1 100644 --- a/include/agl/driver/aglNVNsampler.h +++ b/include/driver/aglNVNsampler.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace agl::driver { diff --git a/include/agl/driver/aglNVNtexture.h b/include/driver/aglNVNtexture.h similarity index 100% rename from include/agl/driver/aglNVNtexture.h rename to include/driver/aglNVNtexture.h index e647f43..6f75eb0 100644 --- a/include/agl/driver/aglNVNtexture.h +++ b/include/driver/aglNVNtexture.h @@ -1,7 +1,7 @@ #pragma once -#include #include +#include namespace agl::driver { diff --git a/include/agl/fx/aglFxOfxLensFlare.h b/include/effect/aglFxOfxLensFlare.h similarity index 92% rename from include/agl/fx/aglFxOfxLensFlare.h rename to include/effect/aglFxOfxLensFlare.h index 8545542..d12d463 100644 --- a/include/agl/fx/aglFxOfxLensFlare.h +++ b/include/effect/aglFxOfxLensFlare.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::fx { diff --git a/include/agl/env/aglEnvObj.h b/include/environment/aglEnvObj.h similarity index 100% rename from include/agl/env/aglEnvObj.h rename to include/environment/aglEnvObj.h diff --git a/include/agl/env/aglEnvObjBuffer.h b/include/environment/aglEnvObjBuffer.h similarity index 94% rename from include/agl/env/aglEnvObjBuffer.h rename to include/environment/aglEnvObjBuffer.h index 3657771..825e575 100644 --- a/include/agl/env/aglEnvObjBuffer.h +++ b/include/environment/aglEnvObjBuffer.h @@ -1,7 +1,7 @@ #pragma once #include -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::env { diff --git a/include/agl/env/aglEnvObjMgr.h b/include/environment/aglEnvObjMgr.h similarity index 86% rename from include/agl/env/aglEnvObjMgr.h rename to include/environment/aglEnvObjMgr.h index df75238..e7b4b1c 100644 --- a/include/agl/env/aglEnvObjMgr.h +++ b/include/environment/aglEnvObjMgr.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObjBuffer.h" +#include "environment/aglEnvObjBuffer.h" namespace agl::env { diff --git a/include/agl/env/aglEnvObjSetMgr.h b/include/environment/aglEnvObjSetMgr.h similarity index 100% rename from include/agl/env/aglEnvObjSetMgr.h rename to include/environment/aglEnvObjSetMgr.h diff --git a/include/agl/env/aglFog.h b/include/environment/aglFog.h similarity index 80% rename from include/agl/env/aglFog.h rename to include/environment/aglFog.h index adc5b6a..cfe1608 100644 --- a/include/agl/env/aglFog.h +++ b/include/environment/aglFog.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::env { diff --git a/include/agl/env/aglLight.h b/include/environment/aglLight.h similarity index 91% rename from include/agl/env/aglLight.h rename to include/environment/aglLight.h index 9c7d63f..20555c1 100644 --- a/include/agl/env/aglLight.h +++ b/include/environment/aglLight.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::env { diff --git a/include/agl/env/aglProjector.h b/include/environment/aglProjector.h similarity index 81% rename from include/agl/env/aglProjector.h rename to include/environment/aglProjector.h index ea1f90a..e16f732 100644 --- a/include/agl/env/aglProjector.h +++ b/include/environment/aglProjector.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::env { diff --git a/include/agl/g3d/aglNW4FToNN.h b/include/g3d/aglNW4FToNN.h similarity index 100% rename from include/agl/g3d/aglNW4FToNN.h rename to include/g3d/aglNW4FToNN.h diff --git a/include/agl/pfx/aglBloom.h b/include/postfx/aglBloom.h similarity index 82% rename from include/agl/pfx/aglBloom.h rename to include/postfx/aglBloom.h index 86a32b1..f34dc14 100644 --- a/include/agl/pfx/aglBloom.h +++ b/include/postfx/aglBloom.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::pfx { diff --git a/include/agl/pfx/aglDepthOfField.h b/include/postfx/aglDepthOfField.h similarity index 82% rename from include/agl/pfx/aglDepthOfField.h rename to include/postfx/aglDepthOfField.h index de4db57..206239b 100644 --- a/include/agl/pfx/aglDepthOfField.h +++ b/include/postfx/aglDepthOfField.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/env/aglEnvObj.h" +#include "environment/aglEnvObj.h" namespace agl::pfx { diff --git a/include/agl/shader_text/aglShaderTextClause.h b/include/shader_text/aglShaderTextClause.h similarity index 100% rename from include/agl/shader_text/aglShaderTextClause.h rename to include/shader_text/aglShaderTextClause.h diff --git a/include/agl/shader_text/aglShaderTextDefineLinker.h b/include/shader_text/aglShaderTextDefineLinker.h similarity index 100% rename from include/agl/shader_text/aglShaderTextDefineLinker.h rename to include/shader_text/aglShaderTextDefineLinker.h diff --git a/include/agl/shader_text/aglShaderTextExpressionEvaluator.h b/include/shader_text/aglShaderTextExpressionEvaluator.h similarity index 100% rename from include/agl/shader_text/aglShaderTextExpressionEvaluator.h rename to include/shader_text/aglShaderTextExpressionEvaluator.h diff --git a/include/agl/shader_text/aglShaderTextLexer.h b/include/shader_text/aglShaderTextLexer.h similarity index 100% rename from include/agl/shader_text/aglShaderTextLexer.h rename to include/shader_text/aglShaderTextLexer.h diff --git a/include/agl/shader_text/aglShaderTextPreprocessor.h b/include/shader_text/aglShaderTextPreprocessor.h similarity index 100% rename from include/agl/shader_text/aglShaderTextPreprocessor.h rename to include/shader_text/aglShaderTextPreprocessor.h diff --git a/include/agl/shader_text/aglShaderTextSyntaxTree.h b/include/shader_text/aglShaderTextSyntaxTree.h similarity index 100% rename from include/agl/shader_text/aglShaderTextSyntaxTree.h rename to include/shader_text/aglShaderTextSyntaxTree.h diff --git a/include/agl/utl/aglAtomicPtrArray.h b/include/utility/aglAtomicPtrArray.h similarity index 100% rename from include/agl/utl/aglAtomicPtrArray.h rename to include/utility/aglAtomicPtrArray.h diff --git a/include/agl/utl/aglParameter.h b/include/utility/aglParameter.h similarity index 99% rename from include/agl/utl/aglParameter.h rename to include/utility/aglParameter.h index 4f85bdd..a97e14f 100644 --- a/include/agl/utl/aglParameter.h +++ b/include/utility/aglParameter.h @@ -1,6 +1,7 @@ #pragma once #include +#include #include #include #include @@ -9,8 +10,7 @@ #include #include #include -#include -#include "agl/utl/aglResParameter.h" +#include "utility/aglResParameter.h" namespace sead { class Heap; @@ -435,5 +435,5 @@ inline ResParameterList getResParameterList(const agl::utl::ResParameterList& li } // namespace agl::utl #define AGL_UTILS_PARAMETER_H_ -#include "agl/utl/aglParameterCurve.hpp" +#include "utility/aglParameterCurve.hpp" #undef AGL_UTILS_PARAMETER_H_ diff --git a/include/agl/utl/aglParameterCurve.hpp b/include/utility/aglParameterCurve.hpp similarity index 98% rename from include/agl/utl/aglParameterCurve.hpp rename to include/utility/aglParameterCurve.hpp index 597c55c..de23a22 100644 --- a/include/agl/utl/aglParameterCurve.hpp +++ b/include/utility/aglParameterCurve.hpp @@ -1,7 +1,7 @@ #pragma once #ifndef AGL_UTILS_PARAMETER_H_ -#include "agl/utl/aglParameter.h" +#include "utility/aglParameter.h" #endif namespace agl::utl { diff --git a/include/agl/utl/aglParameterIO.h b/include/utility/aglParameterIO.h similarity index 97% rename from include/agl/utl/aglParameterIO.h rename to include/utility/aglParameterIO.h index 97b4d6f..196874c 100644 --- a/include/agl/utl/aglParameterIO.h +++ b/include/utility/aglParameterIO.h @@ -1,6 +1,6 @@ #pragma once -#include "agl/utl/aglParameterList.h" +#include "utility/aglParameterList.h" namespace sead { class XmlDocument; diff --git a/include/agl/utl/aglParameterList.h b/include/utility/aglParameterList.h similarity index 99% rename from include/agl/utl/aglParameterList.h rename to include/utility/aglParameterList.h index 704e3c4..edd3b8f 100644 --- a/include/agl/utl/aglParameterList.h +++ b/include/utility/aglParameterList.h @@ -2,7 +2,7 @@ #include #include -#include "agl/utl/aglResParameter.h" +#include "utility/aglResParameter.h" namespace sead { class XmlElement; diff --git a/include/agl/utl/aglParameterObj.h b/include/utility/aglParameterObj.h similarity index 98% rename from include/agl/utl/aglParameterObj.h rename to include/utility/aglParameterObj.h index 36f529d..c2d4a2b 100644 --- a/include/agl/utl/aglParameterObj.h +++ b/include/utility/aglParameterObj.h @@ -2,7 +2,7 @@ #include #include -#include "agl/utl/aglResParameter.h" +#include "utility/aglResParameter.h" namespace sead { class XmlElement; diff --git a/include/agl/utl/aglParameterStringMgr.h b/include/utility/aglParameterStringMgr.h similarity index 100% rename from include/agl/utl/aglParameterStringMgr.h rename to include/utility/aglParameterStringMgr.h diff --git a/include/agl/utl/aglResCommon.h b/include/utility/aglResCommon.h similarity index 100% rename from include/agl/utl/aglResCommon.h rename to include/utility/aglResCommon.h diff --git a/include/agl/utl/aglResParameter.h b/include/utility/aglResParameter.h similarity index 99% rename from include/agl/utl/aglResParameter.h rename to include/utility/aglResParameter.h index 8ecf1ea..fdb7670 100644 --- a/include/agl/utl/aglResParameter.h +++ b/include/utility/aglResParameter.h @@ -4,7 +4,7 @@ #include #include #include -#include "agl/utl/aglResCommon.h" +#include "utility/aglResCommon.h" namespace sead { template diff --git a/include/agl/utl/aglScreenShotMgr.h b/include/utility/aglScreenShotMgr.h similarity index 84% rename from include/agl/utl/aglScreenShotMgr.h rename to include/utility/aglScreenShotMgr.h index d5125b5..24cb79e 100644 --- a/include/agl/utl/aglScreenShotMgr.h +++ b/include/utility/aglScreenShotMgr.h @@ -1,8 +1,8 @@ #pragma once -#include #include #include +#include "common/aglTextureDataSerializer.h" namespace agl::utl { @@ -17,4 +17,4 @@ class ScreenShotMgr { const sead::SafeString&, bool unk2); }; -} // namespace agl::utl \ No newline at end of file +} // namespace agl::utl diff --git a/src/detail/aglGPUMemBlockMgr.cpp b/src/detail/aglGPUMemBlockMgr.cpp index d54af66..1b39a9c 100644 --- a/src/detail/aglGPUMemBlockMgr.cpp +++ b/src/detail/aglGPUMemBlockMgr.cpp @@ -1,4 +1,4 @@ -#include "agl/detail/aglGPUMemBlockMgr.h" +#include "detail/aglGPUMemBlockMgr.h" namespace agl::detail { const MemoryPoolType MemoryPoolType::cInvalidPoolType(0); @@ -52,4 +52,4 @@ GPUMemBlockMgrHeapEx::GPUMemBlockMgrHeapEx(sead::Heap* p_heap) { m10 = nullptr; } -} // namespace agl::detail \ No newline at end of file +} // namespace agl::detail diff --git a/src/driver/aglGraphicsDriverMgr.cpp b/src/driver/aglGraphicsDriverMgr.cpp index c70910a..2453982 100644 --- a/src/driver/aglGraphicsDriverMgr.cpp +++ b/src/driver/aglGraphicsDriverMgr.cpp @@ -1,4 +1,4 @@ -#include "agl/driver/aglGraphicsDriverMgr.h" +#include "driver/aglGraphicsDriverMgr.h" namespace agl::driver { SEAD_SINGLETON_DISPOSER_IMPL(GraphicsDriverMgr) @@ -9,4 +9,4 @@ GraphicsDriverMgr::GraphicsDriverMgr() { } GraphicsDriverMgr::~GraphicsDriverMgr() = default; -} // namespace agl::driver \ No newline at end of file +} // namespace agl::driver diff --git a/src/driver/aglNVNMgr.cpp b/src/driver/aglNVNMgr.cpp index 903373d..85f0f11 100644 --- a/src/driver/aglNVNMgr.cpp +++ b/src/driver/aglNVNMgr.cpp @@ -1,6 +1,6 @@ -#include "agl/driver/aglNVNMgr.h" +#include "driver/aglNVNMgr.h" namespace agl::driver { // TODO: This is wrong and should actually touch the GraphicsDriverMgr implementation SEAD_SINGLETON_DISPOSER_IMPL(NVNMgr) -} // namespace agl::driver \ No newline at end of file +} // namespace agl::driver diff --git a/src/utl/aglAtomicPtrArray.cpp b/src/utility/aglAtomicPtrArray.cpp similarity index 98% rename from src/utl/aglAtomicPtrArray.cpp rename to src/utility/aglAtomicPtrArray.cpp index a941ff6..09c4ec9 100644 --- a/src/utl/aglAtomicPtrArray.cpp +++ b/src/utility/aglAtomicPtrArray.cpp @@ -1,4 +1,4 @@ -#include "agl/utl/aglAtomicPtrArray.h" +#include "utility/aglAtomicPtrArray.h" #include #include diff --git a/src/utl/aglParameter.cpp b/src/utility/aglParameter.cpp similarity index 99% rename from src/utl/aglParameter.cpp rename to src/utility/aglParameter.cpp index 39176c4..83fa293 100644 --- a/src/utl/aglParameter.cpp +++ b/src/utility/aglParameter.cpp @@ -1,12 +1,12 @@ -#include "agl/utl/aglParameter.h" +#include "utility/aglParameter.h" #include #include #include #include #include #include -#include "agl/utl/aglParameterObj.h" -#include "agl/utl/aglParameterStringMgr.h" +#include "utility/aglParameterObj.h" +#include "utility/aglParameterStringMgr.h" namespace agl::utl { diff --git a/src/utl/aglParameterIO.cpp b/src/utility/aglParameterIO.cpp similarity index 97% rename from src/utl/aglParameterIO.cpp rename to src/utility/aglParameterIO.cpp index cafeedf..dfeede5 100644 --- a/src/utl/aglParameterIO.cpp +++ b/src/utility/aglParameterIO.cpp @@ -1,4 +1,4 @@ -#include "agl/utl/aglParameterIO.h" +#include "utility/aglParameterIO.h" #include namespace agl::utl { diff --git a/src/utl/aglParameterList.cpp b/src/utility/aglParameterList.cpp similarity index 98% rename from src/utl/aglParameterList.cpp rename to src/utility/aglParameterList.cpp index be7b755..3142550 100644 --- a/src/utl/aglParameterList.cpp +++ b/src/utility/aglParameterList.cpp @@ -1,10 +1,10 @@ -#include "agl/utl/aglParameterList.h" +#include "utility/aglParameterList.h" #include #include #include -#include "agl/utl/aglParameter.h" -#include "agl/utl/aglParameterObj.h" -#include "agl/utl/aglParameterStringMgr.h" +#include "utility/aglParameter.h" +#include "utility/aglParameterObj.h" +#include "utility/aglParameterStringMgr.h" namespace agl::utl { diff --git a/src/utl/aglParameterObj.cpp b/src/utility/aglParameterObj.cpp similarity index 98% rename from src/utl/aglParameterObj.cpp rename to src/utility/aglParameterObj.cpp index 49f8ae8..d93fc22 100644 --- a/src/utl/aglParameterObj.cpp +++ b/src/utility/aglParameterObj.cpp @@ -1,7 +1,7 @@ -#include "agl/utl/aglParameterObj.h" +#include "utility/aglParameterObj.h" #include #include -#include "agl/utl/aglParameter.h" +#include "utility/aglParameter.h" namespace agl::utl { diff --git a/src/utl/aglParameterStringMgr.cpp b/src/utility/aglParameterStringMgr.cpp similarity index 91% rename from src/utl/aglParameterStringMgr.cpp rename to src/utility/aglParameterStringMgr.cpp index a51af02..fb16fe2 100644 --- a/src/utl/aglParameterStringMgr.cpp +++ b/src/utility/aglParameterStringMgr.cpp @@ -1,4 +1,4 @@ -#include "agl/utl/aglParameterStringMgr.h" +#include "utility/aglParameterStringMgr.h" namespace agl::utl { diff --git a/src/utl/aglResCommon.cpp b/src/utility/aglResCommon.cpp similarity index 93% rename from src/utl/aglResCommon.cpp rename to src/utility/aglResCommon.cpp index 8d7c911..2d70579 100644 --- a/src/utl/aglResCommon.cpp +++ b/src/utility/aglResCommon.cpp @@ -1,4 +1,4 @@ -#include "agl/utl/aglResCommon.h" +#include "utility/aglResCommon.h" #include #include diff --git a/src/utl/aglResParameter.cpp b/src/utility/aglResParameter.cpp similarity index 97% rename from src/utl/aglResParameter.cpp rename to src/utility/aglResParameter.cpp index c44f25f..f80f708 100644 --- a/src/utl/aglResParameter.cpp +++ b/src/utility/aglResParameter.cpp @@ -1,8 +1,8 @@ -#include "agl/utl/aglResParameter.h" +#include "utility/aglResParameter.h" #include #include #include -#include "agl/utl/aglParameter.h" +#include "utility/aglParameter.h" namespace agl::utl {