2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 13:44:56 +00:00

Huge shader refactor

This commit is contained in:
Jack Andersen
2018-10-06 16:59:17 -10:00
parent 0a0a581f2d
commit c307e354ca
184 changed files with 8777 additions and 14295 deletions

View File

@@ -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)

View File

@@ -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[] =

View File

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

View File

@@ -16,10 +16,7 @@ class CSwooshDescription;
class CParticleSwoosh : public CParticleGen
{
friend struct OGLParticleSwooshDataBindingFactory;
friend struct VulkanParticleSwooshDataBindingFactory;
friend struct D3DParticleSwooshDataBindingFactory;
friend struct MetalParticleSwooshDataBindingFactory;
friend class CParticleSwooshShaders;
struct SSwooshData
{