TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

missed a few conversions

Browse source
This commit is contained in:
AzaezelX 2019-06-28 10:56:38 -05:00
parent 01f6938746
commit 4d714091b7
5 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/rendering/shaders/lighting.hlsl
View file

@ -444,8 +444,6 @@ float4 computeForwardProbes(Surface surface,
if (contribution[i] > 0.0)
probehits++;
}
else
continue;
contribution[i] = max(contribution[i], 0);
@ -524,7 +522,7 @@ float4 computeForwardProbes(Surface surface,
if (contrib != 0)
{
int cubemapIdx = probeConfigData[i].a;
float3 dir = boxProject(surface.P, surface.R, worldToObjArray[i], refBoxArray[i].xyz, refBoxMaxArray[i].xyz, inRefPosArray[i].xyz);
float3 dir = boxProject(surface.P, surface.R, worldToObjArray[i], refBoxMinArray[i].xyz, refBoxMaxArray[i].xyz, inRefPosArray[i].xyz);
irradiance += TORQUE_TEXCUBEARRAYLOD(irradianceCubemapAR, dir, cubemapIdx, 0).xyz * contrib;
specular += TORQUE_TEXCUBEARRAYLOD(specularCubemapAR, dir, cubemapIdx, lod).xyz * contrib;

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/reflectionProbeArrayP.hlsl
View file

@ -25,7 +25,7 @@ uniform float4 inProbePosArray[MAX_PROBES];
uniform float4 inRefPosArray[MAX_PROBES];
uniform float4x4 worldToObjArray[MAX_PROBES];
uniform float4 refBoxMinArray[MAX_PROBES];
uniform float4 refBoxArray[MAX_PROBES];
uniform float4 refBoxMaxArray[MAX_PROBES];
uniform float4 probeConfigData[MAX_PROBES]; //r,g,b/mode,radius,atten
#if DEBUGVIZ_CONTRIB
@ -80,8 +80,6 @@ float4 main(PFXVertToPix IN) : SV_TARGET
if (contribution[i]>0.0)
probehits++;
}
else
continue;
contribution[i] = max(contribution[i],0);