Merge branch 'shader-refactor'

Runtime/Particle/CColorElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CCOLORELEMENT_HPP__
-#define __URDE_CCOLORELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -101,4 +100,3 @@ public:
 };
 }
 
-#endif // __URDE_CCOLORELEMENT_HPP__

Runtime/Particle/CDecal.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CDECAL_HPP__
-#define __URDE_CDECAL_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CToken.hpp"
@@ -72,4 +71,3 @@ public:
 };
 }
 
-#endif // __URDE_CDECAL_HPP__

Runtime/Particle/CDecalDataFactory.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CDECALDATAFACTORY_HPP__
-#define __URDE_CDECALDATAFACTORY_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CFactoryMgr.hpp"
@@ -25,4 +24,3 @@ public:
 CFactoryFnReturn FDecalDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms,
                                    CObjectReference*);
 }
-#endif // __URDE_CDECALDATAFACTORY_HPP__

Runtime/Particle/CDecalDescription.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CDECALDESCRIPTION_HPP__
-#define __URDE_CDECALDESCRIPTION_HPP__
+#pragma once
 
 #include "CRealElement.hpp"
 #include "CIntElement.hpp"
@@ -40,4 +39,3 @@ public:
 };
 
 }
-#endif // __URDE_CDECALDESCRIPTION_HPP__

Runtime/Particle/CDecalManager.cpp

@@ -16,8 +16,6 @@ CAssetId CDecalManager::m_LastDecalCreatedAssetId = -1;
 rstl::reserved_vector<CDecalManager::SDecal, 64> CDecalManager::m_DecalPool;
 rstl::reserved_vector<s32, 64> CDecalManager::m_ActiveIndexList;
 
-URDE_DECL_SPECIALIZE_SHADER(CDecalShaders)
-
 void CDecalManager::Initialize()
 {
     if (m_PoolInitialized)
@@ -34,7 +32,7 @@ void CDecalManager::Initialize()
     m_LastDecalCreatedAssetId = -1;
 
     /* Compile shaders */
-    TShader<CDecalShaders>::Initialize();
+    CDecalShaders::Initialize();
 }
 
 void CDecalManager::Reinitialize()
@@ -55,7 +53,7 @@ void CDecalManager::Shutdown()
 {
     m_ActiveIndexList.clear();
     m_DecalPool.clear();
-    TShader<CDecalShaders>::Shutdown();
+    CDecalShaders::Shutdown();
 }
 
 void CDecalManager::AddToRenderer(const zeus::CFrustum& frustum, const CStateManager& mgr)

Runtime/Particle/CDecalManager.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CDECALMANAGER_HPP__
-#define __URDE_CDECALMANAGER_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "rstl.hpp"
@@ -45,4 +44,3 @@ public:
 
 }
 
-#endif // __URDE_CDECALMANAGER_HPP__

Runtime/Particle/CElectricDescription.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CELECTRICDESCRIPTION_HPP__
-#define __URDE_CELECTRICDESCRIPTION_HPP__
+#pragma once
 
 #include "CParticleDataFactory.hpp"
 #include "CRealElement.hpp"
@@ -37,4 +36,3 @@ public:
 };
 }
 
-#endif // __URDE_CELECTRICDESCRIPTION_HPP__

Runtime/Particle/CElementGen.cpp

@@ -16,8 +16,6 @@ namespace urde
 {
 static logvisor::Module Log("urde::CElementGen");
 
-URDE_DECL_SPECIALIZE_SHADER(CElementGenShaders)
-
 u16 CElementGen::g_GlobalSeed = 99;
 bool CElementGen::g_subtractBlend = false;
 
@@ -41,12 +39,12 @@ void CElementGen::Initialize()
     g_ParticleSystemInitialized = true;
 
     /* Compile shaders */
-    TShader<CElementGenShaders>::Initialize();
+    CElementGenShaders::Initialize();
 }
 
 void CElementGen::Shutdown()
 {
-    TShader<CElementGenShaders>::Shutdown();
+    CElementGenShaders::Shutdown();
 }
 
 static const size_t ShadClsSizes[] =

Runtime/Particle/CElementGen.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CELEMENTGEN_HPP__
-#define __URDE_CELEMENTGEN_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "zeus/CTransform.hpp"
@@ -248,4 +247,3 @@ ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags)
 
 }
 
-#endif // __URDE_CELEMENTGEN_HPP__

Runtime/Particle/CEmitterElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CEMITTERELEMENT_HPP__
-#define __URDE_CEMITTERELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -52,4 +51,3 @@ public:
 
 }
 
-#endif // __URDE_CEMITTERELEMENT_HPP__

Runtime/Particle/CFlameWarp.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CFLAMEWARP_HPP__
-#define __URDE_CFLAMEWARP_HPP__
+#pragma once
 
 #include "CWarp.hpp"
 
@@ -39,4 +38,3 @@ public:
 };
 }
 
-#endif // __URDE_CFLAMEWARP_HPP__

Runtime/Particle/CGenDescription.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CGENDESCRIPTION_HPP__
-#define __URDE_CGENDESCRIPTION_HPP__
+#pragma once
 
 #include <memory>
 #include "CRealElement.hpp"
@@ -112,4 +111,3 @@ public:
 
 }
 
-#endif // __URDE_CGENDESCRIPTION_HPP__

Runtime/Particle/CIntElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CINTELEMENT_HPP__
-#define __URDE_CINTELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -215,4 +214,3 @@ public:
 
 }
 
-#endif // __URDE_CINTELEMENT_HPP__

Runtime/Particle/CModVectorElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CMODVECTORELEMENT_HPP__
-#define __URDE_CMODVECTORELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -169,4 +168,3 @@ public:
 
 }
 
-#endif // __URDE_CMODVECTORELEMENT_HPP__

Runtime/Particle/CParticleDataFactory.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLEDATAFACTORY_HPP__
-#define __URDE_CPARTICLEDATAFACTORY_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CFactoryMgr.hpp"
@@ -106,4 +105,3 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const
 
 }
 
-#endif // __URDE_CPARTICLEDATAFACTORY_HPP__

Runtime/Particle/CParticleElectric.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLEELECTRIC_HPP__
-#define __URDE_CPARTICLEELECTRIC_HPP__
+#pragma once
 
 #include "CParticleGen.hpp"
 #include "CToken.hpp"
@@ -144,4 +143,3 @@ public:
 
 }
 
-#endif // __URDE_CPARTICLEELECTRIC_HPP__

Runtime/Particle/CParticleElectricDataFactory.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__
-#define __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CFactoryMgr.hpp"
@@ -24,4 +23,3 @@ CFactoryFnReturn FParticleElectricDataFactory(const SObjectTag& tag, CInputStrea
                                               CObjectReference*);
 }
 
-#endif // __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__

Runtime/Particle/CParticleGen.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLEGEN_HPP__
-#define __URDE_CPARTICLEGEN_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "Graphics/CLight.hpp"
@@ -66,4 +65,3 @@ public:
 
 }
 
-#endif // __URDE_CPARTICLEGEN_HPP__

Runtime/Particle/CParticleGlobals.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLEGLOBALS_HPP__
-#define __URDE_CPARTICLEGLOBALS_HPP__
+#pragma once
 
 #include "zeus/CVector3f.hpp"
 #include "zeus/CVector4f.hpp"
@@ -85,4 +84,3 @@ struct SParticleUniforms
 
 }
 
-#endif // __URDE_CPARTICLEGLOBALS_HPP__

Runtime/Particle/CParticleSwoosh.cpp

@@ -6,8 +6,6 @@
 namespace urde
 {
 
-URDE_DECL_SPECIALIZE_SHADER(CParticleSwooshShaders)
-
 int CParticleSwoosh::g_ParticleSystemAliveCount = 0;
 
 CParticleSwoosh::CParticleSwoosh(const TToken<CSwooshDescription>& desc, int leng)

Runtime/Particle/CParticleSwoosh.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLESWOOSH_HPP__
-#define __URDE_CPARTICLESWOOSH_HPP__
+#pragma once
 
 #include "CParticleGen.hpp"
 #include "CToken.hpp"
@@ -16,10 +15,7 @@ class CSwooshDescription;
 
 class CParticleSwoosh : public CParticleGen
 {
-    friend struct OGLParticleSwooshDataBindingFactory;
-    friend struct VulkanParticleSwooshDataBindingFactory;
-    friend struct D3DParticleSwooshDataBindingFactory;
-    friend struct MetalParticleSwooshDataBindingFactory;
+    friend class CParticleSwooshShaders;
 
     struct SSwooshData
     {
@@ -227,4 +223,3 @@ public:
 
 }
 
-#endif // __URDE_CPARTICLESWOOSH_HPP__

Runtime/Particle/CParticleSwooshDataFactory.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__
-#define __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CFactoryMgr.hpp"
@@ -23,4 +22,3 @@ CFactoryFnReturn FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream&
                                             CObjectReference*);
 }
 
-#endif // __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__

Runtime/Particle/CProjectileWeaponDataFactory.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__
-#define __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__
+#pragma once
 
 #include "RetroTypes.hpp"
 #include "CFactoryMgr.hpp"
@@ -24,4 +23,3 @@ CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInputStrea
                                               CObjectReference*);
 }
 
-#endif // __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__

Runtime/Particle/CRealElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CREALELEMENT_HPP__
-#define __URDE_CREALELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -376,4 +375,3 @@ public:
 };
 }
 
-#endif // __URDE_CREALELEMENT_HPP__

Runtime/Particle/CSpawnSystemKeyframeData.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
-#define __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__
+#pragma once
 
 #include "IOStreams.hpp"
 #include "CToken.hpp"
@@ -40,4 +39,3 @@ public:
 
 }
 
-#endif // __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__

Runtime/Particle/CSwooshDescription.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CSWOOSHDESCRIPTION_HPP__
-#define __URDE_CSWOOSHDESCRIPTION_HPP__
+#pragma once
 
 #include "CParticleDataFactory.hpp"
 #include "CRealElement.hpp"
@@ -49,4 +48,3 @@ public:
 };
 }
 
-#endif // __URDE_CSWOOSHDESCRIPTION_HPP__

Runtime/Particle/CUVElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CUVELEMENT_HPP__
-#define __URDE_CUVELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 #include "CToken.hpp"
@@ -69,4 +68,3 @@ public:
 
 }
 
-#endif // __URDE_CUVELEMENT_HPP__

Runtime/Particle/CVectorElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CVECTORELEMENT_HPP__
-#define __URDE_CVECTORELEMENT_HPP__
+#pragma once
 
 #include "IElement.hpp"
 
@@ -216,4 +215,3 @@ public:
 
 }
 
-#endif // __URDE_CVECTORELEMENT_HPP__

Runtime/Particle/CWarp.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CWARP_HPP__
-#define __URDE_CWARP_HPP__
+#pragma once
 
 #include "zeus/CColor.hpp"
 #include "zeus/CVector3f.hpp"
@@ -22,4 +21,3 @@ public:
 
 }
 
-#endif // __URDE_CWARP_HPP__

Runtime/Particle/CWeaponDescription.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_CWEAPONDESCRIPTION_HPP__
-#define __URDE_CWEAPONDESCRIPTION_HPP__
+#pragma once
 
 #include "CParticleDataFactory.hpp"
 #include "CRealElement.hpp"
@@ -58,4 +57,3 @@ public:
     std::unique_ptr<CRealElement> xb0_FOFF;
 };
 }
-#endif // __URDE_CWEAPONDESCRIPTION_HPP__

Runtime/Particle/IElement.hpp

@@ -1,5 +1,4 @@
-#ifndef __URDE_IELEMENT_HPP__
-#define __URDE_IELEMENT_HPP__
+#pragma once
 
 #include <memory>
 #include "GCNTypes.hpp"
@@ -57,4 +56,3 @@ public:
 
 }
 
-#endif // __URDE_IELEMENT_HPP__