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

Merge branch 'PBR_Bins_Reordered' of https://github.com/Areloch/Torque3D into PBR_PR

Browse source 
# Conflicts:
#	Engine/source/gfx/D3D11/gfxD3D11Device.cpp
#	Engine/source/renderInstance/renderDeferredMgr.h
This commit is contained in:
Azaezel 2018-10-25 14:30:12 -05:00
commit 726c748578
9 changed files with 92 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeP.hlsl
View file

@ -98,8 +98,8 @@ float3 iblBoxSpecular(float3 normal,
struct PS_OUTPUT
{
float4 diffuse: TORQUE_TARGET0;
float4 spec: TORQUE_TARGET1;
float4 diffuse: TORQUE_TARGET1;
float4 spec: TORQUE_TARGET0;
};
float defineSphereSpaceInfluence(float3 centroidPosVS, float rad, float2 atten, float3 surfPosVS, float3 norm)