General: Normalize RuntimeCommonB include paths

Finishes the normalizing of all of includes within the RuntimeCommonB target's headers.
This commit is contained in:
Lioncash 2019-09-23 15:00:23 -04:00
parent d6b70f37c2
commit 36d04456dd
144 changed files with 945 additions and 450 deletions

View File

@ -1,7 +1,7 @@
#pragma once
#include "CIOWin.hpp"
#include "Graphics/CMoviePlayer.hpp"
#include "Runtime/CIOWin.hpp"
#include "Runtime/Graphics/CMoviePlayer.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "GCNTypes.hpp"
#include "Runtime/GCNTypes.hpp"
namespace urde {

View File

@ -1,12 +1,15 @@
#pragma once
#include "IOStreams.hpp"
#include "World/ScriptObjectSupport.hpp"
#include "RetroTypes.hpp"
#include <vector>
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/ScriptObjectSupport.hpp"
namespace urde {
class CStateManager;
class CSaveWorld;
class CStateManager;
#if 0
struct CMailMessage
{

View File

@ -1,11 +1,15 @@
#pragma once
#include <list>
#include <memory>
#include <unordered_map>
#include "IFactory.hpp"
#include "CResLoader.hpp"
#include "IVParamObj.hpp"
#include "MP1/MP1OriginalIDs.hpp"
#include "CToken.hpp"
#include <vector>
#include "Runtime/CResLoader.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IFactory.hpp"
#include "Runtime/IVParamObj.hpp"
#include "Runtime/MP1/MP1OriginalIDs.hpp"
namespace urde {
class IDvdRequest;

View File

@ -1,14 +1,18 @@
#pragma once
#include <functional>
#include <list>
#include <memory>
#include <string>
#include "RetroTypes.hpp"
#include "CPakFile.hpp"
#include "IOStreams.hpp"
#include <vector>
#include "Runtime/CPakFile.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
struct SObjectTag;
class IDvdRequest;
struct SObjectTag;
class CResLoader {
std::string m_loaderPath;

View File

@ -1,8 +1,11 @@
#pragma once
#include "RetroTypes.hpp"
#include <vector>
#include "DNACommon/SAVWCommon.hpp"
#include "CFactoryMgr.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {

View File

@ -1,9 +1,11 @@
#pragma once
#include "RetroTypes.hpp"
#include "IFactory.hpp"
#include "CToken.hpp"
#include "zeus/CVector2i.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IFactory.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include <zeus/CVector2i.hpp>
namespace urde {
class CScannableObjectInfo {

View File

@ -1,13 +1,15 @@
#pragma once
#include "IObjectStore.hpp"
#include "RetroTypes.hpp"
#include "IVParamObj.hpp"
#include <unordered_map>
#include <vector>
#include "Runtime/IObjectStore.hpp"
#include "Runtime/IVParamObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class IFactory;
class CObjectReference;
class IFactory;
class CSimplePool : public IObjectStore {
protected:

View File

@ -1,49 +1,61 @@
#pragma once
#include <list>
#include <map>
#include <memory>
#include <optional>
#include <set>
#include "CBasics.hpp"
#include "World/ScriptObjectSupport.hpp"
#include "GameObjectLists.hpp"
#include "Camera/CCameraManager.hpp"
#include "Camera/CCameraFilter.hpp"
#include "CRandom16.hpp"
#include "zeus/CAABox.hpp"
#include "Weapon/CWeaponMgr.hpp"
#include "World/CAi.hpp"
#include "CToken.hpp"
#include "World/ScriptLoader.hpp"
#include "Input/CFinalInput.hpp"
#include "CSortedLists.hpp"
#include "World/CFluidPlaneManager.hpp"
#include "World/CEnvFxManager.hpp"
#include "World/CActorModelParticles.hpp"
#include "Input/CRumbleManager.hpp"
#include "Camera/CCameraShakeData.hpp"
#include "Graphics/Shaders/CColoredQuadFilter.hpp"
#include <string>
#include <utility>
#include <vector>
#include "Runtime/CBasics.hpp"
#include "Runtime/CRandom16.hpp"
#include "Runtime/CSortedLists.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Camera/CCameraFilter.hpp"
#include "Runtime/Camera/CCameraManager.hpp"
#include "Runtime/Camera/CCameraShakeData.hpp"
#include "Runtime/GameObjectLists.hpp"
#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
#include "Runtime/Input/CFinalInput.hpp"
#include "Runtime/Input/CRumbleManager.hpp"
#include "Runtime/Weapon/CWeaponMgr.hpp"
#include "Runtime/World/CActorModelParticles.hpp"
#include "Runtime/World/CAi.hpp"
#include "Runtime/World/CEnvFxManager.hpp"
#include "Runtime/World/CFluidPlaneManager.hpp"
#include "Runtime/World/ScriptLoader.hpp"
#include "Runtime/World/ScriptObjectSupport.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CVector2f.hpp>
#include <zeus/CVector2i.hpp>
namespace urde {
class CRelayTracker;
class CMapWorldInfo;
class CPlayerState;
class CWorldTransManager;
class CObjectList;
class CSortedListManager;
class CFluidPlaneManager;
class CEnvFxManager;
class CActorModelParticles;
class CTeamAiTypes;
class CRumbleManager;
class CActor;
class CLight;
class CActorModelParticles;
class CDamageInfo;
class CEnvFxManager;
class CFluidPlaneManager;
class CLight;
class CMapWorldInfo;
class CMaterialFilter;
struct CFinalInput;
class CObjectList;
class CPlayer;
class CWorld;
class CTexture;
class CWorldLayerState;
class CPlayerState;
class CProjectedShadow;
class CRelayTracker;
class CRumbleManager;
class CSortedListManager;
class CTeamAiTypes;
class CTexture;
class CWorld;
class CWorldLayerState;
class CWorldTransManager;
struct CFinalInput;
namespace MP1 {
class CMFGameLoader;

View File

@ -1,7 +1,7 @@
#pragma once
#include <vector>
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CStateManager;

View File

@ -1,6 +1,7 @@
#pragma once
#include <chrono>
#include <fmt/format.h>
namespace urde {
class CStopwatch {

View File

@ -1,19 +1,21 @@
#pragma once
#include <memory>
#include "IObj.hpp"
#include "RetroTypes.hpp"
#include "IVParamObj.hpp"
#include "IObjectStore.hpp"
#include "IFactory.hpp"
#include "Runtime/IFactory.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/IObjectStore.hpp"
#include "Runtime/IVParamObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class IObjectStore;
/** Shared data-structure for CToken references, analogous to std::shared_ptr */
class CObjectReference {
friend class CToken;
friend class CSimplePool;
friend class CToken;
u16 x0_refCount = 0;
u16 x2_lockCount = 0;
bool x3_loading = false; /* Rightmost bit of lockCount */
@ -60,8 +62,9 @@ public:
* This class is analogous to std::shared_ptr and C++11 rvalues have been implemented accordingly
* (default/empty constructor, move constructor/assign) */
class CToken {
friend class CSimplePool;
friend class CModel;
friend class CSimplePool;
CObjectReference* x0_objRef = nullptr;
bool x4_lockHeld = false;

View File

@ -1,22 +1,27 @@
#pragma once
#include "IFactory.hpp"
#include "IObjFactory.hpp"
#include "CToken.hpp"
#include "CSimplePool.hpp"
#include "CAnimationSet.hpp"
#include <memory>
#include <string_view>
#include <utility>
#include <vector>
#include "Runtime/CSimplePool.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IFactory.hpp"
#include "Runtime/IObjFactory.hpp"
#include "Runtime/Character/CAnimationSet.hpp"
namespace urde {
class CSimplePool;
class CAnimCharacterSet;
class CCharacterInfo;
class CCharLayoutInfo;
class CAdditiveAnimationInfo;
class CTransitionDatabaseGame;
class CAnimationManager;
class CTransitionManager;
class CAllFormatsAnimSource;
class CAnimCharacterSet;
class CAnimData;
class CAnimationManager;
class CCharLayoutInfo;
class CCharacterInfo;
class CSimplePool;
class CTransitionDatabaseGame;
class CTransitionManager;
class CCharacterFactory : public IObjFactory {
public:

View File

@ -1,6 +1,6 @@
#pragma once
#include "CObjectList.hpp"
#include "Runtime/CObjectList.hpp"
namespace urde {

View File

@ -1,15 +1,21 @@
#pragma once
#include "IOStreams.hpp"
#include "CToken.hpp"
#include "zeus/CVector2i.hpp"
#include "CGuiTextSupport.hpp"
#include "Graphics/CTexture.hpp"
#include <cstring>
#include <memory>
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
#include <zeus/CVector2i.hpp>
namespace urde {
class IObjectStore;
class CDrawStringOptions;
class CTextRenderBuffer;
class IObjectStore;
/* NOTE: Is this a good place for CGlyph and CKernPair? */
class CGlyph {

View File

@ -1,23 +1,27 @@
#pragma once
#include "CGuiTextSupport.hpp"
#include "CDrawStringOptions.hpp"
#include "CToken.hpp"
#include "zeus/CColor.hpp"
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/GuiSys/CDrawStringOptions.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CRasterFont;
class CSaveableState {
friend class CTextExecuteBuffer;
friend class CColorOverrideInstruction;
friend class CFontInstruction;
friend class CGuiTextSupport;
friend class CLineExtraSpaceInstruction;
friend class CTextInstruction;
friend class CLineSpacingInstruction;
friend class CRemoveColorOverrideInstruction;
friend class CTextExecuteBuffer;
friend class CTextInstruction;
friend class CWordInstruction;
friend class CGuiTextSupport;
protected:
CDrawStringOptions x0_drawStrOpts;

View File

@ -1,21 +1,26 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CColor.hpp"
#include "zeus/CVector2f.hpp"
#include "zeus/CQuaternion.hpp"
#include "CScannableObjectInfo.hpp"
#include "Graphics/CTexture.hpp"
#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
#include <optional>
#include <utility>
#include "Runtime/CScannableObjectInfo.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CQuaternion.hpp>
#include <zeus/CVector2f.hpp>
namespace urde {
class CAuiImagePane;
class CGuiFrame;
class CGuiModel;
class CGuiTextPane;
class CGuiWidget;
class CGuiModel;
struct CFinalInput;
class CGuiFrame;
class CAuiImagePane;
class CStringTable;
struct CFinalInput;
class CScanDisplay {
friend class CHudDecoInterfaceScan;

View File

@ -1,9 +1,9 @@
#pragma once
#include "CIOWin.hpp"
#include "CToken.hpp"
#include "Graphics/CTexture.hpp"
#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
#include "Runtime/CIOWin.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
namespace urde {

View File

@ -1,7 +1,9 @@
#pragma once
#include "RetroTypes.hpp"
#include "IFactory.hpp"
#include <memory>
#include "Runtime/IFactory.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CStringTable {

View File

@ -1,7 +1,7 @@
#pragma once
#include "CCompoundTargetReticle.hpp"
#include "COrbitPointMarker.hpp"
#include "Runtime/GuiSys/CCompoundTargetReticle.hpp"
#include "Runtime/GuiSys/COrbitPointMarker.hpp"
namespace urde {
class CStateManager;

View File

@ -1,15 +1,20 @@
#pragma once
#include "CSaveableState.hpp"
#include "CGuiTextSupport.hpp"
#include <list>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
#include "Runtime/GuiSys/CSaveableState.hpp"
#include <zeus/CVector2i.hpp>
namespace urde {
class CInstruction;
class CFontImageDef;
class CTextRenderBuffer;
class CBlockInstruction;
class CFontImageDef;
class CInstruction;
class CLineInstruction;
class CTextRenderBuffer;
class CTextExecuteBuffer {
friend class CGuiTextSupport;

View File

@ -1,10 +1,14 @@
#pragma once
#include "CGuiTextSupport.hpp"
#include <utility>
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
namespace urde {
class CTextExecuteBuffer;
class CFontImageDef;
class CTextExecuteBuffer;
class CTextParser {
IObjectStore& x0_store;

View File

@ -1,20 +1,28 @@
#pragma once
#include "zeus/CColor.hpp"
#include "zeus/CVector2i.hpp"
#include "zeus/CVector2f.hpp"
#include "zeus/CMatrix4f.hpp"
#include "CToken.hpp"
#include "CFontImageDef.hpp"
#include "RetroTypes.hpp"
#include "CGuiWidget.hpp"
#include "Graphics/Shaders/CTextSupportShader.hpp"
#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
#include <utility>
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
#include <hecl/UniformBufferPool.hpp>
#include <hecl/VertexBufferPool.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CMatrix4f.hpp>
#include <zeus/CVector2f.hpp>
#include <zeus/CVector2i.hpp>
namespace urde {
class CGlyph;
class CGraphicsPalette;
class CRasterFont;
class CGlyph;
class CTextExecuteBuffer;
using CTextColor = zeus::CColor;

View File

@ -1,4 +1,9 @@
#include "CWordBreakTables.hpp"
#include "Runtime/GuiSys/CWordBreakTables.hpp"
#include <iterator>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/rstl.hpp"
namespace urde {

View File

@ -1,7 +1,5 @@
#pragma once
#include "RetroTypes.hpp"
namespace urde {
class CWordBreakTables {

View File

@ -1,17 +1,19 @@
#pragma once
#include <memory>
#include <functional>
#include "RetroTypes.hpp"
#include <memory>
#include <vector>
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CVParamTransfer;
class IObj;
class CFactoryMgr;
class CObjectReference;
class CResLoader;
class CFactoryMgr;
class CSimplePool;
class CVParamTransfer;
class IDvdRequest;
class IObj;
using CFactoryFnReturn = std::unique_ptr<IObj>;
using FFactoryFunc = std::function<CFactoryFnReturn(const urde::SObjectTag& tag, urde::CInputStream& in,

View File

@ -1,13 +1,15 @@
#pragma once
#include "boo/boo.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "hecl/Runtime.hpp"
#include "amuse/amuse.hpp"
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
#include <amuse/amuse.hpp>
#include <boo/boo.hpp>
#include <boo/audiodev/IAudioVoiceEngine.hpp>
#include <hecl/Runtime.hpp>
namespace hecl {
class CVarManager;
class Console;
class CVarManager;
} // namespace hecl
namespace urde {

View File

@ -1,10 +1,13 @@
#pragma once
#include "GCNTypes.hpp"
#include "athena/IStreamReader.hpp"
#include "athena/IStreamWriter.hpp"
#include "athena/MemoryReader.hpp"
#include "athena/MemoryWriter.hpp"
#include <memory>
#include "Runtime/GCNTypes.hpp"
#include <athena/IStreamReader.hpp>
#include <athena/IStreamWriter.hpp>
#include <athena/MemoryReader.hpp>
#include <athena/MemoryWriter.hpp>
#ifdef URDE_ZIP_INPUT_STREAM
#include <zlib.h>
#endif

View File

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

View File

@ -1,8 +1,5 @@
#pragma once
#include <memory>
#include "RetroTypes.hpp"
namespace urde {
class IObjFactory {

View File

@ -3,10 +3,10 @@
#include <string_view>
namespace urde {
struct SObjectTag;
class CToken;
class CVParamTransfer;
class IFactory;
class CToken;
struct SObjectTag;
class IObjectStore {
public:

View File

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

View File

@ -1,7 +1,8 @@
#pragma once
#include "CRumbleVoice.hpp"
#include "CInputGenerator.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Input/CInputGenerator.hpp"
#include "Runtime/Input/CRumbleVoice.hpp"
namespace urde {
class CRumbleGenerator {

View File

@ -1,7 +1,9 @@
#pragma once
#include "CRumbleGenerator.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Input/CRumbleGenerator.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CStateManager;

View File

@ -1,6 +1,9 @@
#pragma once
#include "RetroTypes.hpp"
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
namespace urde {
enum class ERumbleFxId {

View File

@ -1,7 +1,5 @@
#pragma once
#include "../RetroTypes.hpp"
namespace urde {
class IController {

View File

@ -1,10 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CWeaponDescription;

View File

@ -1,6 +1,10 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Real_Elements */

View File

@ -1,7 +1,11 @@
#pragma once
#include "IOStreams.hpp"
#include "CToken.hpp"
#include <utility>
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,12 +1,15 @@
#pragma once
#include "CParticleDataFactory.hpp"
#include "CRealElement.hpp"
#include "CIntElement.hpp"
#include "CVectorElement.hpp"
#include "CModVectorElement.hpp"
#include "CColorElement.hpp"
#include "CUVElement.hpp"
#include <memory>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Particle/CColorElement.hpp"
#include "Runtime/Particle/CIntElement.hpp"
#include "Runtime/Particle/CModVectorElement.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CRealElement.hpp"
#include "Runtime/Particle/CUVElement.hpp"
#include "Runtime/Particle/CVectorElement.hpp"
namespace urde {
class CSwooshDescription {

View File

@ -1,8 +1,12 @@
#pragma once
#include "IElement.hpp"
#include "CToken.hpp"
#include "Graphics/CTexture.hpp"
#include <memory>
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#UV_Elements */

View File

@ -1,6 +1,12 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Particle/IElement.hpp"
#include <zeus/CVector3f.hpp>
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Vector_Elements */

View File

@ -1,9 +1,9 @@
#pragma once
#include "zeus/CColor.hpp"
#include "zeus/CVector3f.hpp"
#include "RetroTypes.hpp"
#include "CParticleGen.hpp"
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Particle/CParticleGen.hpp"
namespace urde {

View File

@ -1,11 +1,14 @@
#pragma once
#include "CParticleDataFactory.hpp"
#include "CRealElement.hpp"
#include "CIntElement.hpp"
#include "CVectorElement.hpp"
#include "CModVectorElement.hpp"
#include "CColorElement.hpp"
#include <memory>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Particle/CColorElement.hpp"
#include "Runtime/Particle/CIntElement.hpp"
#include "Runtime/Particle/CModVectorElement.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CRealElement.hpp"
#include "Runtime/Particle/CVectorElement.hpp"
namespace urde {
class CCollisionResponseData;

View File

@ -1,10 +1,12 @@
#pragma once
#include <memory>
#include "GCNTypes.hpp"
#include "zeus/CVector3f.hpp"
#include "zeus/CColor.hpp"
#include "IOStreams.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/IOStreams.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,7 +1,9 @@
#pragma once
#include "CGunWeapon.hpp"
#include "Graphics/Shaders/CAABoxShader.hpp"
#include <memory>
#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
#include "Runtime/Weapon/CGunWeapon.hpp"
namespace urde {

View File

@ -1,6 +1,7 @@
#pragma once
#include "CGunWeapon.hpp"
#include <memory>
#include "Runtime/Weapon/CGunWeapon.hpp"
namespace urde {

View File

@ -1,9 +1,19 @@
#pragma once
#include "Weapon/CBeamProjectile.hpp"
#include "Weapon/CBeamInfo.hpp"
#include "World/CDamageInfo.hpp"
#include "Graphics/Shaders/CColoredStripShader.hpp"
#include <cstdint>
#include <memory>
#include <optional>
#include <string_view>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Graphics/Shaders/CColoredStripShader.hpp"
#include "Runtime/Weapon/CBeamInfo.hpp"
#include "Runtime/Weapon/CBeamProjectile.hpp"
#include "Runtime/World/CDamageInfo.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CPlasmaProjectile : public CBeamProjectile {

View File

@ -1,26 +1,31 @@
#pragma once
#include "RetroTypes.hpp"
#include "Character/CActorLights.hpp"
#include "CFidget.hpp"
#include "zeus/CTransform.hpp"
#include "zeus/CAABox.hpp"
#include "World/CPlayerCameraBob.hpp"
#include "CGunMotion.hpp"
#include "CGrappleArm.hpp"
#include "CAuxWeapon.hpp"
#include "CPowerBeam.hpp"
#include "CIceBeam.hpp"
#include "CWaveBeam.hpp"
#include "CPlasmaBeam.hpp"
#include "CPhazonBeam.hpp"
#include "Particle/CElementGen.hpp"
#include "Character/CModelData.hpp"
#include "World/CWorldShadow.hpp"
#include "World/ScriptObjectSupport.hpp"
#include "Graphics/CRainSplashGenerator.hpp"
#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
#include "Graphics/Shaders/CAABoxShader.hpp"
#include <memory>
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Character/CActorLights.hpp"
#include "Runtime/Character/CModelData.hpp"
#include "Runtime/Graphics/CRainSplashGenerator.hpp"
#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
#include "Runtime/Particle/CElementGen.hpp"
#include "Runtime/Weapon/CAuxWeapon.hpp"
#include "Runtime/Weapon/CFidget.hpp"
#include "Runtime/Weapon/CGrappleArm.hpp"
#include "Runtime/Weapon/CGunMotion.hpp"
#include "Runtime/Weapon/CIceBeam.hpp"
#include "Runtime/Weapon/CPhazonBeam.hpp"
#include "Runtime/Weapon/CPlasmaBeam.hpp"
#include "Runtime/Weapon/CPowerBeam.hpp"
#include "Runtime/Weapon/CWaveBeam.hpp"
#include "Runtime/World/CPlayerCameraBob.hpp"
#include "Runtime/World/CWorldShadow.hpp"
#include "Runtime/World/ScriptObjectSupport.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CTransform.hpp>
namespace urde {
struct CFinalInput;

View File

@ -1,6 +1,7 @@
#pragma once
#include "CGunWeapon.hpp"
#include <memory>
#include "Runtime/Weapon/CGunWeapon.hpp"
namespace urde {

View File

@ -1,11 +1,17 @@
#pragma once
#include "CWeapon.hpp"
#include "CToken.hpp"
#include <memory>
#include <optional>
#include "Runtime/CToken.hpp"
#include "Runtime/Weapon/CWeapon.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
namespace urde {
class CElementGen;
class CPowerBomb : public CWeapon {
static const zeus::CColor kFadeColor;
bool x158_24_canStartFilter : 1;

View File

@ -1,9 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CVector3f.hpp"
#include "World/CDamageInfo.hpp"
#include "Particle/CWeaponDescription.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Particle/CWeaponDescription.hpp"
#include "Runtime/World/CDamageInfo.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CPlayer;

View File

@ -1,20 +1,27 @@
#pragma once
#include "RetroTypes.hpp"
#include "CRandom16.hpp"
#include "CToken.hpp"
#include "zeus/CVector3f.hpp"
#include "Particle/CElementGen.hpp"
#include "Particle/CParticleSwoosh.hpp"
#include "Particle/CGenDescription.hpp"
#include "Particle/CSwooshDescription.hpp"
#include "Particle/CWeaponDescription.hpp"
#include "Collision/CCollisionResponseData.hpp"
#include <memory>
#include <optional>
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Collision/CCollisionResponseData.hpp"
#include "Runtime/Particle/CElementGen.hpp"
#include "Runtime/Particle/CGenDescription.hpp"
#include "Runtime/Particle/CParticleSwoosh.hpp"
#include "Runtime/Particle/CSwooshDescription.hpp"
#include "Runtime/Particle/CWeaponDescription.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CModel;
class CDecalDescription;
class CGenDescription;
class CModel;
class CProjectileWeapon {
static u16 g_GlobalSeed;

View File

@ -1,6 +1,9 @@
#pragma once
#include "CEnergyProjectile.hpp"
#include <optional>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Weapon/CEnergyProjectile.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CGunWeapon.hpp"
#include <memory>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Weapon/CGunWeapon.hpp"
namespace urde {

View File

@ -1,6 +1,13 @@
#pragma once
#include "CGameProjectile.hpp"
#include <memory>
#include "Runtime/CRandom16.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Weapon/CGameProjectile.hpp"
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,9 +1,12 @@
#pragma once
#include "World/CActor.hpp"
#include "Weapon/WeaponCommon.hpp"
#include "World/CDamageInfo.hpp"
#include "Collision/CMaterialFilter.hpp"
#include <string_view>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Collision/CMaterialFilter.hpp"
#include "Runtime/World/CActor.hpp"
#include "Runtime/World/CDamageInfo.hpp"
#include "Runtime/Weapon/WeaponCommon.hpp"
namespace urde {
class CWeapon : public CActor {

View File

@ -1,7 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "WeaponCommon.hpp"
#include <map>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Weapon/WeaponCommon.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "WeaponCommon.hpp"
#include "Runtime/Weapon/WeaponCommon.hpp"
namespace urde {
class CWeaponMode {

View File

@ -1,16 +1,19 @@
#pragma once
#include "RetroTypes.hpp"
#include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp"
#include "Audio/CSfxManager.hpp"
#include <set>
#include <Runtime/CPlayerState.hpp>
#include <vector>
#include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp"
#include "Runtime/CPlayerState.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Audio/CSfxManager.hpp"
namespace urde {
class CAnimData;
class CToken;
class CPrimitive;
class CStateManager;
class CToken;
enum class EWeaponType {
None = -1,

View File

@ -1,11 +1,12 @@
#pragma once
#include "RetroTypes.hpp"
#include "CDamageInfo.hpp"
#include "CHealthInfo.hpp"
#include "CDamageVulnerability.hpp"
#include "CAnimationParameters.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CAnimationParameters.hpp"
#include "Runtime/World/CDamageInfo.hpp"
#include "Runtime/World/CDamageVulnerability.hpp"
#include "Runtime/World/CHealthInfo.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,7 +1,14 @@
#pragma once
#include "CActor.hpp"
#include "Collision/CCollidableAABox.hpp"
#include <optional>
#include "Runtime/Collision/CCollidableAABox.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/CAxisAngle.hpp>
#include <zeus/CQuaternion.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CCollisionInfoList;

View File

@ -1,9 +1,12 @@
#pragma once
#include <cfloat>
#include "RetroTypes.hpp"
#include "zeus/CVector2f.hpp"
#include "zeus/CTransform.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CVector2f.hpp>
#include <zeus/CVector3f.hpp>
#include <zeus/CTransform.hpp>
namespace urde {

View File

@ -1,7 +1,9 @@
#pragma once
#include "RetroTypes.hpp"
#include "CEnergyDrainSource.hpp"
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CEnergyDrainSource.hpp"
namespace urde {
class CStateManager;

View File

@ -1,8 +1,10 @@
#pragma once
#include "Graphics/CTexture.hpp"
#include "zeus/CTransform.hpp"
#include "zeus/CAABox.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CStateManager;

View File

@ -1,6 +1,8 @@
#pragma once
#include "CActor.hpp"
#include <string_view>
#include "Runtime/World/CActor.hpp"
namespace urde {
class CRepulsor : public CActor {
float xe8_affectRadius;

View File

@ -1,7 +1,7 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CRipple {

View File

@ -1,7 +1,9 @@
#pragma once
#include "RetroTypes.hpp"
#include "CRipple.hpp"
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CRipple.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {

View File

@ -1,8 +1,9 @@
#pragma once
#include "CPhysicsActor.hpp"
#include "CHealthInfo.hpp"
#include "CDamageVulnerability.hpp"
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CDamageVulnerability.hpp"
#include "Runtime/World/CHealthInfo.hpp"
#include "Runtime/World/CPhysicsActor.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CEntity.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {
class CScriptActorKeyframe : public CEntity {

View File

@ -1,7 +1,14 @@
#pragma once
#include "CEntity.hpp"
#include "zeus/CTransform.hpp"
#include <map>
#include <string_view>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
struct SRiders;

View File

@ -1,6 +1,11 @@
#pragma once
#include "CActor.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/CAABox.hpp>
namespace urde {
class CScriptAiJumpPoint : public CActor {

View File

@ -1,7 +1,7 @@
#pragma once
#include "CEntity.hpp"
#include "CEnvFxManager.hpp"
#include "Runtime/World/CEntity.hpp"
#include "Runtime/World/CEnvFxManager.hpp"
namespace urde {
class CScriptAreaAttributes : public CEntity {

View File

@ -1,6 +1,10 @@
#pragma once
#include "CScriptTrigger.hpp"
#include <string_view>
#include "Runtime/World/CScriptTrigger.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CScriptBallTrigger : public CScriptTrigger {

View File

@ -1,8 +1,10 @@
#pragma once
#include "CActor.hpp"
#include "Weapon/CBeamInfo.hpp"
#include "CDamageInfo.hpp"
#include <string_view>
#include "Runtime/Weapon/CBeamInfo.hpp"
#include "Runtime/World/CActor.hpp"
#include "Runtime/World/CDamageInfo.hpp"
namespace urde {
class CWeaponDescription;

View File

@ -1,7 +1,10 @@
#pragma once
#include "CEntity.hpp"
#include "Camera/CCameraFilter.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Camera/CCameraFilter.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {
class CScriptCameraBlurKeyframe : public CEntity {

View File

@ -1,8 +1,12 @@
#pragma once
#include "CEntity.hpp"
#include "zeus/CColor.hpp"
#include "Camera/CCameraFilter.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Camera/CCameraFilter.hpp"
#include "Runtime/World/CEntity.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CScriptCameraFilterKeyframe : public CEntity {

View File

@ -1,7 +1,14 @@
#pragma once
#include "CActor.hpp"
#include "Camera/CBallCamera.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Camera/CBallCamera.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,7 +1,12 @@
#pragma once
#include "CActor.hpp"
#include "zeus/COBBox.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/COBBox.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CScriptCameraHintTrigger : public CActor {

View File

@ -1,8 +1,13 @@
#pragma once
#include "CActor.hpp"
#include "zeus/CRelAngle.hpp"
#include "zeus/COBBox.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/COBBox.hpp>
#include <zeus/CRelAngle.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CScriptCameraPitchVolume : public CActor {

View File

@ -1,7 +1,9 @@
#pragma once
#include "CEntity.hpp"
#include "Camera/CCameraShakeData.hpp"
#include <string_view>
#include "Runtime/Camera/CCameraShakeData.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CActor.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
namespace urde {

View File

@ -1,10 +1,15 @@
#pragma once
#include "CEntity.hpp"
#include "zeus/CColor.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
#include <zeus/CColor.hpp>
namespace urde {
struct CModelFlags;
class CScriptColorModulate : public CEntity {
public:
enum class EBlendMode {

View File

@ -1,7 +1,10 @@
#pragma once
#include "CEntity.hpp"
#include "Input/ControlMapper.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Input/ControlMapper.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CEntity.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {

View File

@ -1,6 +1,12 @@
#pragma once
#include "CActor.hpp"
#include <optional>
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/CAABox.hpp>
namespace urde {
class CScriptCoverPoint : public CActor {

View File

@ -1,12 +1,21 @@
#pragma once
#include "CActor.hpp"
#include "CFluidPlaneDoor.hpp"
#include "CHealthInfo.hpp"
#include "CDamageVulnerability.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include "Runtime/World/CDamageVulnerability.hpp"
#include "Runtime/World/CFluidPlaneDoor.hpp"
#include "Runtime/World/CHealthInfo.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CFrustum.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CVisorParameters;
class CScriptDamageableTrigger : public CActor {
public:
enum class ECanOrbit {

View File

@ -1,6 +1,13 @@
#pragma once
#include "CPhysicsActor.hpp"
#include <memory>
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CPhysicsActor.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CElementGen;

View File

@ -1,6 +1,9 @@
#pragma once
#include "CActor.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
namespace urde {

View File

@ -1,7 +1,12 @@
#pragma once
#include "Graphics/CGraphics.hpp"
#include "CEntity.hpp"
#include <string_view>
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/World/CEntity.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CVector2f.hpp>
namespace urde {
class CScriptDistanceFog : public CEntity {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CPhysicsActor.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CPhysicsActor.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CEntity.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {
class CScriptDockAreaChange : public CEntity {

View File

@ -1,6 +1,11 @@
#pragma once
#include "CPhysicsActor.hpp"
#include <string_view>
#include "Runtime/World/CPhysicsActor.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,11 +1,12 @@
#ifndef __URDE_CSCRIPTEMPULSE_HPP__
#define __URDE_CSCRIPTEMPULSE_HPP__
#pragma once
#include "CActor.hpp"
#include <memory>
#include "Runtime/World/CActor.hpp"
namespace urde {
class CGenDescription;
class CElementGen;
class CGenDescription;
class CScriptEMPulse : public CActor {
float xe8_duration;
float xec_finalRadius;
@ -32,4 +33,3 @@ public:
void Touch(CActor&, CStateManager&) override;
};
} // namespace urde
#endif // __URDE_CSCRIPTEMPULSE_HPP__

View File

@ -1,10 +1,15 @@
#pragma once
#include "CActor.hpp"
#include <memory>
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CActor.hpp"
namespace urde {
class CElementGen;
class CParticleElectric;
class CScriptEffect : public CActor {
static u32 g_NumParticlesUpdating;
static u32 g_NumParticlesRendered;

View File

@ -1,7 +1,11 @@
#pragma once
#include "CEntity.hpp"
#include "zeus/CVector3f.hpp"
#include <string_view>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/World/CEntity.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,7 +1,11 @@
#pragma once
#include "CActor.hpp"
#include "CGrappleParameters.hpp"
#include <string_view>
#include "Runtime/World/CActor.hpp"
#include "Runtime/World/CGrappleParameters.hpp"
#include <zeus/CAABox.hpp>
namespace urde {
class CScriptGrapplePoint : public CActor {

View File

@ -1,10 +1,15 @@
#pragma once
#include "CEntity.hpp"
#include "CHUDMemoParms.hpp"
#include "CToken.hpp"
#include <optional>
#include <string_view>
#include "Runtime/CToken.hpp"
#include "Runtime/World/CEntity.hpp"
#include "Runtime/World/CHUDMemoParms.hpp"
namespace urde {
class CStringTable;
class CScriptHUDMemo : public CEntity {
public:
enum class EDisplayType {

View File

@ -1,6 +1,11 @@
#pragma once
#include "CActor.hpp"
#include <string_view>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CActor.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CScriptMazeNode : public CActor {

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