TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup duplicate var, and constructor-init skylight shaderconsts

Browse source
This commit is contained in:
AzaezelX 2019-04-10 12:54:46 -05:00
parent 68f47d6041
commit 15ca6eabb4
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -119,7 +119,6 @@ void ProbeRenderInst::set(const ProbeRenderInst *probeInfo)
ProbeShaderConstants::ProbeShaderConstants() ProbeShaderConstants::ProbeShaderConstants()
: mInit(false), : mInit(false),
mShader(NULL), mShader(NULL),
mProbeParamsSC(NULL),
mProbePositionSC(NULL), mProbePositionSC(NULL),
mProbeRefPosSC(NULL), mProbeRefPosSC(NULL),
mProbeBoxMinSC(NULL), mProbeBoxMinSC(NULL),
@ -127,7 +126,10 @@ ProbeShaderConstants::ProbeShaderConstants()
mProbeConfigDataSC(NULL), mProbeConfigDataSC(NULL),
mProbeSpecularCubemapSC(NULL), mProbeSpecularCubemapSC(NULL),
mProbeIrradianceCubemapSC(NULL), mProbeIrradianceCubemapSC(NULL),
mProbeCountSC(NULL) mProbeCountSC(NULL),
mSkylightSpecularMap(NULL),
mSkylightIrradMap(NULL),
mHasSkylight(NULL)
{ {
} }
@ -150,9 +152,7 @@ void ProbeShaderConstants::init(GFXShader* shader)
mShader = shader; mShader = shader;
mShader->getReloadSignal().notify(this, &ProbeShaderConstants::_onShaderReload); mShader->getReloadSignal().notify(this, &ProbeShaderConstants::_onShaderReload);
} }
mProbeParamsSC = shader->getShaderConstHandle("$probeParams");
//Reflection Probes //Reflection Probes
mProbePositionSC = shader->getShaderConstHandle(ShaderGenVars::probePosition); mProbePositionSC = shader->getShaderConstHandle(ShaderGenVars::probePosition);
mProbeRefPosSC = shader->getShaderConstHandle(ShaderGenVars::probeRefPos); mProbeRefPosSC = shader->getShaderConstHandle(ShaderGenVars::probeRefPos);

4
Engine/source/renderInstance/renderProbeMgr.h
View file

@ -131,9 +131,7 @@ struct ProbeShaderConstants
bool mInit; bool mInit;
GFXShaderRef mShader; GFXShaderRef mShader;
GFXShaderConstHandle* mProbeParamsSC;
//Reflection Probes //Reflection Probes
GFXShaderConstHandle *mProbePositionSC; GFXShaderConstHandle *mProbePositionSC;
GFXShaderConstHandle *mProbeRefPosSC; GFXShaderConstHandle *mProbeRefPosSC;