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

WIP hook-in of the cubemap array.

Browse source 
Also inversed probe transforms to make them correct.
This commit is contained in:
Areloch 2019-01-21 01:50:13 -06:00
parent c0e8b047f5
commit 5b7e2edb66
4 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/T3D/lighting/reflectionProbe.cpp
View file

@ -574,8 +574,8 @@ void ReflectionProbe::processStaticCubemap()
IBLUtilities::SaveCubeMap(getPrefilterMapPath(), mPrefilterMap->mCubemap); IBLUtilities::SaveCubeMap(getPrefilterMapPath(), mPrefilterMap->mCubemap);
} }
mProbeInfo->mCubemap = &mPrefilterMap->mCubemap; mProbeInfo->mCubemap = mPrefilterMap->mCubemap;
mProbeInfo->mIrradianceCubemap = &mIrridianceMap->mCubemap; mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
} }
void ReflectionProbe::updateMaterial() void ReflectionProbe::updateMaterial()
@ -588,17 +588,17 @@ void ReflectionProbe::updateMaterial()
{ {
if (mPrefilterMap != nullptr && mPrefilterMap->mCubemap.isValid()) if (mPrefilterMap != nullptr && mPrefilterMap->mCubemap.isValid())
{ {
mProbeInfo->mCubemap = &mPrefilterMap->mCubemap; mProbeInfo->mCubemap = mPrefilterMap->mCubemap;
} }
if (mIrridianceMap != nullptr && mIrridianceMap->mCubemap.isValid()) if (mIrridianceMap != nullptr && mIrridianceMap->mCubemap.isValid())
{ {
mProbeInfo->mIrradianceCubemap = &mIrridianceMap->mCubemap; mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
} }
} }
} }
else if (mReflectionModeType == DynamicCubemap && !mDynamicCubemap.isNull()) else if (mReflectionModeType == DynamicCubemap && !mDynamicCubemap.isNull())
{ {
mProbeInfo->mCubemap = &mDynamicCubemap; mProbeInfo->mCubemap = mDynamicCubemap;
} }
if (mBrdfTexture.isValid()) if (mBrdfTexture.isValid())

26
Engine/source/lighting/probeManager.cpp
View file

@ -71,13 +71,13 @@ ProbeRenderInst::ProbeRenderInst() : SystemInterface(),
ProbeRenderInst::~ProbeRenderInst() ProbeRenderInst::~ProbeRenderInst()
{ {
if (mCubemap && mCubemap->isValid()) if (mCubemap && mCubemap.isValid())
{ {
mCubemap->free(); mCubemap.free();
} }
if (mIrradianceCubemap && mIrradianceCubemap->isValid()) if (mIrradianceCubemap && mIrradianceCubemap.isValid())
{ {
mIrradianceCubemap->free(); mIrradianceCubemap.free();
} }
if (mBRDFTexture && mBRDFTexture->isValid()) if (mBRDFTexture && mBRDFTexture->isValid())
{ {
@ -387,12 +387,12 @@ void ProbeManager::_update4ProbeConsts( const SceneData &sgData,
probeLocalPositions[i].y = localProbePos.y; probeLocalPositions[i].y = localProbePos.y;
probeLocalPositions[i].z = localProbePos.z; probeLocalPositions[i].z = localProbePos.z;
if (probe->mCubemap && !probe->mCubemap->isNull()) if (probe->mCubemap && !probe->mCubemap.isNull())
{ {
S32 samplerReg = probeCubemapSC->getSamplerRegister(); S32 samplerReg = probeCubemapSC->getSamplerRegister();
if(samplerReg != -1) if(samplerReg != -1)
GFX->setCubeTexture(samplerReg + i, probe->mCubemap->getPointer()); GFX->setCubeTexture(samplerReg + i, probe->mCubemap.getPointer());
} }
} }
@ -410,9 +410,9 @@ void ProbeManager::_update4ProbeConsts( const SceneData &sgData,
} }
else else
{ {
/*if (probe->mCubemap && !probe->mCubemap->isNull()) /*if (probe->mCubemap && !probe->mCubemap.isNull())
{ {
GFX->setCubeTexture(1, probe->mCubemap->getPointer()); GFX->setCubeTexture(1, probe->mCubemap.getPointer());
}*/ }*/
if (probeCubemapSC->isValid()) if (probeCubemapSC->isValid())
{ {
@ -1007,21 +1007,21 @@ void ProbeManager::ReflectProbeMaterialInfo::setProbeParameters(const ProbeRende
GFX->setTexture(2, matInfoTexTarget->getTexture()); GFX->setTexture(2, matInfoTexTarget->getTexture());
//Add some safety catches in the event the cubemaps aren't fully initialized yet //Add some safety catches in the event the cubemaps aren't fully initialized yet
if (probeInfo->mCubemap == nullptr || probeInfo->mCubemap->isNull()) if (probeInfo->mCubemap == nullptr || probeInfo->mCubemap.isNull())
{ {
GFX->setCubeTexture(3, nullptr); GFX->setCubeTexture(3, nullptr);
matParams->setSafe(cubeMips, 2.0f); matParams->setSafe(cubeMips, 2.0f);
} }
else else
{ {
GFX->setCubeTexture(3, probeInfo->mCubemap->getPointer()); GFX->setCubeTexture(3, probeInfo->mCubemap.getPointer());
matParams->setSafe(cubeMips, mPow(probeInfo->mCubemap->getPointer()->getMipMapLevels(), 2.0f)); matParams->setSafe(cubeMips, mPow(probeInfo->mCubemap.getPointer()->getMipMapLevels(), 2.0f));
} }
if (probeInfo->mIrradianceCubemap == nullptr || probeInfo->mIrradianceCubemap->isNull()) if (probeInfo->mIrradianceCubemap == nullptr || probeInfo->mIrradianceCubemap.isNull())
GFX->setCubeTexture(4, nullptr); GFX->setCubeTexture(4, nullptr);
else else
GFX->setCubeTexture(4, probeInfo->mIrradianceCubemap->getPointer()); GFX->setCubeTexture(4, probeInfo->mIrradianceCubemap.getPointer());
GFX->setTexture(5, probeInfo->mBRDFTexture->getPointer()); GFX->setTexture(5, probeInfo->mBRDFTexture->getPointer());

4
Engine/source/lighting/probeManager.h
View file

@ -88,9 +88,9 @@ struct ProbeRenderInst : public SystemInterface<ProbeRenderInst>
Box3F mBounds; Box3F mBounds;
Point3F mProbePosOffset; Point3F mProbePosOffset;
GFXCubemapHandle *mCubemap; GFXCubemapHandle mCubemap;
GFXCubemapHandle *mIrradianceCubemap; GFXCubemapHandle mIrradianceCubemap;
GFXTexHandle *mBRDFTexture; GFXTexHandle *mBRDFTexture;

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

@ -318,12 +318,14 @@ void RenderProbeMgr::render( SceneRenderState *state )
dMemset(probeRadius.getBuffer(), 0, probeRadius.getBufferSize()); dMemset(probeRadius.getBuffer(), 0, probeRadius.getBufferSize());
dMemset(probeAttenuation.getBuffer(), 0, probeAttenuation.getBufferSize()); dMemset(probeAttenuation.getBuffer(), 0, probeAttenuation.getBufferSize());
Vector<GFXCubemapHandle> cubeMaps;
Vector<GFXCubemapHandle> irradMaps;
if (reflProbeMat && reflProbeMat->matInstance) if (reflProbeMat && reflProbeMat->matInstance)
{ {
MaterialParameters *matParams = reflProbeMat->matInstance->getMaterialParameters(); MaterialParameters *matParams = reflProbeMat->matInstance->getMaterialParameters();
MaterialParameterHandle *numProbesSC = reflProbeMat->matInstance->getMaterialParameterHandle("$numProbes"); MaterialParameterHandle *numProbesSC = reflProbeMat->matInstance->getMaterialParameterHandle("$numProbes");
matParams->setSafe(numProbesSC, (float)probeCount);
MaterialParameterHandle *probePositionSC = reflProbeMat->matInstance->getMaterialParameterHandle("$inProbePosArray"); MaterialParameterHandle *probePositionSC = reflProbeMat->matInstance->getMaterialParameterHandle("$inProbePosArray");
MaterialParameterHandle *probeWorldToObjSC = reflProbeMat->matInstance->getMaterialParameterHandle("$worldToObjArray"); MaterialParameterHandle *probeWorldToObjSC = reflProbeMat->matInstance->getMaterialParameterHandle("$worldToObjArray");
@ -333,6 +335,9 @@ void RenderProbeMgr::render( SceneRenderState *state )
MaterialParameterHandle *probeRadiusSC = reflProbeMat->matInstance->getMaterialParameterHandle("$radius"); MaterialParameterHandle *probeRadiusSC = reflProbeMat->matInstance->getMaterialParameterHandle("$radius");
MaterialParameterHandle *probeAttenuationSC = reflProbeMat->matInstance->getMaterialParameterHandle("$attenuation"); MaterialParameterHandle *probeAttenuationSC = reflProbeMat->matInstance->getMaterialParameterHandle("$attenuation");
MaterialParameterHandle *probeCubemapArraySC = reflProbeMat->matInstance->getMaterialParameterHandle("$cubeMap");
MaterialParameterHandle *probeIrradianceArraySC = reflProbeMat->matInstance->getMaterialParameterHandle("$irradianceCubemap");
U32 effectiveProbeCount = 0; U32 effectiveProbeCount = 0;
for (U32 i = 0; i < probeCount; i++) for (U32 i = 0; i < probeCount; i++)
@ -342,11 +347,20 @@ void RenderProbeMgr::render( SceneRenderState *state )
ProbeRenderInst* curEntry = ProbeRenderInst::all[i]; ProbeRenderInst* curEntry = ProbeRenderInst::all[i];
if (!curEntry->mIsEnabled)
continue;
if (curEntry->mCubemap.isNull() || curEntry->mIrradianceCubemap.isNull())
continue;
//Setup //Setup
const Point3F &probePos = curEntry->getPosition(); const Point3F &probePos = curEntry->getPosition();
probePositions[i] = probePos + curEntry->mProbePosOffset; probePositions[i] = probePos + curEntry->mProbePosOffset;
probeWorldToObj[i] = curEntry->getTransform(); MatrixF trans = curEntry->getTransform();
trans.inverse();
probeWorldToObj[i] = trans;
probeBBMin[i] = curEntry->mBounds.minExtents; probeBBMin[i] = curEntry->mBounds.minExtents;
probeBBMax[i] = curEntry->mBounds.maxExtents; probeBBMax[i] = curEntry->mBounds.maxExtents;
@ -356,11 +370,28 @@ void RenderProbeMgr::render( SceneRenderState *state )
probeRadius[i] = curEntry->mRadius; probeRadius[i] = curEntry->mRadius;
probeAttenuation[i] = 1; probeAttenuation[i] = 1;
cubeMaps.push_back(curEntry->mCubemap);
irradMaps.push_back(curEntry->mIrradianceCubemap);
effectiveProbeCount++; effectiveProbeCount++;
} }
if (effectiveProbeCount != 0) if (effectiveProbeCount != 0)
{ {
matParams->setSafe(numProbesSC, (float)effectiveProbeCount);
GFXCubemapArrayHandle mCubemapArray;
mCubemapArray = GFXCubemapArrayHandle(GFX->createCubemapArray());
GFXCubemapArrayHandle mIrradArray;
mIrradArray = GFXCubemapArrayHandle(GFX->createCubemapArray());
mCubemapArray->initStatic(cubeMaps.address(), cubeMaps.size());
mIrradArray->initStatic(irradMaps.address(), irradMaps.size());
GFX->setCubeArrayTexture(3, mCubemapArray);
GFX->setCubeArrayTexture(4, mIrradArray);
matParams->set(probePositionSC, probePositions); matParams->set(probePositionSC, probePositions);
matParams->set(probeWorldToObjSC, probeWorldToObj.address(), probeWorldToObj.size()); matParams->set(probeWorldToObjSC, probeWorldToObj.address(), probeWorldToObj.size());
matParams->set(probeBBMinSC, probeBBMin); matParams->set(probeBBMinSC, probeBBMin);