falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from ThePixelGamer/libs 

Update libraries and adjust code to match again
This commit is contained in:
Léo Lam 2024-08-31 13:39:46 +02:00 committed by GitHub
parent 96f611fa5d 878f95dffb
commit 0f88ba6f00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
165 changed files with 323 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -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)
@ -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)

40
data/uking_functions.csv
View File

@ -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
@ -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,
@ -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,
@ -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
@ -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
@ -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

Can't render this file because it is too large.

2
lib/NintendoSDK

@ -1 +1 @@
Subproject commit 362e47b48c27ab51d6e34de11185a0d89bd32a34
Subproject commit a7a1e2b715cbafbbe50264a6157da8388a390776

2
lib/agl

@ -1 +1 @@
Subproject commit 9731cfc5017f798aeca80a37fba17f3af17b8076
Subproject commit e00c665fb8f5d54c90e9f8559fcfd3eec2e888fe

2
lib/gsys/include/gsys/gsysLightRigObj.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

2
lib/gsys/include/gsys/gsysMaskedProjLight.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

2
lib/gsys/include/gsys/gsysMaskedSpotLight.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

12
lib/gsys/include/gsys/gsysModelSceneConfig.h
View File

@ -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 {

2
lib/gsys/include/gsys/gsysOfxLensFlareRig.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

6
lib/gsys/include/gsys/gsysParticleConfig.h
View File

@ -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 {

2
lib/gsys/include/gsys/gsysPointLight.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

2
lib/gsys/include/gsys/gsysSpotLight.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/env/aglEnvObj.h>
#include <environment/aglEnvObj.h>
namespace gsys {

14
lib/gsys/src/gsys/gsysModelSceneConfig.cpp
View File

@ -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"

2
lib/sead

@ -1 +1 @@
Subproject commit cc672852c6218bf081325cb955dd3d87723d16cc
Subproject commit 7a2b22a6a53f341b9752dd8134a9a6172fb7dad7

6
src/Game/DLC/aocHardModeManager.cpp
View File

@ -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) {

4
src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
View File

@ -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"

2
src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
View File

@ -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 {

2
src/KingSystem/ActorSystem/actAiParam.cpp
View File

@ -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"

2
src/KingSystem/ActorSystem/actBaseProcJobQue.h
View File

@ -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"

2
src/KingSystem/ActorSystem/actBaseProcMgr.h
View File

@ -1,6 +1,5 @@
#pragma once
#include <agl/utl/aglAtomicPtrArray.h>
#include <container/seadBuffer.h>
#include <container/seadOffsetList.h>
#include <container/seadPtrArray.h>
@ -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"

4
src/KingSystem/Chemical/chmRigid.h
View File

@ -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 {

8
src/KingSystem/Chemical/chmRoot.h
View File

@ -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"

8
src/KingSystem/Chemical/chmShape.h
View File

@ -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 {

8
src/KingSystem/Chemical/chmSystemConfig.h
View File

@ -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 {

6
src/KingSystem/Mii/miiUMii.h
View File

@ -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"

6
src/KingSystem/Physics/Cloth/physClothParam.h
View File

@ -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 {

6
src/KingSystem/Physics/Ragdoll/physRagdollConfig.h
View File

@ -1,12 +1,12 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadSafeArray.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 ksys::phys {

4
src/KingSystem/Physics/Ragdoll/physRagdollControllerKeyList.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"

6
src/KingSystem/Physics/Ragdoll/physRagdollParam.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

13
src/KingSystem/Physics/RigidBody/Shape/Box/physBoxShape.cpp
View File

@ -11,9 +11,9 @@ BoxShape* BoxShape::make(const BoxShapeParam& param, sead::Heap* heap) {
hkpBoxShape* box = nullptr;
if (auto* storage = util::allocStorage<hkpBoxShape>(heap)) {
const auto radius = param.convex_radius;
const hkVector4f half_extents{sead::Mathf::max(param.extents.x / 2 - radius, 0.001),
sead::Mathf::max(param.extents.y / 2 - radius, 0.001),
sead::Mathf::max(param.extents.z / 2 - radius, 0.001)};
const hkVector4f half_extents{sead::Mathf::clampMin(param.extents.x / 2 - radius, 0.001),
sead::Mathf::clampMin(param.extents.y / 2 - radius, 0.001),
sead::Mathf::clampMin(param.extents.z / 2 - radius, 0.001)};
box = new (storage) hkpBoxShape(half_extents, radius);
}
@ -122,9 +122,10 @@ const hkpShape* BoxShape::updateHavokShape() {
if (mFlags.isOn(Flag::Dirty)) {
{
const auto radius = mHavokShape->getRadius();
const sead::Vector3f half_extents{sead::Mathf::max(mExtents.x / 2 - radius, 0.001),
sead::Mathf::max(mExtents.y / 2 - radius, 0.001),
sead::Mathf::max(mExtents.z / 2 - radius, 0.001)};
const sead::Vector3f half_extents{
sead::Mathf::clampMin(mExtents.x / 2 - radius, 0.001),
sead::Mathf::clampMin(mExtents.y / 2 - radius, 0.001),
sead::Mathf::clampMin(mExtents.z / 2 - radius, 0.001)};
const auto ref_count = mHavokShape->getReferenceCount();
mHavokShape = new (mHavokShape) hkpBoxShape(toHkVec4(half_extents), radius);
mHavokShape->setReferenceCount(ref_count);

4
src/KingSystem/Physics/RigidBody/Shape/physShapeParamObj.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Physics/physDefines.h"
namespace ksys::phys {

6
src/KingSystem/Physics/RigidBody/physEdgeRigidBodyParam.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

14
src/KingSystem/Physics/RigidBody/physRigidBody.cpp
View File

@ -84,9 +84,9 @@ bool RigidBody::initMotionAccessorForDynamicMotion(sead::Heap* heap) {
hkMatrix3 inertia;
body->getInertiaLocal(inertia);
param.inertia = {sead::Mathf::max(inertia(0, 0), MinInertia),
sead::Mathf::max(inertia(1, 1), MinInertia),
sead::Mathf::max(inertia(2, 2), MinInertia)};
param.inertia = {sead::Mathf::clampMin(inertia(0, 0), MinInertia),
sead::Mathf::clampMin(inertia(1, 1), MinInertia),
sead::Mathf::clampMin(inertia(2, 2), MinInertia)};
param.center_of_mass = toVec3(body->getCenterOfMassLocal());
param.linear_damping = body->getLinearDamping();
param.angular_damping = body->getAngularDamping();
@ -126,9 +126,9 @@ bool RigidBody::createMotion(hkpMaxSizeMotion* motion, MotionType motion_type,
case MotionType::Dynamic: {
hkMatrix3f inertia_local;
inertia_local.m_col0.set(sead::Mathf::max(param.inertia.x, MinInertia), 0, 0);
inertia_local.m_col1.set(0, sead::Mathf::max(param.inertia.y, MinInertia), 0);
inertia_local.m_col2.set(0, 0, sead::Mathf::max(param.inertia.z, MinInertia));
inertia_local.m_col0.set(sead::Mathf::clampMin(param.inertia.x, MinInertia), 0, 0);
inertia_local.m_col1.set(0, sead::Mathf::clampMin(param.inertia.y, MinInertia), 0);
inertia_local.m_col2.set(0, 0, sead::Mathf::clampMin(param.inertia.z, MinInertia));
hkpRigidBody::createDynamicRigidMotion(
hkpMotion::MOTION_DYNAMIC, position, rotation, param.mass, inertia_local,
@ -1630,7 +1630,7 @@ bool RigidBody::isEntityMotionFlag80On() const {
void RigidBody::setColImpulseScale(float scale) {
if (!isEntity())
return;
scale = sead::Mathf::max(scale, 0.0);
scale = sead::Mathf::clampMin(scale, 0.0);
getEntityMotionAccessor()->setColImpulseScale(scale);
}

12
src/KingSystem/Physics/RigidBody/physRigidBodyMotionEntity.cpp
View File

@ -300,14 +300,6 @@ float RigidBodyMotionEntity::getMassInv() const {
return mMotion->getMassInv();
}
static inline float max3(float a, float b, float c) {
return sead::Mathf::max(c, a > b ? a : b);
}
static inline float min3(float a, float b, float c) {
return sead::Mathf::min(a < b ? a : b, c);
}
void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) {
if (mBody->isCharacterControllerType())
return;
@ -317,8 +309,8 @@ void RigidBodyMotionEntity::setInertiaLocal(const sead::Vector3f& inertia) {
return;
}
const float max = max3(inertia.x, inertia.y, inertia.z);
const float min = min3(inertia.x, inertia.y, inertia.z);
const float max = sead::Mathf::max3(inertia.x, inertia.y, inertia.z);
const float min = sead::Mathf::min3(inertia.x, inertia.y, inertia.z);
const float threshold = max * 0.8f;
bool need_to_recreate_motion = false;

6
src/KingSystem/Physics/RigidBody/physRigidBodyParam.h
View File

@ -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/seadRuntimeTypeInfo.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Physics/RigidBody/Shape/physShape.h"
#include "KingSystem/Physics/physDefines.h"
#include "KingSystem/Utils/Types.h"

6
src/KingSystem/Physics/RigidBody/physRigidBodySetParam.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

4
src/KingSystem/Physics/SupportBone/physSupportBoneParam.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

8
src/KingSystem/Physics/SupportBone/physSupportBoneResource.h
View File

@ -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 <resource/seadResource.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Utils/Types.h"
namespace ksys::phys {

6
src/KingSystem/Physics/System/physCharacterControllerParam.h
View File

@ -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/seadEnum.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

6
src/KingSystem/Physics/System/physContactInfoParam.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::phys {

17
src/KingSystem/Physics/System/physContactMgr.cpp
View File

@ -551,19 +551,20 @@ void ContactMgr::setImpulseEntryContactInfo(RigidBody* body_a, RigidBody* body_b
const auto relative_vel = linvel_a - linvel_b;
const auto dot_neg = [&](const auto& vec) { return vec.dot(-contact_point_normal); };
float magnitude = is_flag_off ? sead::Mathf::max(0.0, relative_vel.dot(-contact_point_normal)) :
sead::Mathf::max(0.0, relative_vel.length());
float magnitude = is_flag_off ?
sead::Mathf::clampMin(0.0, relative_vel.dot(-contact_point_normal)) :
sead::Mathf::clampMin(0.0, relative_vel.length());
if (magnitude >= entry->magnitude) {
float i1, i2;
if (is_flag_off) {
i1 = sead::Mathf::min(sead::Mathf::max(0.0, dot_neg(linvel_a)), magnitude);
i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.dot(contact_point_normal)),
sead::Mathf::max(0.0, dot_neg(relative_vel)));
i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, dot_neg(linvel_a)), magnitude);
i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.dot(contact_point_normal)),
sead::Mathf::clampMin(0.0, dot_neg(relative_vel)));
} else {
i1 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_a.length()), magnitude);
i2 = sead::Mathf::min(sead::Mathf::max(0.0, linvel_b.length()),
sead::Mathf::max(0.0, relative_vel.length()));
i1 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_a.length()), magnitude);
i2 = sead::Mathf::min(sead::Mathf::clampMin(0.0, linvel_b.length()),
sead::Mathf::clampMin(0.0, relative_vel.length()));
}
entry->magnitude = magnitude;

10
src/KingSystem/Physics/System/physContactMgr.h
View File

@ -1,10 +1,5 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <agl/utl/aglResParameter.h>
#include <container/seadBuffer.h>
#include <container/seadOffsetList.h>
#include <container/seadSafeArray.h>
@ -13,6 +8,11 @@
#include <prim/seadScopedLock.h>
#include <thread/seadAtomic.h>
#include <thread/seadMutex.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Physics/physDefines.h"
#include "KingSystem/Physics/physMaterialMask.h"
#include "KingSystem/Utils/Types.h"

10
src/KingSystem/Physics/System/physMaterialTable.h
View File

@ -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 <agl/utl/aglResParameter.h>
#include <container/seadSafeArray.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Physics/physDefines.h"
#include "KingSystem/Utils/Types.h"

6
src/KingSystem/Physics/System/physParamSet.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
namespace ksys::res {
class Physics;

10
src/KingSystem/Physics/System/physSystemData.h
View File

@ -1,12 +1,12 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <agl/utl/aglResParameter.h>
#include <container/seadSafeArray.h>
#include <prim/seadEnum.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Physics/physDefines.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Quest/qstManager.h
View File

@ -3,9 +3,9 @@
#include <container/seadObjArray.h>
#include <heap/seadDisposer.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include "KingSystem/Quest/qstQuest.h"
#include "KingSystem/Resource/resHandle.h"
#include "agl/utl/aglParameter.h"
namespace ksys::qst {

2
src/KingSystem/Quest/qstQuest.cpp
View File

@ -1,5 +1,5 @@
#include "KingSystem/Quest/qstQuest.h"
#include "agl/utl/aglParameter.h"
#include <utility/aglParameter.h>
namespace ksys::qst {

2
src/KingSystem/Resource/Actor/resResourceAIProgram.cpp
View File

@ -1,6 +1,6 @@
#include "KingSystem/Resource/Actor/resResourceAIProgram.h"
#include <agl/utl/aglParameter.h>
#include <heap/seadHeapMgr.h>
#include <utility/aglParameter.h>
#include "KingSystem/ActorSystem/actAiActionBase.h"
#include "KingSystem/ActorSystem/actAiClassDef.h"
#include "KingSystem/Resource/resCurrentResNameMgr.h"

6
src/KingSystem/Resource/Actor/resResourceAIProgram.h
View File

@ -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 <math/seadVector.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

6
src/KingSystem/Resource/Actor/resResourceAS.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

6
src/KingSystem/Resource/Actor/resResourceASList.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

4
src/KingSystem/Resource/Actor/resResourceASResource.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglResParameter.h>
#include <container/seadBuffer.h>
#include <prim/seadRuntimeTypeInfo.h>
#include <utility/aglParameterList.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Resource/Actor/resResourceASResourceExtension.h"
namespace ksys::res {

8
src/KingSystem/Resource/Actor/resResourceASResourceExtension.h
View File

@ -1,13 +1,13 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <agl/utl/aglResParameter.h>
#include <array>
#include <basis/seadTypes.h>
#include <container/seadBuffer.h>
#include <prim/seadRuntimeTypeInfo.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Utils/Types.h"
namespace sead {

4
src/KingSystem/Resource/Actor/resResourceActorCapture.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <math/seadVector.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

4
src/KingSystem/Resource/Actor/resResourceActorLink.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/ActorSystem/actTag.h"
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

6
src/KingSystem/Resource/Actor/resResourceAttCheck.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <prim/seadRuntimeTypeInfo.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "resResourceAttClient.h"
#include "resResourceAttPos.h"

6
src/KingSystem/Resource/Actor/resResourceAttClient.h
View File

@ -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>
#include "KingSystem/ActorSystem/Attention/actAttention.h"
#include "KingSystem/Resource/Actor/resResourceAttPos.h"
#include "KingSystem/Resource/resResource.h"

4
src/KingSystem/Resource/Actor/resResourceAttPos.h
View File

@ -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::res {

4
src/KingSystem/Resource/Actor/resResourceAwareness.h
View File

@ -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/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

6
src/KingSystem/Resource/Actor/resResourceBoneControl.h
View File

@ -1,11 +1,11 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <math/seadVector.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

4
src/KingSystem/Resource/Actor/resResourceDamageParam.h
View File

@ -1,7 +1,7 @@
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <prim/seadEnum.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

4
src/KingSystem/Resource/Actor/resResourceDrop.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/Actor/resResourceGParamList.cpp
View File

@ -1,6 +1,6 @@
#include "KingSystem/Resource/Actor/resResourceGParamList.h"
#include <agl/utl/aglParameter.h>
#include <prim/seadRuntimeTypeInfo.h>
#include <utility/aglParameter.h>
#include "KingSystem/ActorSystem/actActorParamMgr.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h"

4
src/KingSystem/Resource/Actor/resResourceLifeCondition.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

6
src/KingSystem/Resource/Actor/resResourceLod.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

4
src/KingSystem/Resource/Actor/resResourceModelList.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <prim/seadSafeString.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/ActorSystem/actInfoData.h"
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

6
src/KingSystem/Resource/Actor/resResourceRagdollBlendWeight.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

6
src/KingSystem/Resource/Actor/resResourceRagdollConfigList.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterList.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterList.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

4
src/KingSystem/Resource/Actor/resResourceRecipe.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

4
src/KingSystem/Resource/Actor/resResourceShop.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterObj.h>
#include <container/seadBuffer.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"

2
src/KingSystem/Resource/Actor/resResourceUMii.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglResParameter.h>
#include <utility/aglResParameter.h>
#include "KingSystem/Resource/resResource.h"
#include "KingSystem/Utils/ParamIO.h"
#include "KingSystem/Utils/Types.h"

6
src/KingSystem/Resource/Event/resResourceDemo.h
View File

@ -1,9 +1,9 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <agl/utl/aglParameterIO.h>
#include <agl/utl/aglParameterObj.h>
#include <resource/seadResource.h>
#include <utility/aglParameter.h>
#include <utility/aglParameterIO.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Utils/Types.h"
namespace ksys::res {

2
src/KingSystem/Resource/GeneralParamList/resGParamListObject.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <agl/utl/aglParameterObj.h>
#include <hostio/seadHostIONode.h>
#include <utility/aglParameterObj.h>
#include "KingSystem/Utils/Types.h"
namespace ksys::res {

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAirWall.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalFollowOffset.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAnimalUnit.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmor.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorEffect.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorHead.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectArmorUpper.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectArrow.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttack.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAttackInterval.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectAutoGen.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectBeam.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindActor.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectBindBone.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectBow.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectBullet.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectCamera.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectChemicalType.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectClothReaction.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectCookSpice.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectCureItem.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEatTarget.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemy.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyLevel.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyRace.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEnemyShown.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

2
src/KingSystem/Resource/GeneralParamList/resGParamListObjectEvent.h
View File

@ -1,6 +1,6 @@
#pragma once
#include <agl/utl/aglParameter.h>
#include <utility/aglParameter.h>
#include "KingSystem/Resource/GeneralParamList/resGParamListObject.h"
#include "KingSystem/Utils/Types.h"

Some files were not shown because too many files have changed in this diff Show More