Move factory classes to `Runtime/Factory`, remove useless functionality from DataSpec tweaks

DataSpec/DNACommon/Tweaks/ITweakGunRes.hpp

@@ -3,140 +3,9 @@
 #include <array>
 
 #include "ITweak.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/CPlayerState.hpp"
 
 namespace DataSpec {
 
-struct ITweakGunRes : ITweak {
-  using ResId = metaforce::CAssetId;
-  using EBeamId = metaforce::CPlayerState::EBeamId;
-
-  ResId x4_gunMotion;
-  ResId x8_grappleArm;
-  ResId xc_rightHand;
-
-  ResId x10_powerBeam;
-  ResId x14_iceBeam;
-  ResId x18_waveBeam;
-  ResId x1c_plasmaBeam;
-  ResId x20_phazonBeam;
-
-  ResId x24_holoTransition;
-
-  ResId x28_bombSet;
-  ResId x2c_bombExplode;
-  ResId x30_powerBombExplode;
-
-  /* Power, Ice, Wave, Plasma, Phazon / Beam, Ball */
-  using WeaponPair = std::array<ResId, 2>;
-  std::array<WeaponPair, 5> x34_weapons;
-  std::array<ResId, 5> x84_muzzle;
-  std::array<ResId, 5> x94_charge;
-  std::array<ResId, 5> xa4_auxMuzzle;
-
-  ResId xb4_grappleSegment;
-  ResId xb8_grappleClaw;
-  ResId xbc_grappleHit;
-  ResId xc0_grappleMuzzle;
-  ResId xc4_grappleSwoosh;
-
-  ResId GetBeamModel(EBeamId beam) const {
-    auto b = int(beam);
-    if (b < 0 || b > 4)
-      b = 0;
-    switch (EBeamId(b)) {
-    default:
-    case EBeamId::Power:
-      return x10_powerBeam;
-    case EBeamId::Ice:
-      return x14_iceBeam;
-    case EBeamId::Wave:
-      return x18_waveBeam;
-    case EBeamId::Plasma:
-      return x1c_plasmaBeam;
-    case EBeamId::Phazon:
-      return x20_phazonBeam;
-    }
-  }
-
-  const WeaponPair& GetWeaponPair(EBeamId beam) const {
-    const auto b = int(beam);
-    if (b < 0 || b > 4) {
-      return x34_weapons[0];
-    }
-    return x34_weapons[b];
-  }
-
-  void ResolveResources(const metaforce::IFactory& factory) {
-    x4_gunMotion = factory.GetResourceIdByName(GetGunMotion())->id;
-    x8_grappleArm = factory.GetResourceIdByName(GetGrappleArm())->id;
-    xc_rightHand = factory.GetResourceIdByName(GetRightHand())->id;
-
-    x10_powerBeam = factory.GetResourceIdByName(GetPowerBeam())->id;
-    x14_iceBeam = factory.GetResourceIdByName(GetIceBeam())->id;
-    x18_waveBeam = factory.GetResourceIdByName(GetWaveBeam())->id;
-    x1c_plasmaBeam = factory.GetResourceIdByName(GetPlasmaBeam())->id;
-    x20_phazonBeam = factory.GetResourceIdByName(GetPhazonBeam())->id;
-
-    x24_holoTransition = factory.GetResourceIdByName(GetHoloTransition())->id;
-
-    x28_bombSet = factory.GetResourceIdByName(GetBombSet())->id;
-    x2c_bombExplode = factory.GetResourceIdByName(GetBombExplode())->id;
-    x30_powerBombExplode = factory.GetResourceIdByName(GetPowerBombExplode())->id;
-
-    for (size_t i = 0; i < x34_weapons.size(); ++i) {
-      for (size_t j = 0; j < x34_weapons[i].size(); ++j) {
-        x34_weapons[i][j] = factory.GetResourceIdByName(GetWeapon(i, j != 0))->id;
-      }
-    }
-
-    for (size_t i = 0; i < x84_muzzle.size(); ++i) {
-      x84_muzzle[i] = factory.GetResourceIdByName(GetMuzzleParticle(i))->id;
-    }
-
-    for (size_t i = 0; i < x94_charge.size(); ++i) {
-      x94_charge[i] = factory.GetResourceIdByName(GetChargeParticle(i))->id;
-    }
-
-    for (size_t i = 0; i < xa4_auxMuzzle.size(); ++i) {
-      xa4_auxMuzzle[i] = factory.GetResourceIdByName(GetAuxMuzzleParticle(i))->id;
-    }
-
-    xb4_grappleSegment = factory.GetResourceIdByName(GetGrappleSegmentParticle())->id;
-    xb8_grappleClaw = factory.GetResourceIdByName(GetGrappleClawParticle())->id;
-    xbc_grappleHit = factory.GetResourceIdByName(GetGrappleHitParticle())->id;
-    xc0_grappleMuzzle = factory.GetResourceIdByName(GetGrappleMuzzleParticle())->id;
-    xc4_grappleSwoosh = factory.GetResourceIdByName(GetGrappleSwooshParticle())->id;
-  }
-
-protected:
-  virtual const std::string& GetGunMotion() const = 0;
-  virtual const std::string& GetGrappleArm() const = 0;
-  virtual const std::string& GetRightHand() const = 0;
-
-  virtual const std::string& GetPowerBeam() const = 0;
-  virtual const std::string& GetIceBeam() const = 0;
-  virtual const std::string& GetWaveBeam() const = 0;
-  virtual const std::string& GetPlasmaBeam() const = 0;
-  virtual const std::string& GetPhazonBeam() const = 0;
-
-  virtual const std::string& GetHoloTransition() const = 0;
-
-  virtual const std::string& GetBombSet() const = 0;
-  virtual const std::string& GetBombExplode() const = 0;
-  virtual const std::string& GetPowerBombExplode() const = 0;
-
-  virtual const std::string& GetWeapon(size_t idx, bool ball) const = 0;
-  virtual const std::string& GetMuzzleParticle(size_t idx) const = 0;
-  virtual const std::string& GetChargeParticle(size_t idx) const = 0;
-  virtual const std::string& GetAuxMuzzleParticle(size_t idx) const = 0;
-
-  virtual const std::string& GetGrappleSegmentParticle() const = 0;
-  virtual const std::string& GetGrappleClawParticle() const = 0;
-  virtual const std::string& GetGrappleHitParticle() const = 0;
-  virtual const std::string& GetGrappleMuzzleParticle() const = 0;
-  virtual const std::string& GetGrappleSwooshParticle() const = 0;
-};
+struct ITweakGunRes : ITweak {};
 
 } // namespace DataSpec

DataSpec/DNACommon/Tweaks/ITweakPlayerRes.hpp

@@ -1,176 +1,9 @@
 #pragma once
 
-#include <array>
-
 #include "ITweak.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/CPlayerState.hpp"
 
 namespace DataSpec {
 
-struct ITweakPlayerRes : ITweak {
-  using ResId = metaforce::CAssetId;
-  using EBeamId = metaforce::CPlayerState::EBeamId;
-
-  ResId x4_saveStationIcon;
-  ResId x8_missileStationIcon;
-  ResId xc_elevatorIcon;
-
-  ResId x10_minesBreakFirstTopIcon;
-  ResId x14_minesBreakFirstBottomIcon;
-  ResId x18_minesBreakSecondTopIcon;
-  ResId x1c_minesBreakSecondBottomIcon;
-
-  ResId rs5_mapArrowUp;
-  ResId rs5_mapArrowDown;
-
-  /* N, U, UL, L, DL, D, DR, R, UR */
-  std::array<ResId, 9> x24_lStick;
-  std::array<ResId, 9> x4c_cStick;
-
-  /* Out, In */
-  std::array<ResId, 2> x74_lTrigger;
-  std::array<ResId, 2> x80_rTrigger;
-  std::array<ResId, 2> x8c_startButton;
-  std::array<ResId, 2> x98_aButton;
-  std::array<ResId, 2> xa4_bButton;
-  std::array<ResId, 2> xb0_xButton;
-  std::array<ResId, 2> xbc_yButton;
-
-  ResId xc4_ballTransitionsANCS;
-
-  /* Power, Ice, Wave, Plasma, Phazon */
-  std::array<ResId, 5> xc8_ballTransitions;
-  std::array<ResId, 5> xdc_cineGun;
-
-  float xf0_cinematicMoveOutofIntoPlayerDistance;
-
-  ResId GetBeamBallTransitionModel(EBeamId beam) const {
-    auto b = size_t(beam);
-    if (b >= xc8_ballTransitions.size()) {
-      b = 0;
-    }
-    switch (EBeamId(b)) {
-    case EBeamId::Power:
-    default:
-      return xc8_ballTransitions[0];
-    case EBeamId::Ice:
-      return xc8_ballTransitions[1];
-    case EBeamId::Wave:
-      return xc8_ballTransitions[2];
-    case EBeamId::Plasma:
-      return xc8_ballTransitions[3];
-    case EBeamId::Phazon:
-      return xc8_ballTransitions[4];
-    }
-  }
-
-  ResId GetBeamCineModel(EBeamId beam) const {
-    auto b = size_t(beam);
-    if (b >= xdc_cineGun.size()) {
-      b = 0;
-    }
-    switch (EBeamId(b)) {
-    case EBeamId::Power:
-    default:
-      return xdc_cineGun[0];
-    case EBeamId::Ice:
-      return xdc_cineGun[1];
-    case EBeamId::Wave:
-      return xdc_cineGun[2];
-    case EBeamId::Plasma:
-      return xdc_cineGun[3];
-    case EBeamId::Phazon:
-      return xdc_cineGun[4];
-    }
-  }
-
-  void ResolveResources(const metaforce::IFactory& factory) {
-    x4_saveStationIcon = factory.GetResourceIdByName(_GetSaveStationIcon())->id;
-    x8_missileStationIcon = factory.GetResourceIdByName(_GetMissileStationIcon())->id;
-    xc_elevatorIcon = factory.GetResourceIdByName(_GetElevatorIcon())->id;
-
-    x10_minesBreakFirstTopIcon = factory.GetResourceIdByName(_GetMinesBreakFirstTopIcon())->id;
-    x14_minesBreakFirstBottomIcon = factory.GetResourceIdByName(_GetMinesBreakFirstBottomIcon())->id;
-    x18_minesBreakSecondTopIcon = factory.GetResourceIdByName(_GetMinesBreakSecondTopIcon())->id;
-    x1c_minesBreakSecondBottomIcon = factory.GetResourceIdByName(_GetMinesBreakSecondBottomIcon())->id;
-
-    for (size_t i = 0; i < x24_lStick.size(); ++i) {
-      x24_lStick[i] = factory.GetResourceIdByName(_GetLStick(i))->id;
-    }
-
-    for (size_t i = 0; i < x4c_cStick.size(); ++i) {
-      x4c_cStick[i] = factory.GetResourceIdByName(_GetCStick(i))->id;
-    }
-
-    for (size_t i = 0; i < x74_lTrigger.size(); ++i) {
-      x74_lTrigger[i] = factory.GetResourceIdByName(_GetLTrigger(i))->id;
-    }
-
-    for (size_t i = 0; i < x80_rTrigger.size(); ++i) {
-      x80_rTrigger[i] = factory.GetResourceIdByName(_GetRTrigger(i))->id;
-    }
-
-    for (size_t i = 0; i < x8c_startButton.size(); ++i) {
-      x8c_startButton[i] = factory.GetResourceIdByName(_GetStartButton(i))->id;
-    }
-
-    for (size_t i = 0; i < x98_aButton.size(); ++i) {
-      x98_aButton[i] = factory.GetResourceIdByName(_GetAButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xa4_bButton.size(); ++i) {
-      xa4_bButton[i] = factory.GetResourceIdByName(_GetBButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xb0_xButton.size(); ++i) {
-      xb0_xButton[i] = factory.GetResourceIdByName(_GetXButton(i))->id;
-    }
-
-    for (size_t i = 0; i < xbc_yButton.size(); ++i) {
-      xbc_yButton[i] = factory.GetResourceIdByName(_GetYButton(i))->id;
-    }
-
-    xc4_ballTransitionsANCS = factory.GetResourceIdByName(_GetBallTransitionsANCS())->id;
-
-    for (size_t i = 0; i < xc8_ballTransitions.size(); ++i) {
-      xc8_ballTransitions[i] = factory.GetResourceIdByName(_GetBallTransitionBeamRes(i))->id;
-    }
-
-    for (size_t i = 0; i < xdc_cineGun.size(); ++i) {
-      xdc_cineGun[i] = factory.GetResourceIdByName(_GetBeamCineModel(i))->id;
-    }
-
-    xf0_cinematicMoveOutofIntoPlayerDistance = _GetCinematicMoveOutofIntoPlayerDistance();
-  }
-
-protected:
-  virtual std::string_view _GetSaveStationIcon() const = 0;
-  virtual std::string_view _GetMissileStationIcon() const = 0;
-  virtual std::string_view _GetElevatorIcon() const = 0;
-
-  virtual std::string_view _GetMinesBreakFirstTopIcon() const = 0;
-  virtual std::string_view _GetMinesBreakFirstBottomIcon() const = 0;
-  virtual std::string_view _GetMinesBreakSecondTopIcon() const = 0;
-  virtual std::string_view _GetMinesBreakSecondBottomIcon() const = 0;
-
-  virtual std::string_view _GetLStick(size_t idx) const = 0;
-  virtual std::string_view _GetCStick(size_t idx) const = 0;
-
-  virtual std::string_view _GetLTrigger(size_t idx) const = 0;
-  virtual std::string_view _GetRTrigger(size_t idx) const = 0;
-  virtual std::string_view _GetStartButton(size_t idx) const = 0;
-  virtual std::string_view _GetAButton(size_t idx) const = 0;
-  virtual std::string_view _GetBButton(size_t idx) const = 0;
-  virtual std::string_view _GetXButton(size_t idx) const = 0;
-  virtual std::string_view _GetYButton(size_t idx) const = 0;
-
-  virtual std::string_view _GetBallTransitionsANCS() const = 0;
-
-  virtual std::string_view _GetBallTransitionBeamRes(size_t idx) const = 0;
-  virtual std::string_view _GetBeamCineModel(size_t idx) const = 0;
-
-  virtual float _GetCinematicMoveOutofIntoPlayerDistance() const = 0;
-};
+struct ITweakPlayerRes : ITweak {};
 
 } // namespace DataSpec

Runtime/Audio/CAudioGroupSet.hpp

@@ -3,10 +3,10 @@
 #include <memory>
 #include <string>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 #include <amuse/AudioGroupData.hpp>

Runtime/Audio/CAudioSys.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace metaforce {

Runtime/Audio/CSfxManager.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Streams/CInputStream.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 
 namespace metaforce {
 static TLockedToken<std::vector<u16>> mpSfxTranslationTableTok;

Runtime/AutoMapper/CAutoMapper.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/AutoMapper/CAutoMapper.hpp"
 
 #include "Runtime/CInGameTweakManagerBase.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/AutoMapper/CMapArea.hpp"
 #include "Runtime/AutoMapper/CMapUniverse.hpp"

Runtime/AutoMapper/CMapArea.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Runtime/AutoMapper/CMappableObject.hpp"
-#include "Runtime/CResFactory.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
 #include "Runtime/Graphics/CLineRenderer.hpp"
 #include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
 #include "Runtime/RetroTypes.hpp"

Runtime/AutoMapper/CMapUniverse.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/AutoMapper/CMapUniverse.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CGameState.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 

Runtime/AutoMapper/CMapUniverse.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/AutoMapper/CMapArea.hpp"
 

Runtime/AutoMapper/CMapWorld.cpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/AutoMapper/CMapWorldInfo.hpp"

Runtime/AutoMapper/CMappableObject.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/AutoMapper/CMappableObject.hpp"
 
 #include "Runtime/AutoMapper/CMapWorldInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/GameGlobalObjects.hpp"

Runtime/CDependencyGroup.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 
 namespace metaforce {
 class CDependencyGroup {

Runtime/CGameHintInfo.hpp

@@ -3,7 +3,7 @@
 #include <string_view>
 #include <vector>
 
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {

Runtime/CGameOptions.cpp

@@ -6,7 +6,7 @@
 #include "Runtime/CGameState.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
 #include "Runtime/CWorldSaveGameInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"

Runtime/CGameState.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/CMemoryCardSys.hpp"
 #include "Runtime/CWorldSaveGameInfo.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/MP1/MP1.hpp"

Runtime/CMakeLists.txt

@@ -101,28 +101,28 @@ set(RUNTIME_SOURCES_B
         CScriptMailbox.hpp CScriptMailbox.cpp
         CPlayerState.hpp CPlayerState.cpp
         CRandom16.hpp CRandom16.cpp
-        CResFactory.hpp CResFactory.cpp
-        CResLoader.hpp CResLoader.cpp
+        Factory/CResFactory.hpp Factory/CResFactory.cpp
+        Factory/CResLoader.hpp Factory/CResLoader.cpp
         CDvdRequest.hpp
         CDvdFile.hpp CDvdFile.cpp
-        IObjectStore.hpp
-        CSimplePool.hpp CSimplePool.cpp
+        Factory/IObjectStore.hpp
+        Factory/CSimplePool.hpp Factory/CSimplePool.cpp
         CGameOptions.hpp CGameOptions.cpp
         CGameOptionsTouchBar.hpp CGameOptionsTouchBar.cpp
         CStaticInterference.hpp CStaticInterference.cpp
         CCRC32.hpp CCRC32.cpp
-        IFactory.hpp
-        IObjFactory.hpp
+        Factory/IFactory.hpp
+        Factory/IObjFactory.hpp
         CObjectList.hpp CObjectList.cpp
         GameObjectLists.hpp GameObjectLists.cpp
         CSortedLists.hpp CSortedLists.cpp
         CArchitectureMessage.hpp
         CArchitectureQueue.hpp
-        IObj.hpp
-        IVParamObj.hpp
+        Factory/IObj.hpp
+        Factory/IVParamObj.hpp
         CTimeProvider.hpp CTimeProvider.cpp
         CToken.hpp CToken.cpp
-        CFactoryMgr.hpp CFactoryMgr.cpp
+        Factory/CFactoryMgr.hpp Factory/CFactoryMgr.cpp
         CPakFile.hpp CPakFile.cpp
         CStringExtras.hpp CStringExtras.cpp
         CMainFlowBase.hpp CMainFlowBase.cpp

Runtime/CMemoryCardSys.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/CCRC32.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"

Runtime/CPakFile.hpp

@@ -6,7 +6,7 @@
 
 #include "Runtime/CDvdFile.hpp"
 #include "Runtime/CDvdRequest.hpp"
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CStringExtras.hpp"
 #include "Runtime/RetroTypes.hpp"
 

Runtime/CScannableObjectInfo.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/rstl.hpp"
 

Runtime/CToken.hpp

@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObj.hpp"
-#include "Runtime/IObjectStore.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {

Runtime/CWorldSaveGameInfo.hpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {

Runtime/Camera/CCameraFilter.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/Camera/CCameraFilter.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"

Runtime/Character/CAllFormatsAnimSource.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/Character/CAllFormatsAnimSource.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAnimSourceReader.hpp"
 #include "Runtime/Character/CFBStreamedAnimReader.hpp"
 

Runtime/Character/CAllFormatsAnimSource.hpp

@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Character/CAnimSource.hpp"
 #include "Runtime/Character/CFBStreamedCompression.hpp"

Runtime/Character/CAnimCharacterSet.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Character/CAnimationSet.hpp"
 #include "Runtime/Character/CCharacterSet.hpp"
 

Runtime/Character/CAnimPOIData.hpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/GCNTypes.hpp"
 #include "Runtime/Character/CBoolPOINode.hpp"
 #include "Runtime/Character/CInt32POINode.hpp"

Runtime/Character/CAssetFactory.hpp

@@ -3,10 +3,10 @@
 #include <functional>
 #include <memory>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObj.hpp"
 
 namespace metaforce {
 class CCharacterFactory;

Runtime/Character/CCharLayoutInfo.hpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Character/CSegId.hpp"
 #include "Runtime/Character/CSegIdList.hpp"

Runtime/Character/CCharacterFactory.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/Character/CCharacterFactory.hpp"
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CAdditiveAnimPlayback.hpp"
 #include "Runtime/Character/CAnimCharacterSet.hpp"

Runtime/Character/CCharacterFactory.hpp

@@ -5,10 +5,10 @@
 #include <utility>
 #include <vector>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IObjFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
+#include "Runtime/Factory/IObjFactory.hpp"
 #include "Runtime/Character/CAnimationSet.hpp"
 
 namespace metaforce {

Runtime/Character/CMetaAnimPlay.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/Character/CMetaAnimPlay.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAllFormatsAnimSource.hpp"
 #include "Runtime/Character/CAnimSysContext.hpp"
 #include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"

Runtime/Character/CParticleDatabase.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/Character/CParticleDatabase.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/Character/CPoseAsTransforms.hpp"

Runtime/Character/CSkinRules.hpp

@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Character/CSkinBank.hpp"
 #include "Runtime/RetroTypes.hpp"
 

Runtime/Collision/CCollidableOBBTreeGroup.hpp

@@ -3,7 +3,7 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Collision/COBBTree.hpp"
 #include "Runtime/Collision/CCollisionPrimitive.hpp"

Runtime/Collision/CCollisionResponseData.cpp

@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CRandom16.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Particle/CDecalDescription.hpp"
 #include "Runtime/Particle/CElectricDescription.hpp"

Runtime/Collision/CCollisionResponseData.hpp

@@ -3,10 +3,10 @@
 #include <optional>
 #include <vector>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 #include "Runtime/Collision/CMaterialList.hpp"
 #include "Runtime/Particle/CDecalDescription.hpp"

Runtime/Factory/CFactoryMgr.cpp

@@ -1,4 +1,4 @@
-#include "Runtime/CFactoryMgr.hpp"
+#include "CFactoryMgr.hpp"
 
 #include <algorithm>
 #include <array>
@@ -7,7 +7,7 @@
 #include "optick.h"
 
 #include "Runtime/CStopwatch.hpp"
-#include "Runtime/IObj.hpp"
+#include "IObj.hpp"
 
 namespace metaforce {
 constexpr std::array TypeTable{

Runtime/Factory/CFactoryMgr.hpp

@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 
-#include "Runtime/IFactory.hpp"
+#include "IFactory.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/RetroTypes.hpp"
 

Runtime/Factory/CResFactory.cpp

@@ -1,6 +1,6 @@
-#include "Runtime/CResFactory.hpp"
+#include "CResFactory.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "CSimplePool.hpp"
 #include "Runtime/CStopwatch.hpp"
 #include "optick.h"
 

Runtime/Factory/CResFactory.hpp

@@ -5,10 +5,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Runtime/CResLoader.hpp"
+#include "CResLoader.hpp"
 #include "Runtime/CToken.hpp"
-#include "Runtime/IFactory.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "IFactory.hpp"
+#include "IVParamObj.hpp"
 
 namespace metaforce {
 class IDvdRequest;

Runtime/Factory/CResLoader.cpp

@@ -1,4 +1,4 @@
-#include "Runtime/CResLoader.hpp"
+#include "CResLoader.hpp"
 
 #include "Runtime/CPakFile.hpp"
 

Runtime/Factory/CSimplePool.cpp

@@ -1,7 +1,7 @@
-#include "Runtime/CSimplePool.hpp"
+#include "CSimplePool.hpp"
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 
 #include <cassert>
 

Runtime/Factory/CSimplePool.hpp

@@ -3,8 +3,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Runtime/IObjectStore.hpp"
-#include "Runtime/IVParamObj.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
+#include "Runtime/Factory/IVParamObj.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {

Runtime/Factory/IVParamObj.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "Runtime/IObj.hpp"
+#include "IObj.hpp"
 
 namespace metaforce {
 

Runtime/Graphics/CCubeMaterial.hpp

@@ -6,7 +6,7 @@
 #include "CToken.hpp"
 #include "GCNTypes.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeModel;

Runtime/Graphics/CCubeModel.cpp

@@ -1,6 +1,6 @@
 #include "CCubeModel.hpp"
 
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Graphics/CCubeMaterial.hpp"
 #include "Graphics/CCubeSurface.hpp"
 #include "Graphics/CGraphics.hpp"

Runtime/Graphics/CCubeModel.hpp

@@ -7,7 +7,7 @@
 #include "CToken.hpp"
 #include "GCNTypes.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeSurface;

Runtime/Graphics/CModel.hpp

@@ -7,7 +7,7 @@
 #include "GCNTypes.hpp"
 #include "Graphics/CCubeModel.hpp"
 #include "Graphics/CTexture.hpp"
-#include "IObjectStore.hpp"
+#include "Runtime/Factory/IObjectStore.hpp"
 
 namespace metaforce {
 class CCubeSurface;

Runtime/Graphics/CModel.hpp.old

@@ -7,7 +7,7 @@
 
 //#include "DataSpec/DNACommon/CMDL.hpp"
 //#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/Graphics/Shaders/CModelShaders.hpp"

Runtime/Graphics/CModelBoo.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/Graphics/CModel.hpp"
 
 #include "Runtime/CBasics.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CSkinRules.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/Graphics/CTexture.hpp

@@ -3,9 +3,9 @@
 #include <memory>
 #include <string>
 
-#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/Factory/CFactoryMgr.hpp"
 #include "Runtime/GCNTypes.hpp"
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 

Runtime/Graphics/CTextureBoo.cpp

@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/CBasics.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CTextureCache.hpp"
 #include "Runtime/CToken.hpp"
 #include "Runtime/GameGlobalObjects.hpp"

Runtime/GuiSys/CAuiEnergyBarT01.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"
 #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 

Runtime/GuiSys/CAuiImagePane.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CAuiImagePane.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"

Runtime/GuiSys/CCompoundTargetReticle.cpp

@@ -3,7 +3,7 @@
 #include <cstdlib>
 
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"
 #include "Runtime/World/CPlayer.hpp"

Runtime/GuiSys/CGuiFrame.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"

Runtime/GuiSys/CGuiFrame.hpp

@@ -5,7 +5,7 @@
 #include <memory>
 #include <vector>
 
-#include "Runtime/IObj.hpp"
+#include "Runtime/Factory/IObj.hpp"
 #include "Runtime/GuiSys/CGuiHeadWidget.hpp"
 #include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
 #include "Runtime/GuiSys/CGuiWidget.hpp"

Runtime/GuiSys/CGuiModel.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiModel.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"

Runtime/GuiSys/CGuiSys.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CGuiSys.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 #include "Runtime/GuiSys/CAuiImagePane.hpp"
 #include "Runtime/GuiSys/CAuiMeter.hpp"

Runtime/GuiSys/CGuiTextSupport.cpp

@@ -2,7 +2,7 @@
 
 #include <fmt/xchar.h>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"
 #include "Runtime/Graphics/CGraphicsPalette.hpp"
 #include "Runtime/GuiSys/CFontImageDef.hpp"

Runtime/GuiSys/CHudDecoInterface.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CHudDecoInterface.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"

Runtime/GuiSys/CHudRadarInterface.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/GuiSys/CHudRadarInterface.hpp"
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"

Runtime/GuiSys/COrbitPointMarker.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/COrbitPointMarker.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"

Runtime/GuiSys/CRasterFont.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CDrawStringOptions.hpp"
 #include "Runtime/GuiSys/CTextRenderBuffer.hpp"

Runtime/GuiSys/CScanDisplay.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/GuiSys/CScanDisplay.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/GuiSys/CSplashScreen.cpp

@@ -2,7 +2,7 @@
 
 #include "CArchitectureMessage.hpp"
 #include "CArchitectureQueue.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "GameGlobalObjects.hpp"
 #include "Graphics/CCubeRenderer.hpp"
 

Runtime/GuiSys/CStringTable.hpp

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "Runtime/IFactory.hpp"
+#include "Runtime/Factory/IFactory.hpp"
 #include "Runtime/RetroTypes.hpp"
 
 namespace metaforce {

Runtime/MP1/CArtifactDoll.cpp

@@ -4,7 +4,7 @@
 #include <array>
 #include <cmath>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/MP1/CCredits.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/CArchitectureMessage.hpp"
 #include "Runtime/CArchitectureQueue.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"
 #include "Runtime/Graphics/CGraphics.hpp"

Runtime/MP1/CFaceplateDecoration.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CFaceplateDecoration.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CGenDescription.hpp"

Runtime/MP1/CFrontEndUI.cpp

@@ -12,7 +12,7 @@
 #include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CDvdFile.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CAudioGroupSet.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"

Runtime/MP1/CGameCubeDoll.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CGameCubeDoll.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CModel.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/MP1/CInGameGuiManager.cpp

@@ -4,7 +4,7 @@
 #include <array>
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/AutoMapper/CAutoMapper.hpp"

Runtime/MP1/CMainFlow.cpp

@@ -3,7 +3,7 @@
 #include "NESEmulator/CNESEmulator.hpp"
 
 #include "Runtime/CArchitectureQueue.hpp"
-#include "Runtime/CResFactory.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CCharLayoutInfo.hpp"
 #include "Runtime/MP1/CCredits.hpp"

Runtime/MP1/CMessageScreen.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/MP1/CMessageScreen.hpp"
 
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/GuiSys/CGuiModel.hpp"

Runtime/MP1/CPauseScreen.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPauseScreen.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/GuiSys/CGuiSys.hpp"

Runtime/MP1/CPauseScreenBlur.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPauseScreenBlur.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 

Runtime/MP1/CPlayerVisor.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPlayerVisor.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CGameCamera.hpp"

Runtime/MP1/CPreFrontEnd.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CPreFrontEnd.hpp"
 
-#include "Runtime/CResLoader.hpp"
+#include "Runtime/Factory/CResLoader.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 #include "Runtime/MP1/MP1.hpp"

Runtime/MP1/CQuitGameScreen.cpp

@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Runtime/GameGlobalObjects.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Input/CFinalInput.hpp"

Runtime/MP1/CSamusDoll.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/MP1/CSamusDoll.hpp"
 
 #include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Collision/CollisionUtil.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/MP1/CSamusHud.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/CSamusHud.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
 #include "Runtime/GuiSys/CGuiCamera.hpp"

Runtime/MP1/CSaveGameScreen.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CGuiTableGroup.hpp"

Runtime/MP1/CSlideShow.cpp

@@ -4,7 +4,7 @@
 
 #include "Runtime/CArchitectureMessage.hpp"
 #include "Runtime/CGameState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 
 namespace metaforce {

Runtime/MP1/CSplashScreen.cpp

@@ -1,6 +1,6 @@
 #include "CSplashScreen.hpp"
 #include "Graphics/CGraphics.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "CArchitectureQueue.hpp"
 #include "CArchitectureMessage.hpp"
 

Runtime/MP1/MP1.hpp

@@ -6,8 +6,8 @@
 #include "Runtime/Streams/IOStreams.hpp"
 #include "Runtime/CBasics.hpp"
 #include "Runtime/CMemoryCardSys.hpp"
-#include "Runtime/CResFactory.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CResFactory.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/Character/CAssetFactory.hpp"
 #include "Runtime/World/CAi.hpp"
 #include "Runtime/CGameState.hpp"

Runtime/MP1/World/CActorContraption.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CActorContraption.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CInt32POINode.hpp"

Runtime/MP1/World/CAtomicBeta.cpp

@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CWeaponDescription.hpp"

Runtime/MP1/World/CBabygoth.cpp

@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"

Runtime/MP1/World/CBloodFlower.cpp

@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Particle/CElementGen.hpp"

Runtime/MP1/World/CBouncyGrenade.cpp

@@ -1,7 +1,7 @@
 #include "Runtime/MP1/World/CBouncyGrenade.hpp"
 
 #include "Runtime/CPlayerState.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/MP1/World/CChozoGhost.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/CStateManager.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CRandom16.hpp"
 #include "Runtime/Character/CPASAnimParmData.hpp"
 #include "Runtime/Weapon/CGameProjectile.hpp"

Runtime/MP1/World/CDrone.cpp

@@ -2,7 +2,7 @@
 
 #include "Runtime/Audio/CSfxManager.hpp"
 #include "Runtime/Collision/CGameCollision.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/World/CDroneLaser.hpp"

Runtime/MP1/World/CDroneLaser.cpp

@@ -1,6 +1,6 @@
 #include "Runtime/MP1/World/CDroneLaser.hpp"
 
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/Graphics/CCubeRenderer.hpp"

Runtime/MP1/World/CElitePirate.cpp

@@ -6,7 +6,7 @@
 #include "Runtime/Camera/CFirstPersonCamera.hpp"
 #include "Runtime/Collision/CCollisionActor.hpp"
 #include "Runtime/Collision/CCollisionActorManager.hpp"
-#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Factory/CSimplePool.hpp"
 #include "Runtime/CStateManager.hpp"
 #include "Runtime/GameGlobalObjects.hpp"
 #include "Runtime/MP1/World/CGrenadeLauncher.hpp"