TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates and fixes to probe and lighting logic.

Browse source
This commit is contained in:
Areloch 2018-09-17 01:52:18 -05:00
parent b19a4b22c8
commit f31445751f
23 changed files with 568 additions and 1466 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/renderInstance/renderPassManager.h
View file

@ -487,6 +487,7 @@ struct ProbeRenderInst : public RenderInst
F32 mIntensity;
Box3F mBounds;
Point3F mProbePosOffset;
GFXCubemapHandle *mCubemap;

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

@ -490,6 +490,7 @@ RenderProbeMgr::ReflectProbeMaterialInfo::ReflectProbeMaterialInfo(const String
useCubemap = matInstance->getMaterialParameterHandle("$useCubemap");
cubemap = matInstance->getMaterialParameterHandle("$cubeMap");
cubeMips = matInstance->getMaterialParameterHandle("$cubeMips");
eyePosWorld = matInstance->getMaterialParameterHandle("$eyePosWorld");
bbMin = matInstance->getMaterialParameterHandle("$bbMin");
@ -545,7 +546,7 @@ void RenderProbeMgr::ReflectProbeMaterialInfo::setProbeParameters(const ProbeRen
matParams->setSafe(radius, probeInfo->mRadius);
Point3F probePos = probeInfo->getPosition();
Point3F probePos = probeInfo->getPosition() + probeInfo->mProbePosOffset;
//worldViewOnly.mulP(probeInfo->getPosition(), &probePos);
matParams->setSafe(probeWSPos, probePos);
@ -606,6 +607,10 @@ void RenderProbeMgr::ReflectProbeMaterialInfo::setProbeParameters(const ProbeRen
GFX->setTexture(4, NULL);
}
if(probeInfo->mCubemap->isValid())
matParams->setSafe(cubeMips, mPow(probeInfo->mCubemap->getPointer()->getMipMapLevels(),2.0f));
else
matParams->setSafe(cubeMips, F32(0.0));
matParams->setSafe(eyePosWorld, renderState->getCameraPosition());
matParams->setSafe(bbMin, probeInfo->mBounds.minExtents);
@ -659,7 +664,7 @@ bool ReflectProbeMatInstance::setupPass(SceneRenderState *state, const SceneData
desc.setZReadWrite(false);
desc.zWriteEnable = false;
desc.setCullMode(GFXCullNone);
desc.setBlend(true, GFXBlendOne, GFXBlendOne);
desc.setBlend(true, GFXBlendSrcAlpha, GFXBlendOne);
mProjectionState = GFX->createStateBlock(desc);
}
// Now override stateblock with our own

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

@ -107,6 +107,7 @@ protected:
MaterialParameterHandle *useCubemap;
MaterialParameterHandle *cubemap;
MaterialParameterHandle *cubeMips;
MaterialParameterHandle *eyePosWorld;
MaterialParameterHandle *bbMin;