Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove agl folder #12

Merged
merged 4 commits into from
Mar 2, 2023
Merged

Remove agl folder #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
177a937
Remove agl folder
Feb 25, 2023
c6b90a7
Add missing newlines
Feb 25, 2023
08cf066
Update folders based on string paths
Feb 25, 2023
3c81013
Use absolute includes
Feb 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
102 changes: 51 additions & 51 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
project(agl CXX ASM)

add_library(agl OBJECT
include/agl/aglGPUCommon.hpp
include/aglGPUCommon.hpp

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/common/aglDisplayList.h
include/common/aglDrawContext.h
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/aglTextureEnum.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/detail/aglFileIOMgr.h
include/detail/aglGPUMemBlockMgr.h
include/detail/aglMemoryPoolHeap.h
include/detail/aglPrivateResource.h
include/detail/aglSurface.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/driver/aglGraphicsDriverMgr.h
include/driver/aglNVNMgr.h
include/driver/aglNVNimage.h
include/driver/aglNVNsampler.h
include/driver/aglNVNtexture.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/env/aglEnvObj.h
include/env/aglEnvObjBuffer.h
include/env/aglEnvObjMgr.h
include/env/aglEnvObjSetMgr.h
include/env/aglFog.h
include/env/aglLight.h
include/env/aglProjector.h

include/agl/fx/aglFxOfxLensFlare.h
include/fx/aglFxOfxLensFlare.h

include/agl/g3d/aglNW4FToNN.h
include/g3d/aglNW4FToNN.h

include/agl/pfx/aglBloom.h
include/agl/pfx/aglDepthOfField.h
include/pfx/aglBloom.h
include/pfx/aglDepthOfField.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/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/texture/aglTextureDataSerializer.h
include/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/utl/aglAtomicPtrArray.h
include/utl/aglParameter.h
include/utl/aglParameterCurve.hpp
include/utl/aglParameterIO.h
include/utl/aglParameterList.h
include/utl/aglParameterObj.h
include/utl/aglParameterStringMgr.h
include/utl/aglResCommon.h
include/utl/aglResParameter.h
include/utl/aglScreenShotMgr.h

src/detail/aglGPUMemBlockMgr.cpp

Expand Down
0 include/agl/aglGPUCommon.hpp → include/aglGPUCommon.hpp
View file
Open in desktop
File renamed without changes.
0 include/agl/common/aglDisplayList.h → include/common/aglDisplayList.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/common/aglDrawContext.h → include/common/aglDrawContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/common/aglGPUMemAddr.h → include/common/aglGPUMemAddr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "agl/detail/aglMemoryPoolHeap.h"
#include "aglGPUMemBlock.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this also get a fully qualified name, or stay like this? What about the ordering in such a case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally prefer the styling of not using folders when pulling files from the same folder but if leo wants I can change to include the common/ for consistency

#include "detail/aglMemoryPoolHeap.h"

namespace sead {
class Heap;
Expand Down
4 changes: 2 additions & 2 deletions include/agl/common/aglGPUMemBlock.h → include/common/aglGPUMemBlock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "aglGPUCommon.hpp"

namespace agl {

Expand Down
0 include/agl/common/aglRenderBuffer.h → include/common/aglRenderBuffer.h
View file
Open in desktop
File renamed without changes.
0 include/agl/common/aglRenderTarget.h → include/common/aglRenderTarget.h
View file
Open in desktop
File renamed without changes.
0 include/agl/common/aglShader.h → include/common/aglShader.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/common/aglShaderCompileInfo.h → include/common/aglShaderCompileInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions include/agl/common/aglShaderProgram.h → include/common/aglShaderProgram.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
0 include/agl/common/aglShaderProgramArchive.h → include/common/aglShaderProgramArchive.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions include/agl/common/aglTextureData.h → include/common/aglTextureData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
0 include/agl/common/aglTextureEnum.h → include/common/aglTextureEnum.h
View file
Open in desktop
File renamed without changes.
0 include/agl/detail/aglFileIOMgr.h → include/detail/aglFileIOMgr.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions include/agl/detail/aglGPUMemBlockMgr.h → include/detail/aglGPUMemBlockMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "aglGPUCommon.hpp"

namespace agl::detail {

Expand Down
0 include/agl/detail/aglMemoryPoolHeap.h → include/detail/aglMemoryPoolHeap.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/detail/aglPrivateResource.h → include/detail/aglPrivateResource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions include/agl/detail/aglSurface.h → include/detail/aglSurface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
0 include/agl/driver/aglGraphicsDriverMgr.h → include/driver/aglGraphicsDriverMgr.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/driver/aglNVNMgr.h → include/driver/aglNVNMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <heap/seadDisposer.h>
#include <hostio/seadHostIONode.h>
#include "agl/driver/aglGraphicsDriverMgr.h"
#include "driver/aglGraphicsDriverMgr.h"

namespace agl::driver {

Expand Down
0 include/agl/driver/aglNVNimage.h → include/driver/aglNVNimage.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/driver/aglNVNsampler.h → include/driver/aglNVNsampler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <basis/seadTypes.h>
#include <nvn/nvn.h>
#include <basis/seadTypes.h>

namespace agl::driver {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/driver/aglNVNtexture.h → include/driver/aglNVNtexture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <basis/seadTypes.h>
#include <nvn/nvn.h>
#include <basis/seadTypes.h>

namespace agl::driver {

Expand Down
0 include/agl/env/aglEnvObj.h → include/env/aglEnvObj.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/env/aglEnvObjBuffer.h → include/env/aglEnvObjBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <container/seadSafeArray.h>
#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::env {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/env/aglEnvObjMgr.h → include/env/aglEnvObjMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObjBuffer.h"
#include "env/aglEnvObjBuffer.h"

namespace agl::env {

Expand Down
0 include/agl/env/aglEnvObjSetMgr.h → include/env/aglEnvObjSetMgr.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/env/aglFog.h → include/env/aglFog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::env {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/env/aglLight.h → include/env/aglLight.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::env {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/env/aglProjector.h → include/env/aglProjector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::env {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/fx/aglFxOfxLensFlare.h → include/fx/aglFxOfxLensFlare.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::fx {

Expand Down
0 include/agl/g3d/aglNW4FToNN.h → include/g3d/aglNW4FToNN.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/agl/pfx/aglBloom.h → include/pfx/aglBloom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::pfx {

Expand Down
2 changes: 1 addition & 1 deletion include/agl/pfx/aglDepthOfField.h → include/pfx/aglDepthOfField.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/env/aglEnvObj.h"
#include "env/aglEnvObj.h"

namespace agl::pfx {

Expand Down
0 ...ude/agl/shader_text/aglShaderTextClause.h → include/shader_text/aglShaderTextClause.h
View file
Open in desktop
File renamed without changes.
0 ...l/shader_text/aglShaderTextDefineLinker.h → ...e/shader_text/aglShaderTextDefineLinker.h
View file
Open in desktop
File renamed without changes.
0 ...r_text/aglShaderTextExpressionEvaluator.h → ...r_text/aglShaderTextExpressionEvaluator.h
View file
Open in desktop
File renamed without changes.
0 include/agl/shader_text/aglShaderTextLexer.h → include/shader_text/aglShaderTextLexer.h
View file
Open in desktop
File renamed without changes.
0 ...l/shader_text/aglShaderTextPreprocessor.h → ...e/shader_text/aglShaderTextPreprocessor.h
View file
Open in desktop
File renamed without changes.
0 ...agl/shader_text/aglShaderTextSyntaxTree.h → ...ude/shader_text/aglShaderTextSyntaxTree.h
View file
Open in desktop
File renamed without changes.
0 ...de/agl/texture/aglTextureDataSerializer.h → include/texture/aglTextureDataSerializer.h
View file
Open in desktop
File renamed without changes.
0 include/agl/utl/aglAtomicPtrArray.h → include/utl/aglAtomicPtrArray.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions include/agl/utl/aglParameter.h → include/utl/aglParameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <array>
#include <type_traits>
#include <basis/seadRawPrint.h>
#include <basis/seadTypes.h>
#include <gfx/seadColor.h>
Expand All @@ -9,8 +10,7 @@
#include <math/seadQuat.h>
#include <math/seadVector.h>
#include <prim/seadSafeString.h>
#include <type_traits>
#include "agl/utl/aglResParameter.h"
#include "utl/aglResParameter.h"

namespace sead {
class Heap;
Expand Down Expand Up @@ -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 "utl/aglParameterCurve.hpp"
#undef AGL_UTILS_PARAMETER_H_
2 changes: 1 addition & 1 deletion include/agl/utl/aglParameterCurve.hpp → include/utl/aglParameterCurve.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#ifndef AGL_UTILS_PARAMETER_H_
#include "agl/utl/aglParameter.h"
#include "utl/aglParameter.h"
#endif

namespace agl::utl {
Expand Down
2 changes: 1 addition & 1 deletion include/agl/utl/aglParameterIO.h → include/utl/aglParameterIO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "agl/utl/aglParameterList.h"
#include "utl/aglParameterList.h"

namespace sead {
class XmlDocument;
Expand Down
2 changes: 1 addition & 1 deletion include/agl/utl/aglParameterList.h → include/utl/aglParameterList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <hostio/seadHostIOReflexible.h>
#include <prim/seadSafeString.h>
#include "agl/utl/aglResParameter.h"
#include "utl/aglResParameter.h"

namespace sead {
class XmlElement;
Expand Down
2 changes: 1 addition & 1 deletion include/agl/utl/aglParameterObj.h → include/utl/aglParameterObj.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <hostio/seadHostIOReflexible.h>
#include <prim/seadSafeString.h>
#include "agl/utl/aglResParameter.h"
#include "utl/aglResParameter.h"

namespace sead {
class XmlElement;
Expand Down
0 include/agl/utl/aglParameterStringMgr.h → include/utl/aglParameterStringMgr.h
View file
Open in desktop
File renamed without changes.
0 include/agl/utl/aglResCommon.h → include/utl/aglResCommon.h
View file
Open in desktop
File renamed without changes.
Loading