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

Update libraries and adjust code to match again #129

Merged
merged 2 commits into from
Aug 31, 2024
Merged

Update libraries and adjust code to match again #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0fd08
Update libraries and adjust code to match again
Jul 26, 2024
878f95d
Update agl, nnSdk, sead
Aug 28, 2024
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
13 changes: 3 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.13)
cmake_minimum_required(VERSION 3.15)
project(uking CXX)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
Expand Down Expand Up @@ -30,16 +30,9 @@ target_compile_options(uking PRIVATE -Wno-unused-parameter -Wno-unused-private-f
target_compile_options(uking PRIVATE -Wno-invalid-offsetof)
target_compile_options(uking PRIVATE -Wextra-semi)

set(NN_SDK_MAJOR 4)
set(NN_SDK_MINOR 4)
set(NN_SDK_PATCH 0)
set(NN_SDK 4.4.0)
set(NN_WARE 1.6.1)
set(NN_SDK_TYPE "Release")

# todo: figure out actual number, in between odyssey and splatoon
set(NN_WARE_MAJOR 1)
set(NN_WARE_MINOR 6)
set(NN_WARE_PATCH 1)

add_subdirectory(lib/NintendoSDK)
target_link_libraries(uking PUBLIC NintendoSDK)

Expand Down
40 changes: 20 additions & 20 deletions data/uking_functions.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39763,7 +39763,7 @@ Address,Quality,Size,Name
0x0000007100654244,U,000076,apQueryNavMeshFace
0x0000007100654290,U,000008,apQueryUnknown
0x0000007100654298,U,000916,sinitSomeBfevflStrings
0x000000710065462c,U,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev
0x000000710065462c,O,000100,_ZN4sead15DebugFontMgrNvn18SingletonDisposer_D1Ev
0x0000007100654690,U,000108,
0x00000071006546fc,W,000140,_ZN4ksys3map16AutoPlacementMgr14createInstanceEPN4sead4HeapE
0x0000007100654788,O,000088,_ZN4ksys3map16AutoPlacementMgr14deleteInstanceEv
Expand Down Expand Up @@ -54787,7 +54787,7 @@ Address,Quality,Size,Name
0x00000071009221ec,U,000012,
0x00000071009221f8,U,000012,
0x0000007100922204,U,000008,
0x000000710092220c,U,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs
0x000000710092220c,O,000008,_ZNK4sead15DebugFontMgrNvn12getCharWidthEDs
0x0000007100922214,U,000008,
0x000000710092221c,U,000012,
0x0000007100922228,U,000012,
Expand Down Expand Up @@ -63192,33 +63192,33 @@ Address,Quality,Size,Name
0x0000007100afe640,U,000024,
0x0000007100afe658,U,000100,
0x0000007100afe6bc,U,000108,
0x0000007100afe728,U,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE
0x0000007100afe728,M,000168,_ZN4sead19DebugFontMgrJis1Nvn14createInstanceEPNS_4HeapE
0x0000007100afe7d0,U,000004,nullsub_3181
0x0000007100afe7d4,U,000004,j__ZdlPv_592
0x0000007100afe7d8,U,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j
0x0000007100afe7d8,M,000300,_ZN4sead19DebugFontMgrJis1Nvn10initializeEPNS_4HeapEPKcS4_S4_j
0x0000007100afe904,U,001252,
0x0000007100afede8,U,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv
0x0000007100afee14,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv
0x0000007100afee1c,U,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv
0x0000007100afee24,U,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs
0x0000007100afede8,O,000044,_ZN4sead19DebugFontMgrJis1Nvn22swapUniformBlockBufferEv
0x0000007100afee14,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn9getHeightEv
0x0000007100afee1c,O,000008,_ZNK4sead19DebugFontMgrJis1Nvn8getWidthEv
0x0000007100afee24,O,000024,_ZNK4sead19DebugFontMgrJis1Nvn12getCharWidthEDs
0x0000007100afee3c,U,000008,
0x0000007100afee44,U,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE
0x0000007100afee44,O,000044,_ZNK4sead19DebugFontMgrJis1Nvn5beginEPNS_11DrawContextE
0x0000007100afee70,U,000004,_ZN2nn4ui2d13FontContainerD2Ev
0x0000007100afee74,U,000836,_ZNK4sead19DebugFontMgrJis1Nvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi
0x0000007100aff1b8,U,000008,
0x0000007100aff1c0,U,000100,
0x0000007100aff224,U,000108,
0x0000007100aff290,U,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE
0x0000007100aff290,O,000164,_ZN4sead15DebugFontMgrNvn14createInstanceEPNS_4HeapE
0x0000007100aff334,U,000004,nullsub_3183
0x0000007100aff338,U,000004,j__ZdlPv_593
0x0000007100aff33c,U,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j
0x0000007100aff33c,O,000240,_ZN4sead15DebugFontMgrNvn10initializeEPNS_4HeapEPKcS4_j
0x0000007100aff42c,U,001188,_ZN4sead15DebugFontMgrNvn20initializeFromBinaryEPNS_4HeapEPvmS3_mj
0x0000007100aff8d0,U,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv
0x0000007100aff8fc,U,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv
0x0000007100aff8d0,O,000044,_ZN4sead15DebugFontMgrNvn22swapUniformBlockBufferEv
0x0000007100aff8fc,O,000008,_ZNK4sead15DebugFontMgrNvn9getHeightEv
0x0000007100aff904,U,000008,
0x0000007100aff90c,U,000008,
0x0000007100aff914,U,000008,
0x0000007100aff91c,U,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE
0x0000007100aff91c,O,000044,_ZNK4sead15DebugFontMgrNvn5beginEPNS_11DrawContextE
0x0000007100aff948,U,000004,nullsub_3184
0x0000007100aff94c,U,000716,_ZNK4sead15DebugFontMgrNvn5printEPNS_11DrawContextERKNS_10ProjectionERKNS_6CameraERKNS_8Matrix34IfEERKNS_7Color4fEPKvi
0x0000007100affc18,U,000008,
Expand Down Expand Up @@ -64200,7 +64200,7 @@ Address,Quality,Size,Name
0x0000007100b2e4b8,U,000092,sead::MethodTreeMgr::rtti2
0x0000007100b2e514,U,000028,_ZN3agl3utl16DebugTexturePageD2Ev
0x0000007100b2e530,U,000004,nullsub_6141
0x0000007100b2e534,U,000008,_ZN4sead15DrawLockContext4lockEv
0x0000007100b2e534,O,000008,_ZN4sead15DrawLockContext4lockEv
0x0000007100b2e53c,U,000008,
0x0000007100b2e544,U,000012,
0x0000007100b2e550,U,000004,nullsub_3254
Expand Down Expand Up @@ -65292,7 +65292,7 @@ Address,Quality,Size,Name
0x0000007100b66350,U,018288,
0x0000007100b6aac0,U,000016,
0x0000007100b6aad0,U,001144,_ZN3agl6detail15TextureDataUtil20convFormatNNGfxToAGLEN2nn3gfx11ImageFormatE
0x0000007100b6af48,U,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv
0x0000007100b6af48,O,000012,_ZN3agl26ResBinaryShaderArchiveData12getExtensionEv
0x0000007100b6af54,U,001332,
0x0000007100b6b488,U,000844,
0x0000007100b6b7d4,U,000072,_ZN3agl22ResBinaryShaderArchive7cleanUpEv
Expand Down Expand Up @@ -65329,11 +65329,11 @@ Address,Quality,Size,Name
0x0000007100b6d070,U,000072,_ZNK3agl11IndexStream13flushCPUCacheEjj
0x0000007100b6d0b8,O,000112,_ZN3agl15ModifyEndianU32EbPvm
0x0000007100b6d128,U,000012,
0x0000007100b6d134,U,001140,_ZN3agl16ResShaderArchive5setUpEv
0x0000007100b6d134,M,001140,_ZN3agl16ResShaderArchive5setUpEv
0x0000007100b6d5a8,U,000112,
0x0000007100b6d618,U,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv
0x0000007100b6d648,U,000068,_ZNK3agl18ResShaderVariation8getValueEi
0x0000007100b6d68c,U,000068,_ZNK3agl18ResShaderVariation5getIDEv
0x0000007100b6d618,M,000048,_ZNK3agl16ResShaderProgram26getResShaderVariationArrayEv
0x0000007100b6d648,O,000068,_ZNK3agl18ResShaderVariation8getValueEi
0x0000007100b6d68c,O,000068,_ZNK3agl18ResShaderVariation5getIDEv
0x0000007100b6d6d0,U,000024,_ZN3agl6ShaderC2Ev
0x0000007100b6d6e8,U,000008,
0x0000007100b6d6f0,U,000004,j__ZdlPv_655
Expand Down
2 changes: 1 addition & 1 deletion lib/NintendoSDK
Open in desktop
Submodule NintendoSDK updated 176 files
2 changes: 1 addition & 1 deletion lib/agl
Open in desktop
Submodule agl updated 80 files
+6 −4 .clang-format
+11 −0 .github/workflows/lint_pr.yml
+74 −38 CMakeLists.txt
+0 −43 include/agl/utl/aglResCommon.h
+48 −0 include/common/aglDisplayList.h
+46 −0 include/common/aglDrawContext.h
+4 −3 include/common/aglGPUCommon.hpp
+32 −0 include/common/aglGPUMemAddr.h
+3 −1 include/common/aglGPUMemBlock.h
+45 −0 include/common/aglRenderBuffer.h
+48 −0 include/common/aglRenderTarget.h
+65 −0 include/common/aglResBinaryShaderArchive.h
+43 −0 include/common/aglResBinaryShaderProgram.h
+187 −0 include/common/aglResCommon.h
+68 −0 include/common/aglResShaderArchive.h
+36 −0 include/common/aglResShaderBinary.h
+29 −0 include/common/aglResShaderMacro.h
+46 −0 include/common/aglResShaderProgram.h
+30 −0 include/common/aglResShaderSource.h
+58 −0 include/common/aglResShaderSymbol.h
+32 −0 include/common/aglResShaderVariation.h
+53 −0 include/common/aglShader.h
+43 −0 include/common/aglShaderCompileInfo.h
+34 −0 include/common/aglShaderEnum.h
+65 −0 include/common/aglShaderProgram.h
+48 −0 include/common/aglShaderProgramArchive.h
+57 −0 include/common/aglTextureData.h
+1 −1 include/common/aglTextureDataSerializer.h
+87 −0 include/common/aglTextureEnum.h
+72 −0 include/detail/aglFileIOMgr.h
+9 −6 include/detail/aglGPUMemBlockMgr.h
+33 −0 include/detail/aglMemoryPoolHeap.h
+1 −1 include/detail/aglPrivateResource.h
+35 −0 include/detail/aglShaderHolder.h
+46 −0 include/detail/aglSurface.h
+0 −0 include/driver/aglGraphicsDriverMgr.h
+1 −1 include/driver/aglNVNMgr.h
+20 −0 include/driver/aglNVNimage.h
+23 −0 include/driver/aglNVNsampler.h
+30 −0 include/driver/aglNVNtexture.h
+1 −1 include/effect/aglFxOfxLensFlare.h
+0 −0 include/environment/aglEnvObj.h
+1 −1 include/environment/aglEnvObjBuffer.h
+1 −1 include/environment/aglEnvObjMgr.h
+0 −0 include/environment/aglEnvObjSetMgr.h
+1 −1 include/environment/aglFog.h
+1 −1 include/environment/aglLight.h
+1 −1 include/environment/aglProjector.h
+0 −0 include/g3d/aglNW4FToNN.h
+1 −1 include/postfx/aglBloom.h
+1 −1 include/postfx/aglDepthOfField.h
+47 −0 include/shader_text/aglShaderTextClause.h
+43 −0 include/shader_text/aglShaderTextDefineLinker.h
+51 −0 include/shader_text/aglShaderTextExpressionEvaluator.h
+33 −0 include/shader_text/aglShaderTextLexer.h
+59 −0 include/shader_text/aglShaderTextPreprocessor.h
+38 −0 include/shader_text/aglShaderTextSyntaxTree.h
+0 −0 include/utility/aglAtomicPtrArray.h
+166 −0 include/utility/aglDevTools.h
+3 −3 include/utility/aglParameter.h
+1 −1 include/utility/aglParameterCurve.hpp
+1 −1 include/utility/aglParameterIO.h
+1 −1 include/utility/aglParameterList.h
+1 −1 include/utility/aglParameterObj.h
+0 −0 include/utility/aglParameterStringMgr.h
+2 −2 include/utility/aglResParameter.h
+2 −2 include/utility/aglScreenShotMgr.h
+0 −1 src/aglGPUMemBlock.cpp
+2 −2 src/detail/aglGPUMemBlockMgr.cpp
+2 −2 src/driver/aglGraphicsDriverMgr.cpp
+2 −2 src/driver/aglNVNMgr.cpp
+1 −1 src/utility/aglAtomicPtrArray.cpp
+3 −3 src/utility/aglParameter.cpp
+5 −5 src/utility/aglParameterIO.cpp
+4 −4 src/utility/aglParameterList.cpp
+2 −2 src/utility/aglParameterObj.cpp
+1 −1 src/utility/aglParameterStringMgr.cpp
+8 −7 src/utility/aglResParameter.cpp
+1 −1 src/utility/common/aglResCommon.cpp
+384 −0 src/utility/common/aglResShaderArchive.cpp
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysLightRigObj.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysMaskedProjLight.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysMaskedSpotLight.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
12 changes: 6 additions & 6 deletions lib/gsys/include/gsys/gsysModelSceneConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#pragma once

#include <agl/env/aglEnvObjBuffer.h>
#include <agl/env/aglEnvObjMgr.h>
#include <agl/env/aglEnvObjSetMgr.h>
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <basis/seadTypes.h>
#include <container/seadSafeArray.h>
#include <environment/aglEnvObjBuffer.h>
#include <environment/aglEnvObjMgr.h>
#include <environment/aglEnvObjSetMgr.h>
#include <hostio/seadHostIONode.h>
#include <math/seadVector.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>

namespace gsys {

Expand Down
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysOfxLensFlareRig.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
6 changes: 3 additions & 3 deletions lib/gsys/include/gsys/gsysParticleConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>

namespace gsys {

Expand Down
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysPointLight.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
2 changes: 1 addition & 1 deletion lib/gsys/include/gsys/gsysSpotLight.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 <environment/aglEnvObj.h>

namespace gsys {

Expand Down
14 changes: 7 additions & 7 deletions lib/gsys/src/gsys/gsysModelSceneConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#include "gsys/gsysModelSceneConfig.h"
#include <agl/detail/aglPrivateResource.h>
#include <agl/env/aglFog.h>
#include <agl/env/aglLight.h>
#include <agl/env/aglProjector.h>
#include <agl/pfx/aglBloom.h>
#include <agl/pfx/aglDepthOfField.h>
#include <basis/seadRawPrint.h>
#include <detail/aglPrivateResource.h>
#include <environment/aglFog.h>
#include <environment/aglLight.h>
#include <environment/aglProjector.h>
#include <postfx/aglBloom.h>
#include <postfx/aglDepthOfField.h>
#include <prim/seadEnum.h>
#include "agl/fx/aglFxOfxLensFlare.h"
#include "effect/aglFxOfxLensFlare.h"
#include "gsys/gsysLightRigObj.h"
#include "gsys/gsysMaskedProjLight.h"
#include "gsys/gsysMaskedSpotLight.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/sead
Open in desktop
Submodule sead updated 34 files
+7 −1 CMakeLists.txt
+4 −0 include/container/seadTList.h
+2 −0 include/devenv/seadEnvUtil.h
+51 −0 include/devenv/seadFontMgr.h
+1 −1 include/filedevice/nin/seadNinFileDeviceBaseNin.h
+37 −3 include/framework/nx/seadGameFrameworkNx.h
+36 −0 include/framework/seadTask.h
+68 −0 include/gfx/nin/seadGraphicsNvn.h
+83 −0 include/gfx/nvn/seadDebugFontMgrNvn.h
+57 −9 include/gfx/seadCamera.h
+6 −10 include/gfx/seadDrawContext.h
+23 −0 include/gfx/seadDrawLockContext.h
+11 −1 include/gfx/seadGraphics.h
+1 −1 include/gfx/seadProjection.h
+4 −3 include/heap/seadHeapMgr.h
+1 −1 include/math/seadMathCalcCommon.hpp
+2 −0 include/math/seadQuatCalcCommon.h
+14 −2 include/math/seadQuatCalcCommon.hpp
+4 −0 include/math/seadVector.h
+27 −3 include/math/seadVector.hpp
+5 −0 include/math/seadVectorCalcCommon.h
+33 −9 include/math/seadVectorCalcCommon.hpp
+3 −0 include/math/seadVectorFwd.h
+17 −0 include/prim/seadSafeString.h
+2 −2 modules/src/controller/seadControllerBase.cpp
+2 −2 modules/src/controller/seadControllerWrapper.cpp
+6 −0 modules/src/devenv/seadFontMgr.cpp
+5 −2 modules/src/filedevice/nin/seadNinFileDeviceBaseNin.cpp
+2 −0 modules/src/filedevice/nin/seadNinSaveFileDeviceNin.cpp
+3 −1 modules/src/filedevice/seadFileDeviceMgr.cpp
+239 −0 modules/src/gfx/nvn/seadDebugFontMgrNvn.cpp
+20 −0 modules/src/gfx/seadDrawLockContext.cpp
+1 −1 modules/src/heap/seadExpHeap.cpp
+1 −1 modules/src/math/seadQuat.cpp
6 changes: 3 additions & 3 deletions src/Game/DLC/aocHardModeManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ void HardModeManager::init_() {
}

void HardModeManager::nerfHpRestore(f32* hp) const {
*hp = sead::Mathf::max(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
*hp = sead::Mathf::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1.0f);
}

void HardModeManager::nerfHpRestore(s32* hp) const {
*hp = sead::Mathi::max(*hp * getMultiplier(MultiplierType::HpRestore), 1);
*hp = sead::Mathi::clampMin(*hp * getMultiplier(MultiplierType::HpRestore), 1);
}

void HardModeManager::modifyEnemyNoticeDuration(f32* value) const {
*value = sead::Mathf::max(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
*value = sead::Mathf::clampMin(*value * getMultiplier(MultiplierType::EnemyNoticeDuration), 0);
}

bool HardModeManager::shouldCreateLifeRecoverInfo(ksys::act::Actor* actor) {
Expand Down
4 changes: 2 additions & 2 deletions src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "KingSystem/ActorSystem/Awareness/actAwareness.h"
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglResParameter.h>
#include <container/seadSafeArray.h>
#include <cstring>
#include <prim/seadScopedLock.h>
#include <utility/aglParameter.h>
#include <utility/aglResParameter.h>
#include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h"
#include "KingSystem/ActorSystem/Awareness/actAwarenessInstance.h"
#include "KingSystem/Resource/resHandle.h"
Expand Down
2 changes: 1 addition & 1 deletion src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h"
#include <agl/utl/aglParameter.h>
#include <container/seadSafeArray.h>
#include <utility/aglParameter.h>

namespace ksys::act {

Expand Down
2 changes: 1 addition & 1 deletion src/KingSystem/ActorSystem/actAiParam.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "KingSystem/ActorSystem/actAiParam.h"
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/ActorSystem/actActor.h"
#include "KingSystem/ActorSystem/actAiClassDef.h"
#include "KingSystem/ActorSystem/actAiInlineParam.h"
Expand Down
2 changes: 1 addition & 1 deletion src/KingSystem/ActorSystem/actBaseProcJobQue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#pragma once

#include <agl/utl/aglAtomicPtrArray.h>
#include <array>
#include <basis/seadTypes.h>
#include <container/seadSafeArray.h>
#include <mc/seadJob.h>
#include <mc/seadJobQueue.h>
#include <thread/seadAtomic.h>
#include <utility/aglAtomicPtrArray.h>
#include "KingSystem/ActorSystem/actBaseProcJob.h"
#include "KingSystem/Utils/Types.h"

Expand Down
2 changes: 1 addition & 1 deletion src/KingSystem/ActorSystem/actBaseProcMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include <agl/utl/aglAtomicPtrArray.h>
#include <container/seadBuffer.h>
#include <container/seadOffsetList.h>
#include <container/seadPtrArray.h>
Expand All @@ -12,6 +11,7 @@
#include <prim/seadTypedBitFlag.h>
#include <thread/seadAtomic.h>
#include <thread/seadCriticalSection.h>
#include <utility/aglAtomicPtrArray.h>
#include "KingSystem/ActorSystem/actBaseProc.h"
#include "KingSystem/ActorSystem/actBaseProcJob.h"
#include "KingSystem/ActorSystem/actBaseProcMap.h"
Expand Down
4 changes: 2 additions & 2 deletions src/KingSystem/Chemical/chmRigid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Utils/Types.h"

namespace ksys::chm {
Expand Down
8 changes: 4 additions & 4 deletions src/KingSystem/Chemical/chmRoot.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Chemical/chmRigid.h"
#include "KingSystem/Chemical/chmShape.h"
#include "KingSystem/Utils/Types.h"
Expand Down
8 changes: 4 additions & 4 deletions src/KingSystem/Chemical/chmShape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Utils/Types.h"

namespace ksys::chm {
Expand Down
8 changes: 4 additions & 4 deletions src/KingSystem/Chemical/chmSystemConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <basis/seadTypes.h>
#include <container/seadBuffer.h>
#include <heap/seadDisposer.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>

namespace ksys::chm {

Expand Down
6 changes: 3 additions & 3 deletions src/KingSystem/Mii/miiUMii.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resHandle.h"
#include "KingSystem/Utils/Types.h"

Expand Down
6 changes: 3 additions & 3 deletions src/KingSystem/Physics/Cloth/physClothParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#pragma once

#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>

namespace ksys::phys {

Expand Down
Loading
Loading