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

remove push_back uses in favor of consistent [i], fill probe data with defaults before overriding to ensure no garbage data is getting referenced.

Browse source
This commit is contained in:
Azaezel 2019-02-07 08:05:39 -06:00
parent 7837576de7
commit 4aa371cea2
1 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -670,18 +670,36 @@ void RenderProbeMgr::render( SceneRenderState *state )
Vector<float> probeUseSphereMode; Vector<float> probeUseSphereMode;
Vector<float> probeRadius; Vector<float> probeRadius;
Vector<float> probeAttenuation; Vector<float> probeAttenuation;
probePositions.setSize(MAXPROBECOUNT);
probeWorldToObj.setSize(MAXPROBECOUNT);
probeBBMin.setSize(MAXPROBECOUNT);
probeBBMax.setSize(MAXPROBECOUNT);
probeUseSphereMode.setSize(MAXPROBECOUNT);
probeRadius.setSize(MAXPROBECOUNT);
probeAttenuation.setSize(MAXPROBECOUNT);
Vector<GFXCubemapHandle> cubeMaps; Vector<GFXCubemapHandle> cubeMaps;
Vector<GFXCubemapHandle> irradMaps; Vector<GFXCubemapHandle> irradMaps;
probePositions.setSize(MAXPROBECOUNT);
probePositions.fill(Point3F::Zero);
probeWorldToObj.setSize(MAXPROBECOUNT);
probeWorldToObj.fill(MatrixF::Identity);
probeBBMin.setSize(MAXPROBECOUNT);
probeBBMin.fill(Point3F::Zero);
probeBBMax.setSize(MAXPROBECOUNT);
probeBBMax.fill(Point3F::Zero);
probeUseSphereMode.setSize(MAXPROBECOUNT);
probeUseSphereMode.fill(0.0f);
probeRadius.setSize(MAXPROBECOUNT);
probeRadius.fill(0.0f);
probeAttenuation.setSize(MAXPROBECOUNT);
probeAttenuation.fill(0.0f);
cubeMaps.setSize(MAXPROBECOUNT);
cubeMaps.fill(NULL);
irradMaps.setSize(MAXPROBECOUNT);
irradMaps.fill(NULL);
U32 effectiveProbeCount = 0; U32 effectiveProbeCount = 0;
for (U32 i = 0; i < probeCount; i++) for (U32 i = 0; i < probeCount; i++)
@ -709,7 +727,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
MatrixF trans = curEntry->getTransform(); MatrixF trans = curEntry->getTransform();
trans.inverse(); trans.inverse();
probeWorldToObj.push_back(trans); probeWorldToObj[i]=trans;
probeBBMin[i] = curEntry->mBounds.minExtents; probeBBMin[i] = curEntry->mBounds.minExtents;
probeBBMax[i] = curEntry->mBounds.maxExtents; probeBBMax[i] = curEntry->mBounds.maxExtents;
@ -719,14 +737,15 @@ void RenderProbeMgr::render( SceneRenderState *state )
probeRadius[i] = curEntry->mRadius; probeRadius[i] = curEntry->mRadius;
probeAttenuation[i] = 1; probeAttenuation[i] = 1;
cubeMaps.push_back(curEntry->mCubemap); cubeMaps[i] = curEntry->mCubemap;
irradMaps.push_back(curEntry->mIrradianceCubemap); irradMaps[i] = curEntry->mIrradianceCubemap;
effectiveProbeCount++; effectiveProbeCount++;
} }
if (effectiveProbeCount != 0) if (effectiveProbeCount != 0)
{ {
U32 count = effectiveProbeCount;
matParams->setSafe(numProbesSC, (float)effectiveProbeCount); matParams->setSafe(numProbesSC, (float)effectiveProbeCount);
GFXCubemapArrayHandle mCubemapArray; GFXCubemapArrayHandle mCubemapArray;
@ -735,8 +754,8 @@ void RenderProbeMgr::render( SceneRenderState *state )
GFXCubemapArrayHandle mIrradArray; GFXCubemapArrayHandle mIrradArray;
mIrradArray = GFXCubemapArrayHandle(GFX->createCubemapArray()); mIrradArray = GFXCubemapArrayHandle(GFX->createCubemapArray());
mCubemapArray->initStatic(cubeMaps.address(), cubeMaps.size()); mCubemapArray->initStatic(cubeMaps.address(), count);
mIrradArray->initStatic(irradMaps.address(), irradMaps.size()); mIrradArray->initStatic(irradMaps.address(), count);
NamedTexTarget *deferredTarget = NamedTexTarget::find(RenderDeferredMgr::BufferName); NamedTexTarget *deferredTarget = NamedTexTarget::find(RenderDeferredMgr::BufferName);
if (deferredTarget) if (deferredTarget)
@ -766,16 +785,17 @@ void RenderProbeMgr::render( SceneRenderState *state )
GFX->setCubeArrayTexture(4, mCubemapArray); GFX->setCubeArrayTexture(4, mCubemapArray);
GFX->setCubeArrayTexture(5, mIrradArray); GFX->setCubeArrayTexture(5, mIrradArray);
//Final packing
AlignedArray<Point4F> _probePositions(effectiveProbeCount, sizeof(Point4F), (U8*)probePositions.address(), false); //Final packing
AlignedArray<Point4F> _probeBBMin(effectiveProbeCount, sizeof(Point4F), (U8*)probeBBMin.address(), false); AlignedArray<Point4F> _probePositions(count, sizeof(Point4F), (U8*)probePositions.address(), false);
AlignedArray<Point4F> _probeBBMax(effectiveProbeCount, sizeof(Point4F), (U8*)probeBBMax.address(), false); AlignedArray<Point4F> _probeBBMin(count, sizeof(Point4F), (U8*)probeBBMin.address(), false);
AlignedArray<float> _probeUseSphereMode(effectiveProbeCount, sizeof(float), (U8*)probeUseSphereMode.address(), false); AlignedArray<Point4F> _probeBBMax(count, sizeof(Point4F), (U8*)probeBBMax.address(), false);
AlignedArray<float> _probeRadius(effectiveProbeCount, sizeof(float), (U8*)probeRadius.address(), false); AlignedArray<float> _probeUseSphereMode(count, sizeof(float), (U8*)probeUseSphereMode.address(), false);
AlignedArray<float> _probeAttenuation(effectiveProbeCount, sizeof(float), (U8*)probeAttenuation.address(), false); AlignedArray<float> _probeRadius(count, sizeof(float), (U8*)probeRadius.address(), false);
AlignedArray<float> _probeAttenuation(count, sizeof(float), (U8*)probeAttenuation.address(), false);
matParams->set(probePositionSC, _probePositions); matParams->set(probePositionSC, _probePositions);
matParams->set(probeWorldToObjSC, probeWorldToObj.address(), effectiveProbeCount); matParams->set(probeWorldToObjSC, probeWorldToObj.address(), count);
matParams->set(probeBBMinSC, _probeBBMin); matParams->set(probeBBMinSC, _probeBBMin);
matParams->set(probeBBMaxSC, _probeBBMax); matParams->set(probeBBMaxSC, _probeBBMax);
matParams->set(probeUseSphereModeSC, _probeUseSphereMode); matParams->set(probeUseSphereModeSC, _probeUseSphereMode);