From 902f4fb5c51b4e4f6fd0cef136d6dd210c678287 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 28 Sep 2019 20:30:53 -0400 Subject: [PATCH] Graphics/Shaders: Use forward declarations where applicable Now, with all of the headers normalized, we can safely convert some headers into forward declarations without needing to worry about potentially breaking code in other headers or source files. --- Runtime/AutoMapper/CMappableObject.cpp | 14 ++++++----- Runtime/Graphics/Shaders/CAABoxShader.cpp | 9 ++++--- Runtime/Graphics/Shaders/CAABoxShader.hpp | 5 +++- .../Graphics/Shaders/CCameraBlurFilter.cpp | 11 ++++++--- .../Graphics/Shaders/CCameraBlurFilter.hpp | 2 -- .../Graphics/Shaders/CColoredQuadFilter.cpp | 9 ++++--- .../Graphics/Shaders/CColoredQuadFilter.hpp | 7 +++++- .../Graphics/Shaders/CColoredStripShader.cpp | 12 ++++++---- Runtime/Graphics/Shaders/CDecalShaders.cpp | 8 ++++--- Runtime/Graphics/Shaders/CDecalShaders.hpp | 2 +- .../Graphics/Shaders/CElementGenShaders.cpp | 8 ++++--- .../Graphics/Shaders/CElementGenShaders.hpp | 2 -- Runtime/Graphics/Shaders/CEnergyBarShader.cpp | 10 ++++---- Runtime/Graphics/Shaders/CEnergyBarShader.hpp | 4 ++-- Runtime/Graphics/Shaders/CEnvFxShaders.cpp | 8 ++++--- Runtime/Graphics/Shaders/CEnvFxShaders.hpp | 3 +-- .../Graphics/Shaders/CFluidPlaneShader.cpp | 10 ++++---- .../Graphics/Shaders/CFluidPlaneShader.hpp | 2 -- Runtime/Graphics/Shaders/CFogVolumeFilter.cpp | 14 +++++++---- Runtime/Graphics/Shaders/CFogVolumeFilter.hpp | 14 +++++++---- .../Shaders/CFogVolumePlaneShader.cpp | 8 ++++--- .../Shaders/CFogVolumePlaneShader.hpp | 6 +++-- .../Graphics/Shaders/CLineRendererShaders.cpp | 10 +++++--- .../Graphics/Shaders/CLineRendererShaders.hpp | 2 -- .../Graphics/Shaders/CMapSurfaceShader.cpp | 8 ++++--- .../Graphics/Shaders/CMapSurfaceShader.hpp | 2 +- Runtime/Graphics/Shaders/CModelShaders.cpp | 11 +++++---- Runtime/Graphics/Shaders/CModelShaders.hpp | 11 +++++---- .../Shaders/CParticleSwooshShaders.cpp | 10 ++++---- .../Shaders/CParticleSwooshShaders.hpp | 2 -- .../Graphics/Shaders/CPhazonSuitFilter.cpp | 15 ++++++++---- .../Graphics/Shaders/CPhazonSuitFilter.hpp | 5 +++- .../Graphics/Shaders/CRadarPaintShader.cpp | 12 ++++++---- .../Graphics/Shaders/CRadarPaintShader.hpp | 7 +++--- .../Graphics/Shaders/CRandomStaticFilter.cpp | 12 ++++++---- .../Graphics/Shaders/CRandomStaticFilter.hpp | 9 ++++--- Runtime/Graphics/Shaders/CScanLinesFilter.cpp | 13 ++++++---- Runtime/Graphics/Shaders/CScanLinesFilter.hpp | 9 ++++--- Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp | 10 ++++---- Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp | 5 ++-- .../Graphics/Shaders/CTextSupportShader.cpp | 8 ++++--- .../Graphics/Shaders/CTextSupportShader.hpp | 2 +- .../Graphics/Shaders/CTexturedQuadFilter.cpp | 9 ++++--- .../Graphics/Shaders/CTexturedQuadFilter.hpp | 7 +++++- .../Graphics/Shaders/CThermalColdFilter.cpp | 13 ++++++---- .../Graphics/Shaders/CThermalColdFilter.hpp | 2 -- .../Graphics/Shaders/CThermalHotFilter.cpp | 13 ++++++---- .../Graphics/Shaders/CThermalHotFilter.hpp | 1 - .../Graphics/Shaders/CWorldShadowShader.cpp | 10 +++++--- .../Graphics/Shaders/CWorldShadowShader.hpp | 4 +++- Runtime/Graphics/Shaders/CXRayBlurFilter.cpp | 13 ++++++---- Runtime/Graphics/Shaders/CXRayBlurFilter.hpp | 1 - Runtime/GuiSys/CAuiImagePane.cpp | 10 ++++---- Runtime/GuiSys/CScanDisplay.hpp | 1 + Runtime/GuiSys/CSplashScreen.cpp | 12 ++++++---- Runtime/MP1/CFrontEndUI.hpp | 1 + Runtime/MP1/CMFGame.hpp | 1 + Runtime/MP1/CQuitGameScreen.cpp | 24 ++++++++++--------- Runtime/MP1/CSamusHud.hpp | 1 + Runtime/MP1/CSlideShow.hpp | 1 + Runtime/Weapon/CPlayerGun.hpp | 1 + Runtime/World/CWorldTransManager.hpp | 1 + 62 files changed, 285 insertions(+), 172 deletions(-) diff --git a/Runtime/AutoMapper/CMappableObject.cpp b/Runtime/AutoMapper/CMappableObject.cpp index 79aecf4df..7dcdb02ae 100644 --- a/Runtime/AutoMapper/CMappableObject.cpp +++ b/Runtime/AutoMapper/CMappableObject.cpp @@ -1,9 +1,11 @@ -#include "CMappableObject.hpp" -#include "GameGlobalObjects.hpp" -#include "CMapWorldInfo.hpp" -#include "CSimplePool.hpp" -#include "CToken.hpp" -#include "Graphics/CTexture.hpp" +#include "Runtime/AutoMapper/CMappableObject.hpp" + +#include "Runtime/CSimplePool.hpp" +#include "Runtime/CToken.hpp" +#include "Runtime/AutoMapper/CMapWorldInfo.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CTexture.hpp" namespace urde { zeus::CVector3f CMappableObject::skDoorVerts[8] = {}; diff --git a/Runtime/Graphics/Shaders/CAABoxShader.cpp b/Runtime/Graphics/Shaders/CAABoxShader.cpp index 5012a3461..c21e25d81 100644 --- a/Runtime/Graphics/Shaders/CAABoxShader.cpp +++ b/Runtime/Graphics/Shaders/CAABoxShader.cpp @@ -1,6 +1,9 @@ -#include "CAABoxShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/Graphics/Shaders/CAABoxShader.hpp" + +#include "Runtime/Graphics/CGraphics.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CAABoxShader.hpp b/Runtime/Graphics/Shaders/CAABoxShader.hpp index e68255194..26b6e3096 100644 --- a/Runtime/Graphics/Shaders/CAABoxShader.hpp +++ b/Runtime/Graphics/Shaders/CAABoxShader.hpp @@ -2,10 +2,13 @@ #include -#include #include #include +namespace zeus { +class CAABox; +} + namespace urde { class CAABoxShader { diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp index 986d3a2ce..6829ff821 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp @@ -1,6 +1,11 @@ -#include "CCameraBlurFilter.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp" + +#include +#include + +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp index 155cd861c..f7869ff8e 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp @@ -2,8 +2,6 @@ #include -#include -#include #include #include diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp b/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp index 3d1401646..a49712d49 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.cpp @@ -1,6 +1,9 @@ -#include "CColoredQuadFilter.hpp" -#include "Graphics/CGraphics.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" + +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp index b79fcffa8..e6a61e281 100644 --- a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp @@ -1,13 +1,18 @@ #pragma once #include "Runtime/CToken.hpp" -#include "Runtime/Camera/CCameraFilter.hpp" + +#include #include #include #include namespace urde { +class CTexture; + +enum class EFilterShape; +enum class EFilterType; class CColoredQuadFilter { struct Uniform { diff --git a/Runtime/Graphics/Shaders/CColoredStripShader.cpp b/Runtime/Graphics/Shaders/CColoredStripShader.cpp index a575df0e3..5ace88d1e 100644 --- a/Runtime/Graphics/Shaders/CColoredStripShader.cpp +++ b/Runtime/Graphics/Shaders/CColoredStripShader.cpp @@ -1,8 +1,10 @@ -#include "CColoredStripShader.hpp" -#include "Graphics/CGraphics.hpp" -#include "hecl/Pipeline.hpp" -#include "GameGlobalObjects.hpp" -#include "Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/Shaders/CColoredStripShader.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CDecalShaders.cpp b/Runtime/Graphics/Shaders/CDecalShaders.cpp index ff8fa5f01..e5815b2fa 100644 --- a/Runtime/Graphics/Shaders/CDecalShaders.cpp +++ b/Runtime/Graphics/Shaders/CDecalShaders.cpp @@ -1,6 +1,8 @@ -#include "CDecalShaders.hpp" -#include "Particle/CDecal.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CDecalShaders.hpp" + +#include "Runtime/Particle/CDecal.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CDecalShaders.hpp b/Runtime/Graphics/Shaders/CDecalShaders.hpp index 9ec398eb5..e5090160c 100644 --- a/Runtime/Graphics/Shaders/CDecalShaders.hpp +++ b/Runtime/Graphics/Shaders/CDecalShaders.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Runtime/Graphics/CGraphics.hpp" +#include namespace urde { struct CQuadDecal; diff --git a/Runtime/Graphics/Shaders/CElementGenShaders.cpp b/Runtime/Graphics/Shaders/CElementGenShaders.cpp index 046eaacb6..0892c93e4 100644 --- a/Runtime/Graphics/Shaders/CElementGenShaders.cpp +++ b/Runtime/Graphics/Shaders/CElementGenShaders.cpp @@ -1,6 +1,8 @@ -#include "CElementGenShaders.hpp" -#include "Particle/CElementGen.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CElementGenShaders.hpp" + +#include "Runtime/Particle/CElementGen.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CElementGenShaders.hpp b/Runtime/Graphics/Shaders/CElementGenShaders.hpp index 3e89d351a..2de77b26c 100644 --- a/Runtime/Graphics/Shaders/CElementGenShaders.hpp +++ b/Runtime/Graphics/Shaders/CElementGenShaders.hpp @@ -2,8 +2,6 @@ #include -#include "Runtime/Graphics/CGraphics.hpp" - #include namespace urde { diff --git a/Runtime/Graphics/Shaders/CEnergyBarShader.cpp b/Runtime/Graphics/Shaders/CEnergyBarShader.cpp index 98e324844..8e73df229 100644 --- a/Runtime/Graphics/Shaders/CEnergyBarShader.cpp +++ b/Runtime/Graphics/Shaders/CEnergyBarShader.cpp @@ -1,7 +1,9 @@ -#include "CEnergyBarShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CTexture.hpp" +#include "Runtime/Graphics/Shaders/CEnergyBarShader.hpp" + +#include "Runtime/Graphics/CGraphics.hpp" +#include "Runtime/Graphics/CTexture.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CEnergyBarShader.hpp b/Runtime/Graphics/Shaders/CEnergyBarShader.hpp index 35b3254c6..e5711e7ba 100644 --- a/Runtime/Graphics/Shaders/CEnergyBarShader.hpp +++ b/Runtime/Graphics/Shaders/CEnergyBarShader.hpp @@ -2,15 +2,15 @@ #include -#include "Runtime/Camera/CCameraFilter.hpp" +#include #include #include -#include #include #include namespace urde { +class CTexture; class CEnergyBarShader { public: diff --git a/Runtime/Graphics/Shaders/CEnvFxShaders.cpp b/Runtime/Graphics/Shaders/CEnvFxShaders.cpp index fdde425f7..dae90bb1d 100644 --- a/Runtime/Graphics/Shaders/CEnvFxShaders.cpp +++ b/Runtime/Graphics/Shaders/CEnvFxShaders.cpp @@ -1,6 +1,8 @@ -#include "CEnvFxShaders.hpp" -#include "hecl/Pipeline.hpp" -#include "World/CEnvFxManager.hpp" +#include "Runtime/Graphics/Shaders/CEnvFxShaders.hpp" + +#include "Runtime/World/CEnvFxManager.hpp" + +#include namespace urde { boo::ObjToken CEnvFxShaders::m_snowPipeline; diff --git a/Runtime/Graphics/Shaders/CEnvFxShaders.hpp b/Runtime/Graphics/Shaders/CEnvFxShaders.hpp index fe72ee5d8..aec2d832c 100644 --- a/Runtime/Graphics/Shaders/CEnvFxShaders.hpp +++ b/Runtime/Graphics/Shaders/CEnvFxShaders.hpp @@ -1,8 +1,7 @@ #pragma once -#include "Runtime/Graphics/CGraphics.hpp" - #include + #include #include #include diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp b/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp index e56c9e117..34b57dddf 100644 --- a/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp +++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.cpp @@ -1,7 +1,9 @@ -#include "CFluidPlaneShader.hpp" -#include "World/CRipple.hpp" -#include "World/CRippleManager.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp" + +#include "Runtime/World/CRipple.hpp" +#include "Runtime/World/CRippleManager.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp index e106b65f2..1c0195910 100644 --- a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp @@ -3,7 +3,6 @@ #include #include "Runtime/CToken.hpp" -#include "Runtime/RetroTypes.hpp" #include "Runtime/Graphics/CTexture.hpp" #include "Runtime/Graphics/Shaders/CModelShaders.hpp" #include "Runtime/World/CFluidPlaneManager.hpp" @@ -12,7 +11,6 @@ #include -#include #include #include #include diff --git a/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp b/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp index df952ebf0..6c27cca8a 100644 --- a/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp +++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.cpp @@ -1,8 +1,12 @@ -#include "CFogVolumeFilter.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" -#include "GameGlobalObjects.hpp" -#include "Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/Shaders/CFogVolumeFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp index d41015cb4..49f55cf21 100644 --- a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp @@ -1,10 +1,16 @@ #pragma once -#include +#include -#include -#include -#include +namespace boo { +struct IGraphicsBufferD; +struct IGraphicsBufferS; +struct IShaderDataBinding; +} // namespace boo + +namespace zeus { +class CColor; +} namespace urde { diff --git a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp index f241ebb95..e54abbed0 100644 --- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp +++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.cpp @@ -1,6 +1,8 @@ -#include "CFogVolumePlaneShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp" + +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp index 5bf764d92..8d3b136a1 100644 --- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp +++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp @@ -5,11 +5,13 @@ #include -#include -#include #include #include +namespace zeus { +class CVector3f; +} + namespace urde { class CFogVolumePlaneShader { diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp index c6b016ed0..96e897bb6 100644 --- a/Runtime/Graphics/Shaders/CLineRendererShaders.cpp +++ b/Runtime/Graphics/Shaders/CLineRendererShaders.cpp @@ -1,6 +1,10 @@ -#include "CLineRendererShaders.hpp" -#include "Graphics/CLineRenderer.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CLineRendererShaders.hpp" + +#include + +#include "Runtime/Graphics/CLineRenderer.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp index b0afb4a3f..5203e2d6d 100644 --- a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp +++ b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp @@ -2,8 +2,6 @@ #include -#include "Runtime/Graphics/CGraphics.hpp" - #include namespace urde { diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp index ff9960522..c0f0034df 100644 --- a/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp +++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.cpp @@ -1,6 +1,8 @@ -#include "CMapSurfaceShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp" + +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp index 8b150066b..f9825fd60 100644 --- a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp +++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp @@ -1,6 +1,6 @@ #pragma once -#include "Runtime/RetroTypes.hpp" +#include "Runtime/GCNTypes.hpp" #include diff --git a/Runtime/Graphics/Shaders/CModelShaders.cpp b/Runtime/Graphics/Shaders/CModelShaders.cpp index 8911c7768..928e90e23 100644 --- a/Runtime/Graphics/Shaders/CModelShaders.cpp +++ b/Runtime/Graphics/Shaders/CModelShaders.cpp @@ -1,7 +1,10 @@ -#include "CModelShaders.hpp" -#include "Graphics/CLight.hpp" -#include "hecl/Pipeline.hpp" -#include "CStopwatch.hpp" +#include "Runtime/Graphics/Shaders/CModelShaders.hpp" + +#include "Runtime/CStopwatch.hpp" +#include "Runtime/Graphics/CLight.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CModelShaders.hpp b/Runtime/Graphics/Shaders/CModelShaders.hpp index 25f607326..9afbd25e0 100644 --- a/Runtime/Graphics/Shaders/CModelShaders.hpp +++ b/Runtime/Graphics/Shaders/CModelShaders.hpp @@ -1,22 +1,25 @@ #pragma once #include -#include +#include +#include #include "DataSpec/DNAMP1/CMDLMaterials.hpp" #include "Runtime/Graphics/CGraphics.hpp" -#include -#include - #include #include #include #define URDE_MAX_LIGHTS 8 +namespace hecl::Backend { +class ShaderTag; +} + namespace urde { +class CLight; enum EExtendedShader : uint8_t { Flat, diff --git a/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp b/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp index 626a78eb9..e391e5510 100644 --- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp +++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.cpp @@ -1,7 +1,9 @@ -#include "CParticleSwooshShaders.hpp" -#include "Particle/CParticleSwoosh.hpp" -#include "Particle/CSwooshDescription.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp" + +#include "Runtime/Particle/CParticleSwoosh.hpp" +#include "Runtime/Particle/CSwooshDescription.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp index b78699a60..78b0c357e 100644 --- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp +++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp @@ -2,8 +2,6 @@ #include -#include "Runtime/Graphics/CGraphics.hpp" - #include #include diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp b/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp index fc1a04467..c26392dfb 100644 --- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp +++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.cpp @@ -1,7 +1,14 @@ -#include "CPhazonSuitFilter.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CTexture.hpp" +#include "Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp" + +#include "Runtime/Graphics/CGraphics.hpp" +#include "Runtime/Graphics/CTexture.hpp" + +#include + +#include +#include +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp index 8adba9604..afe8c7eed 100644 --- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp +++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp @@ -1,7 +1,10 @@ #pragma once #include -#include + +namespace zeus { +class CColor; +} namespace urde { class CTexture; diff --git a/Runtime/Graphics/Shaders/CRadarPaintShader.cpp b/Runtime/Graphics/Shaders/CRadarPaintShader.cpp index 4c8deb8b1..d95c98cd9 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShader.cpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShader.cpp @@ -1,7 +1,11 @@ -#include "CRadarPaintShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CTexture.hpp" +#include "Runtime/Graphics/Shaders/CRadarPaintShader.hpp" + +#include + +#include "Runtime/Graphics/CGraphics.hpp" +#include "Runtime/Graphics/CTexture.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp index 076ec6d3a..0fe7f6893 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp @@ -2,13 +2,14 @@ #include -#include "Runtime/Camera/CCameraFilter.hpp" +#include #include -#include -#include +#include +#include namespace urde { +class CTexture; class CRadarPaintShader { public: diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp b/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp index 7d2f49056..5f2375f39 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.cpp @@ -1,8 +1,10 @@ -#include "CRandomStaticFilter.hpp" -#include "Graphics/CBooRenderer.hpp" -#include "GameGlobalObjects.hpp" -#include "CSimplePool.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp index 6722212f8..b48b224c8 100644 --- a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp +++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp @@ -1,12 +1,15 @@ #pragma once -#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/CToken.hpp" +#include #include -#include -#include namespace urde { +class CTexture; + +enum class EFilterShape; +enum class EFilterType; class CRandomStaticFilter { struct Uniform { diff --git a/Runtime/Graphics/Shaders/CScanLinesFilter.cpp b/Runtime/Graphics/Shaders/CScanLinesFilter.cpp index 88333bdbf..5a3330c17 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilter.cpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilter.cpp @@ -1,8 +1,11 @@ -#include "CScanLinesFilter.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" -#include "GameGlobalObjects.hpp" -#include "Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp index 6337d590a..a789d957a 100644 --- a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp +++ b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp @@ -1,12 +1,15 @@ #pragma once -#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/CToken.hpp" +#include #include -#include -#include namespace urde { +class CTexture; + +enum class EFilterShape; +enum class EFilterType; class CScanLinesFilter { struct Uniform { diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp index 80e8be9de..2d2705968 100644 --- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp +++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.cpp @@ -1,7 +1,9 @@ -#include "CSpaceWarpFilter.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CBooRenderer.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp" + +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include #define WARP_RAMP_RES 32 diff --git a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp index 17c776f61..ffab42db1 100644 --- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp +++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp @@ -1,10 +1,11 @@ #pragma once -#include "Runtime/RetroTypes.hpp" +#include "Runtime/GCNTypes.hpp" #include -#include + #include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CTextSupportShader.cpp b/Runtime/Graphics/Shaders/CTextSupportShader.cpp index f7dd7a691..f3b072861 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShader.cpp +++ b/Runtime/Graphics/Shaders/CTextSupportShader.cpp @@ -1,6 +1,8 @@ -#include "CTextSupportShader.hpp" -#include "GuiSys/CRasterFont.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp" + +#include "Runtime/GuiSys/CRasterFont.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CTextSupportShader.hpp b/Runtime/Graphics/Shaders/CTextSupportShader.hpp index b9f6adf3f..9d76821a0 100644 --- a/Runtime/Graphics/Shaders/CTextSupportShader.hpp +++ b/Runtime/Graphics/Shaders/CTextSupportShader.hpp @@ -13,8 +13,8 @@ namespace urde { class CGlyph; -class CTextRenderBuffer; class CFontImageDef; +class CTextRenderBuffer; class CTextSupportShader { friend class CTextRenderBuffer; diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp index b8de9dcc6..7f4944e73 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.cpp @@ -1,6 +1,9 @@ -#include "CTexturedQuadFilter.hpp" -#include "Graphics/CTexture.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" + +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CTexture.hpp" + +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp index f8149978b..9a96f973d 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp @@ -1,7 +1,8 @@ #pragma once #include "Runtime/CToken.hpp" -#include "Runtime/Camera/CCameraFilter.hpp" + +#include #include #include @@ -10,6 +11,10 @@ #include namespace urde { +class CTexture; + +enum class EFilterShape; +enum class EFilterType; class CTexturedQuadFilter { public: diff --git a/Runtime/Graphics/Shaders/CThermalColdFilter.cpp b/Runtime/Graphics/Shaders/CThermalColdFilter.cpp index a113f9108..3ebd601c8 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilter.cpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilter.cpp @@ -1,8 +1,11 @@ -#include "CThermalColdFilter.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CBooRenderer.hpp" -#include "hecl/Pipeline.hpp" -#include "GameGlobalObjects.hpp" +#include "Runtime/Graphics/Shaders/CThermalColdFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp index eeab4614a..54cf48407 100644 --- a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp @@ -1,7 +1,5 @@ #pragma once -#include "Runtime/RetroTypes.hpp" - #include #include diff --git a/Runtime/Graphics/Shaders/CThermalHotFilter.cpp b/Runtime/Graphics/Shaders/CThermalHotFilter.cpp index c2bac2910..b0e5ca8ce 100644 --- a/Runtime/Graphics/Shaders/CThermalHotFilter.cpp +++ b/Runtime/Graphics/Shaders/CThermalHotFilter.cpp @@ -1,8 +1,11 @@ -#include "CThermalHotFilter.hpp" -#include "Graphics/CGraphics.hpp" -#include "hecl/Pipeline.hpp" -#include "GameGlobalObjects.hpp" -#include "Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/Shaders/CThermalHotFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CBooRenderer.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp index 8135be2f3..24ee5f869 100644 --- a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp +++ b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp @@ -3,7 +3,6 @@ #include #include -#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp index 2c7ce7d75..b3e6dc1cc 100644 --- a/Runtime/Graphics/Shaders/CWorldShadowShader.cpp +++ b/Runtime/Graphics/Shaders/CWorldShadowShader.cpp @@ -1,6 +1,10 @@ -#include "CWorldShadowShader.hpp" -#include "hecl/Pipeline.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/Graphics/Shaders/CWorldShadowShader.hpp" + +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CGraphics.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp index 3009248b2..0e0c189b6 100644 --- a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp +++ b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp @@ -2,9 +2,11 @@ #include -#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" +#include "Runtime/GCNTypes.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" +#include + #include #include diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp b/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp index 29e4d8ea0..63678c3c3 100644 --- a/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp +++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.cpp @@ -1,8 +1,11 @@ -#include "CXRayBlurFilter.hpp" -#include "Graphics/CGraphics.hpp" -#include "Graphics/CTexture.hpp" -#include "GameGlobalObjects.hpp" -#include "hecl/Pipeline.hpp" +#include "Runtime/Graphics/Shaders/CXRayBlurFilter.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Graphics/CGraphics.hpp" +#include "Runtime/Graphics/CTexture.hpp" + +#include +#include namespace urde { diff --git a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp index 503327aa9..ff0d8695c 100644 --- a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp @@ -3,7 +3,6 @@ #include "Runtime/CToken.hpp" #include -#include #include namespace urde { diff --git a/Runtime/GuiSys/CAuiImagePane.cpp b/Runtime/GuiSys/CAuiImagePane.cpp index 46e901b71..027b15306 100644 --- a/Runtime/GuiSys/CAuiImagePane.cpp +++ b/Runtime/GuiSys/CAuiImagePane.cpp @@ -1,7 +1,9 @@ -#include "CAuiImagePane.hpp" -#include "CSimplePool.hpp" -#include "Graphics/CTexture.hpp" -#include "CGuiWidgetDrawParms.hpp" +#include "Runtime/GuiSys/CAuiImagePane.hpp" + +#include "Runtime/CSimplePool.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Graphics/CTexture.hpp" +#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" namespace urde { diff --git a/Runtime/GuiSys/CScanDisplay.hpp b/Runtime/GuiSys/CScanDisplay.hpp index 52b9512f4..b879767f6 100644 --- a/Runtime/GuiSys/CScanDisplay.hpp +++ b/Runtime/GuiSys/CScanDisplay.hpp @@ -6,6 +6,7 @@ #include "Runtime/CScannableObjectInfo.hpp" #include "Runtime/RetroTypes.hpp" #include "Runtime/rstl.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Graphics/CTexture.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" diff --git a/Runtime/GuiSys/CSplashScreen.cpp b/Runtime/GuiSys/CSplashScreen.cpp index f12a4956b..94938a13b 100644 --- a/Runtime/GuiSys/CSplashScreen.cpp +++ b/Runtime/GuiSys/CSplashScreen.cpp @@ -1,8 +1,10 @@ -#include "CSplashScreen.hpp" -#include "CArchitectureMessage.hpp" -#include "CArchitectureQueue.hpp" -#include "CSimplePool.hpp" -#include "GameGlobalObjects.hpp" +#include "Runtime/GuiSys/CSplashScreen.hpp" + +#include "Runtime/CArchitectureMessage.hpp" +#include "Runtime/CArchitectureQueue.hpp" +#include "Runtime/CSimplePool.hpp" +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" namespace urde { diff --git a/Runtime/MP1/CFrontEndUI.hpp b/Runtime/MP1/CFrontEndUI.hpp index e06e19c21..2fbd28845 100644 --- a/Runtime/MP1/CFrontEndUI.hpp +++ b/Runtime/MP1/CFrontEndUI.hpp @@ -11,6 +11,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/Audio/CSfxManager.hpp" #include "Runtime/Audio/CStaticAudioPlayer.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" diff --git a/Runtime/MP1/CMFGame.hpp b/Runtime/MP1/CMFGame.hpp index b4ddba89e..261bbba37 100644 --- a/Runtime/MP1/CMFGame.hpp +++ b/Runtime/MP1/CMFGame.hpp @@ -4,6 +4,7 @@ #include #include "Runtime/CMFGameBase.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp" #include "Runtime/MP1/CInGameGuiManager.hpp" diff --git a/Runtime/MP1/CQuitGameScreen.cpp b/Runtime/MP1/CQuitGameScreen.cpp index dddaf0b0c..4a364c0f9 100644 --- a/Runtime/MP1/CQuitGameScreen.cpp +++ b/Runtime/MP1/CQuitGameScreen.cpp @@ -1,14 +1,16 @@ -#include "CQuitGameScreen.hpp" -#include "Input/CFinalInput.hpp" -#include "GameGlobalObjects.hpp" -#include "CSimplePool.hpp" -#include "GuiSys/CGuiFrame.hpp" -#include "GuiSys/CGuiTableGroup.hpp" -#include "GuiSys/CGuiTextPane.hpp" -#include "GuiSys/CStringTable.hpp" -#include "GuiSys/CGuiWidgetDrawParms.hpp" -#include "Audio/CSfxManager.hpp" -#include "Graphics/CGraphics.hpp" +#include "Runtime/MP1/CQuitGameScreen.hpp" + +#include "Runtime/GameGlobalObjects.hpp" +#include "Runtime/CSimplePool.hpp" +#include "Runtime/Audio/CSfxManager.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" +#include "Runtime/Input/CFinalInput.hpp" +#include "Runtime/Graphics/CGraphics.hpp" +#include "Runtime/GuiSys/CGuiFrame.hpp" +#include "Runtime/GuiSys/CGuiTableGroup.hpp" +#include "Runtime/GuiSys/CGuiTextPane.hpp" +#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp" +#include "Runtime/GuiSys/CStringTable.hpp" namespace urde::MP1 { diff --git a/Runtime/MP1/CSamusHud.hpp b/Runtime/MP1/CSamusHud.hpp index 3e8ca6a31..25c76597e 100644 --- a/Runtime/MP1/CSamusHud.hpp +++ b/Runtime/MP1/CSamusHud.hpp @@ -6,6 +6,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/rstl.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp" #include "Runtime/GuiSys/CHudBallInterface.hpp" #include "Runtime/GuiSys/CHudBossEnergyInterface.hpp" diff --git a/Runtime/MP1/CSlideShow.hpp b/Runtime/MP1/CSlideShow.hpp index e27c0ce48..ceed2212e 100644 --- a/Runtime/MP1/CSlideShow.hpp +++ b/Runtime/MP1/CSlideShow.hpp @@ -8,6 +8,7 @@ #include "Runtime/CToken.hpp" #include "Runtime/RetroTypes.hpp" #include "Runtime/Audio/CSfxManager.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp" #include "Runtime/GuiSys/CGuiTextSupport.hpp" diff --git a/Runtime/Weapon/CPlayerGun.hpp b/Runtime/Weapon/CPlayerGun.hpp index 9f8e8b181..4962a5707 100644 --- a/Runtime/Weapon/CPlayerGun.hpp +++ b/Runtime/Weapon/CPlayerGun.hpp @@ -5,6 +5,7 @@ #include "Runtime/RetroTypes.hpp" #include "Runtime/rstl.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Character/CActorLights.hpp" #include "Runtime/Character/CModelData.hpp" #include "Runtime/Graphics/CRainSplashGenerator.hpp" diff --git a/Runtime/World/CWorldTransManager.hpp b/Runtime/World/CWorldTransManager.hpp index 418452add..5cc678eff 100644 --- a/Runtime/World/CWorldTransManager.hpp +++ b/Runtime/World/CWorldTransManager.hpp @@ -6,6 +6,7 @@ #include "Runtime/CRandom16.hpp" #include "Runtime/RetroTypes.hpp" #include "Runtime/Audio/CSfxManager.hpp" +#include "Runtime/Camera/CCameraFilter.hpp" #include "Runtime/Character/CModelData.hpp" #include "Runtime/Graphics/CLight.hpp" #include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"