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

reflection probe updates

Browse source
This commit is contained in:
Tim Barnes 2018-10-28 20:42:26 +10:00
parent 43c1abbc96
commit 9a39afa0eb
8 changed files with 26 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -794,7 +794,6 @@ ProbeManager::ReflectProbeMaterialInfo::ReflectProbeMaterialInfo(const String &m
probeWSPos(NULL),
attenuation(NULL),
radius(NULL),
invViewMat(NULL),
cubeMips(NULL)
{
Material *mat = MATMGR->getMaterialDefinitionByName(matName);
@ -819,8 +818,6 @@ ProbeManager::ReflectProbeMaterialInfo::ReflectProbeMaterialInfo(const String &m
negFarPlaneDotEye = matInstance->getMaterialParameterHandle("$negFarPlaneDotEye");
zNearFarInvNearFar = matInstance->getMaterialParameterHandle("$zNearFarInvNearFar");
invViewMat = matInstance->getMaterialParameterHandle("$invViewMat");
useCubemap = matInstance->getMaterialParameterHandle("$useCubemap");
cubemap = matInstance->getMaterialParameterHandle("$cubeMap");
@ -848,7 +845,7 @@ void ProbeManager::ReflectProbeMaterialInfo::setViewParameters(const F32 _zNear,
const F32 _zFar,
const Point3F &_eyePos,
const PlaneF &_farPlane,
const PlaneF &_vsFarPlane, const MatrixF &_inverseViewMatrix)
const PlaneF &_vsFarPlane)
{
MaterialParameters *matParams = matInstance->getMaterialParameters();
@ -865,8 +862,6 @@ void ProbeManager::ReflectProbeMaterialInfo::setViewParameters(const F32 _zNear,
matParams->setSafe(zNearFarInvNearFar, Point4F(_zNear, _zFar, 1.0f / _zNear, 1.0f / _zFar));
matParams->setSafe(invViewMat, _inverseViewMatrix);
Point4F frPlane = *((const Point4F *)&_farPlane);
Point4F vsFrPlane = *((const Point4F *)&_vsFarPlane);
Point4F nearFarInvNearFar = Point4F(_zNear, _zFar, 1.0f / _zNear, 1.0f / _zFar);
@ -893,10 +888,10 @@ void ProbeManager::ReflectProbeMaterialInfo::setProbeParameters(const ProbeRende
if (total > 0.0f)
attenRatio /= total;
F32 radius = probeInfo->mRadius;
F32 probeRadius = probeInfo->mRadius;
Point2F attenParams((1.0f / radius) * attenRatio.y,
(1.0f / (radius * radius)) * attenRatio.z);
Point2F attenParams((1.0f / probeRadius) * attenRatio.y,
(1.0f / (probeRadius * probeRadius)) * attenRatio.z);
matParams->setSafe(attenuation, attenParams);
@ -996,8 +991,6 @@ ProbeManager::SkylightMaterialInfo::SkylightMaterialInfo(const String &matName,
negFarPlaneDotEye = matInstance->getMaterialParameterHandle("$negFarPlaneDotEye");
zNearFarInvNearFar = matInstance->getMaterialParameterHandle("$zNearFarInvNearFar");
invViewMat = matInstance->getMaterialParameterHandle("$invViewMat");
useCubemap = matInstance->getMaterialParameterHandle("$useCubemap");
cubemap = matInstance->getMaterialParameterHandle("$cubeMap");