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

@@ -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] = {};

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 <hecl/Pipeline.hpp>
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CAABoxShader.hpp

@@ -2,10 +2,13 @@
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
-#include <zeus/CAABox.hpp>
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 
+namespace zeus {
+class CAABox;
+}
+
 namespace urde {
 
 class CAABoxShader {

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 <algorithm>
+#include <cmath>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CCameraBlurFilter.hpp

@@ -2,8 +2,6 @@
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
-#include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
 #include <zeus/CVector3f.hpp>
 #include <zeus/CVector4f.hpp>
 

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CColoredQuadFilter.hpp

@@ -1,13 +1,18 @@
 #pragma once
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 #include <zeus/CRectangle.hpp>
 
 namespace urde {
+class CTexture;
+
+enum class EFilterShape;
+enum class EFilterType;
 
 class CColoredQuadFilter {
   struct Uniform {

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CDecalShaders.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Runtime/Graphics/CGraphics.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace urde {
 struct CQuadDecal;

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CElementGenShaders.hpp

@@ -2,8 +2,6 @@
 
 #include <array>
 
-#include "Runtime/Graphics/CGraphics.hpp"
-
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace urde {

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CEnergyBarShader.hpp

@@ -2,15 +2,15 @@
 
 #include <vector>
 
-#include "Runtime/Camera/CCameraFilter.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
-#include <zeus/CRectangle.hpp>
 #include <zeus/CVector2f.hpp>
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CTexture;
 
 class CEnergyBarShader {
 public:

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 boo::ObjToken<boo::IShaderPipeline> CEnvFxShaders::m_snowPipeline;

Runtime/Graphics/Shaders/CEnvFxShaders.hpp

@@ -1,8 +1,7 @@
 #pragma once
 
-#include "Runtime/Graphics/CGraphics.hpp"
-
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 #include <zeus/CVector2f.hpp>

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CFluidPlaneShader.hpp

@@ -3,7 +3,6 @@
 #include <vector>
 
 #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 <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
-#include <zeus/CAABox.hpp>
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 #include <zeus/CVector3f.hpp>

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 <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <hecl/Pipeline.hpp>
+#include <zeus/CColor.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CFogVolumeFilter.hpp

@@ -1,10 +1,16 @@
 #pragma once
 
-#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <boo/BooObject.hpp>
 
-#include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
-#include <zeus/CRectangle.hpp>
+namespace boo {
+struct IGraphicsBufferD;
+struct IGraphicsBufferS;
+struct IShaderDataBinding;
+} // namespace boo
+
+namespace zeus {
+class CColor;
+}
 
 namespace urde {
 

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp

@@ -5,11 +5,13 @@
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
-#include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
 #include <zeus/CRectangle.hpp>
 #include <zeus/CVector4f.hpp>
 
+namespace zeus {
+class CVector3f;
+}
+
 namespace urde {
 
 class CFogVolumePlaneShader {

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 <utility>
+
+#include "Runtime/Graphics/CLineRenderer.hpp"
+
+#include <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CLineRendererShaders.hpp

@@ -2,8 +2,6 @@
 
 #include <array>
 
-#include "Runtime/Graphics/CGraphics.hpp"
-
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace urde {

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CMapSurfaceShader.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 

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 <hecl/Backend.hpp>
+#include <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CModelShaders.hpp

@@ -1,22 +1,25 @@
 #pragma once
 
 #include <array>
-#include <optional>
+#include <cstdint>
+#include <memory>
 
 #include "DataSpec/DNAMP1/CMDLMaterials.hpp"
 
 #include "Runtime/Graphics/CGraphics.hpp"
 
-#include <hecl/Backend.hpp>
-#include <hecl/Runtime.hpp>
-
 #include <zeus/CColor.hpp>
 #include <zeus/CVector3f.hpp>
 #include <zeus/CVector4f.hpp>
 
 #define URDE_MAX_LIGHTS 8
 
+namespace hecl::Backend {
+class ShaderTag;
+}
+
 namespace urde {
+class CLight;
 
 enum EExtendedShader : uint8_t {
   Flat,

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp

@@ -2,8 +2,6 @@
 
 #include <array>
 
-#include "Runtime/Graphics/CGraphics.hpp"
-
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>

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 <hecl/Pipeline.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
-#include <zeus/CColor.hpp>
+
+namespace zeus {
+class CColor;
+}
 
 namespace urde {
 class CTexture;

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 <cstring>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+
+#include <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CRadarPaintShader.hpp

@@ -2,13 +2,14 @@
 
 #include <vector>
 
-#include "Runtime/Camera/CCameraFilter.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
-#include <zeus/CRectangle.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CTexture;
 
 class CRadarPaintShader {
 public:

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CRandomStaticFilter.hpp

@@ -1,12 +1,15 @@
 #pragma once
 
-#include "Runtime/Camera/CCameraFilter.hpp"
+#include "Runtime/CToken.hpp"
 
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 #include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
-#include <zeus/CRectangle.hpp>
 
 namespace urde {
+class CTexture;
+
+enum class EFilterShape;
+enum class EFilterType;
 
 class CRandomStaticFilter {
   struct Uniform {

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CScanLinesFilter.hpp

@@ -1,12 +1,15 @@
 #pragma once
 
-#include "Runtime/Camera/CCameraFilter.hpp"
+#include "Runtime/CToken.hpp"
 
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 #include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
-#include <zeus/CRectangle.hpp>
 
 namespace urde {
+class CTexture;
+
+enum class EFilterShape;
+enum class EFilterType;
 
 class CScanLinesFilter {
   struct Uniform {

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 <hecl/Pipeline.hpp>
 
 #define WARP_RAMP_RES 32
 

Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
-#include <zeus/CColor.hpp>
+
 #include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CTextSupportShader.hpp

@@ -13,8 +13,8 @@
 
 namespace urde {
 class CGlyph;
-class CTextRenderBuffer;
 class CFontImageDef;
+class CTextRenderBuffer;
 
 class CTextSupportShader {
   friend class CTextRenderBuffer;

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 <hecl/Pipeline.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
 #include "Runtime/CToken.hpp"
-#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
@@ -10,6 +11,10 @@
 #include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CTexture;
+
+enum class EFilterShape;
+enum class EFilterType;
 
 class CTexturedQuadFilter {
 public:

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 <hecl/Pipeline.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CThermalColdFilter.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Runtime/RetroTypes.hpp"
-
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>

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 <hecl/Pipeline.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CThermalHotFilter.hpp

@@ -3,7 +3,6 @@
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 #include <zeus/CColor.hpp>
-#include <zeus/CMatrix4f.hpp>
 
 namespace urde {
 

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 <hecl/Pipeline.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CWorldShadowShader.hpp

@@ -2,9 +2,11 @@
 
 #include <optional>
 
-#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/GCNTypes.hpp"
 #include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
 
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
 #include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 

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 <hecl/Pipeline.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 

Runtime/Graphics/Shaders/CXRayBlurFilter.hpp

@@ -3,7 +3,6 @@
 #include "Runtime/CToken.hpp"
 
 #include <boo/graphicsdev/IGraphicsDataFactory.hpp>
-#include <zeus/CColor.hpp>
 #include <zeus/CMatrix4f.hpp>
 
 namespace urde {

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 {
 

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"
 

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 {
 

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"

Runtime/MP1/CMFGame.hpp

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "Runtime/CMFGameBase.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
 #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
 #include "Runtime/MP1/CInGameGuiManager.hpp"
 

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 {
 

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"

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"
 

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"

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"