Move al to library-like structure

CMakeLists.txt

@@ -34,6 +34,7 @@ foreach (SOURCE ${SOURCES_COMBINED})
 endforeach()
 
 target_include_directories(odyssey PRIVATE src)
+target_include_directories(odyssey PRIVATE lib/al/include)
 target_compile_definitions(odyssey PRIVATE NON_MATCHING)
 target_compile_options(odyssey PRIVATE -fno-rtti -fno-exceptions)
 target_compile_options(odyssey PRIVATE -Wall -Wextra -Wdeprecated)

Contributing.md

@@ -124,7 +124,7 @@ Before opening a PR, please format your code with clang-format 12 and ensure the
 
 * Use `#include "..."` when including `al` and `rs` (SMO) header files.
     * Include paths should be relative to lib/.
-        * OK: `#include "al/Library/LiveActor/LiveActor.h"`
+        * OK: `#include "Library/LiveActor/LiveActor.h"`
         * Not OK: `#include "LiveActor.h"`
 
 * Use `#include <...>` for system or library includes. Examples:

lib/al/Library/Scene/GameDataHolderBase.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Message/IUseMessageSystem.h"
-#include "al/Library/Scene/ISceneObj.h"
-
-namespace al {
-class GameDataHolderBase : public ISceneObj, HioNode, IUseMessageSystem {};
-}  // namespace al

lib/al/include/Library/Area/AreaInitInfo.h

@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class AudioDirector;

lib/al/include/Library/Audio/AudioDirector.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include <container/seadPtrArray.h>
-#include "al/audio/IAudioSystemPause.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/util/OtherUtil.h"
+#include "audio/IAudioSystemPause.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "util/OtherUtil.h"
 
 namespace aal {
 class AudioFrameProcessMgr;

lib/al/include/Library/Audio/AudioKeeper.h

@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class AudioDirector;

lib/al/include/Library/Camera/CameraDirector.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <math/seadMatrix.h>
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Execute/IUseExecutor.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Execute/IUseExecutor.h"
 
 namespace al {
 class SceneCameraInfo;

lib/al/include/Library/Camera/CameraPoser.h

@@ -5,13 +5,13 @@
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
 
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/HostIO/IUseName.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Rail/IUseRail.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/HostIO/IUseName.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Rail/IUseRail.h"
 
 namespace al {
 class CameraVerticalAbsorber;

lib/al/include/Library/Camera/SnapShotCameraCtrl.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <gfx/seadCamera.h>
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Nerve/NerveExecutor.h"
-#include "al/Library/Yaml/ByamlIter.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Nerve/NerveExecutor.h"
+#include "Library/Yaml/ByamlIter.h"
 
 struct CameraParam {
     bool gotMin;

lib/al/include/Library/Collision/Collider.h

@@ -3,8 +3,8 @@
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 struct SphereInterpolator;

lib/al/include/Library/Collision/CollisionDirector.h

@@ -3,7 +3,7 @@
 #include <container/seadPtrArray.h>
 #include <math/seadVector.h>
 #include <prim/seadDelegate.h>
-#include "al/Library/Execute/IUseExecutor.h"
+#include "Library/Execute/IUseExecutor.h"
 
 namespace al {
 class ICollisionPartsKeeper;

lib/al/include/Library/Execute/ExecuteTablesImpl.h

@@ -1,8 +1,8 @@
-#include "al/Library/Execute/ExecuteOrder.h"
-#include "al/Library/Execute/ExecuteTable.h"
+#include "Library/Execute/ExecuteOrder.h"
+#include "Library/Execute/ExecuteTable.h"
 
-#include "al/Library/Execute/ExecuteTableHolderDraw.h"
-#include "al/Library/Execute/ExecuteTableHolderUpdate.h"
+#include "Library/Execute/ExecuteTableHolderDraw.h"
+#include "Library/Execute/ExecuteTableHolderUpdate.h"
 
 static constexpr al::ExecuteOrder drawTableArr[] = {
     // ３Ｄ（カリング）

lib/al/include/Library/HitSensor/HitSensorKeeper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HitSensor/HitSensor.h"
+#include "Library/HitSensor/HitSensor.h"
 
 namespace al {
 class HitSensorKeeper {

lib/al/include/Library/Layout/IUseLayout.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class LayoutKeeper;

lib/al/include/Library/Layout/IUseLayoutAction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/IUseName.h"
+#include "Library/HostIO/IUseName.h"
 
 namespace al {
 class LayoutActionKeeper;

lib/al/include/Library/Layout/LayoutActor.h

@@ -1,15 +1,15 @@
 #pragma once
 
 #include <prim/seadSafeString.h>
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/Effect/IUseEffectKeeper.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Layout/IUseLayout.h"
-#include "al/Library/Layout/IUseLayoutAction.h"
-#include "al/Library/Message/IUseMessageSystem.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Scene/IUseSceneObjHolder.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/Effect/IUseEffectKeeper.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Layout/IUseLayout.h"
+#include "Library/Layout/IUseLayoutAction.h"
+#include "Library/Message/IUseMessageSystem.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Scene/IUseSceneObjHolder.h"
 
 namespace al {
 class NerveKeeper;

lib/al/include/Library/LiveActor/ActorCollisionFunction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 class TriangleFilterBase;

lib/al/include/Library/LiveActor/ActorFactory.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/Factory/Factory.h"
+#include "Library/Factory/Factory.h"
 
 namespace al {
 class LiveActor;

lib/al/include/Library/LiveActor/ActorInitInfo.h

@@ -7,9 +7,9 @@
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
 #include <prim/seadSafeString.h>
-#include "al/Library/LiveActor/ActorSceneInfo.h"
-#include "al/Library/Nerve/NerveUtil.h"
-#include "al/Library/Placement/PlacementInfo.h"
+#include "Library/LiveActor/ActorSceneInfo.h"
+#include "Library/Nerve/NerveUtil.h"
+#include "Library/Placement/PlacementInfo.h"
 
 namespace al {
 class LiveActor;

lib/al/include/Library/LiveActor/LiveActor.h

@@ -1,16 +1,16 @@
 #pragma once
 
 #include <math/seadMatrix.h>
-#include "al/Library/Area/IUseAreaObj.h"
-#include "al/Library/Audio/IUseAudioKeeper.h"
-#include "al/Library/Camera/IUseCamera.h"
-#include "al/Library/Collision/IUseCollision.h"
-#include "al/Library/Effect/IUseEffectKeeper.h"
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Nerve/IUseNerve.h"
-#include "al/Library/Rail/IUseRail.h"
-#include "al/Library/Scene/IUseSceneObjHolder.h"
-#include "al/Library/Stage/IUseStageSwitch.h"
+#include "Library/Area/IUseAreaObj.h"
+#include "Library/Audio/IUseAudioKeeper.h"
+#include "Library/Camera/IUseCamera.h"
+#include "Library/Collision/IUseCollision.h"
+#include "Library/Effect/IUseEffectKeeper.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Nerve/IUseNerve.h"
+#include "Library/Rail/IUseRail.h"
+#include "Library/Scene/IUseSceneObjHolder.h"
+#include "Library/Stage/IUseStageSwitch.h"
 
 namespace al {
 class ActorPoseKeeperBase;

lib/al/include/Library/LiveActor/LiveActorFunction.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 void isExistSubActorKeeper(const LiveActor*);

lib/al/include/Library/LiveActor/LiveActorGroup.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class LiveActor;

lib/al/include/Library/LiveActor/LiveActorUtil.h

@@ -4,8 +4,8 @@
 #include <math/seadQuat.h>
 #include <math/seadVector.h>
 #include <prim/seadSafeString.h>
-#include "al/Library/LiveActor/LiveActor.h"
-#include "al/Library/Nerve/Nerve.h"
+#include "Library/LiveActor/LiveActor.h"
+#include "Library/Nerve/Nerve.h"
 
 namespace al {
 

lib/al/include/Library/LiveActor/SubActorKeeper.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/LiveActor/ActorInitInfo.h"
+#include "Library/LiveActor/ActorInitInfo.h"
 
 // TODO: bring this up to sanae
 // temp solution to figure out a solution to bitflag enums (stole this right from nvn headers)

lib/al/include/Library/MapObj/FixMapParts.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 class FixMapParts : public LiveActor {

lib/al/include/Library/Model/ModelDrawerBase.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace agl {
 class DrawContext;

lib/al/include/Library/Model/ModelKeeper.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
+#include "Library/HostIO/HioNode.h"
 
 namespace al {
 class ActorResource;

lib/al/include/Library/Model/PartsModel.h

@@ -2,7 +2,7 @@
 
 #include <math/seadMatrix.h>
 #include <math/seadVector.h>
-#include "al/Library/LiveActor/LiveActor.h"
+#include "Library/LiveActor/LiveActor.h"
 
 namespace al {
 

lib/al/include/Library/Nerve/NerveAction.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveUtil.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveUtil.h"
 
 namespace al {
 class NerveAction : public Nerve {

lib/al/include/Library/Nerve/NerveExecutor.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/HostIO/HioNode.h"
-#include "al/Library/Nerve/IUseNerve.h"
+#include "Library/HostIO/HioNode.h"
+#include "Library/Nerve/IUseNerve.h"
 
 namespace al {
 class Nerve;

lib/al/include/Library/Nerve/NerveSetupUtil.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "al/Library/Nerve/Nerve.h"
-#include "al/Library/Nerve/NerveKeeper.h"
+#include "Library/Nerve/Nerve.h"
+#include "Library/Nerve/NerveKeeper.h"
 
 /*