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

we're no longer making use of a singular lightbuffer to double up as a baked lighting/ibl channel passed to lights themselves, so save a screens worth of transmission

Browse source
This commit is contained in:
Azaezel 2018-11-02 16:04:04 -05:00
parent 16283228ac
commit 39fa9f90e8
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Templates/Full/game/core/scripts/client/lighting/advanced/shaders.cs
View file

@ -73,9 +73,8 @@ new ShaderData( AL_VectorLightShader )
samplerNames[2] = "$dynamicShadowMap"; samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$ssaoMask"; samplerNames[3] = "$ssaoMask";
samplerNames[4] = "$gTapRotationTex"; samplerNames[4] = "$gTapRotationTex";
samplerNames[5] = "$lightBuffer"; samplerNames[5] = "$colorBuffer";
samplerNames[6] = "$colorBuffer"; samplerNames[6] = "$matInfoBuffer";
samplerNames[7] = "$matInfoBuffer";
pixVersion = 3.0; pixVersion = 3.0;
}; };
@ -87,8 +86,7 @@ new CustomMaterial( AL_VectorLightMaterial )
sampler["deferredBuffer"] = "#deferred"; sampler["deferredBuffer"] = "#deferred";
sampler["shadowMap"] = "$dynamiclight"; sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap"; sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["ssaoMask"] = "#ssaoMask"; sampler["ssaoMask"] = "#ssaoMask";
sampler["lightBuffer"] = "#specularLighting";
sampler["colorBuffer"] = "#color"; sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo"; sampler["matInfoBuffer"] = "#matinfo";
@ -150,9 +148,8 @@ new ShaderData( AL_PointLightShader )
samplerNames[2] = "$dynamicShadowMap"; samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$cookieMap"; samplerNames[3] = "$cookieMap";
samplerNames[4] = "$gTapRotationTex"; samplerNames[4] = "$gTapRotationTex";
samplerNames[5] = "$lightBuffer"; samplerNames[5] = "$colorBuffer";
samplerNames[6] = "$colorBuffer"; samplerNames[6] = "$matInfoBuffer";
samplerNames[7] = "$matInfoBuffer";
pixVersion = 3.0; pixVersion = 3.0;
}; };
@ -166,7 +163,6 @@ new CustomMaterial( AL_PointLightMaterial )
sampler["shadowMap"] = "$dynamiclight"; sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap"; sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["cookieMap"] = "$dynamiclightmask"; sampler["cookieMap"] = "$dynamiclightmask";
sampler["lightBuffer"] = "#specularLighting";
sampler["colorBuffer"] = "#color"; sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo"; sampler["matInfoBuffer"] = "#matinfo";
@ -189,9 +185,8 @@ new ShaderData( AL_SpotLightShader )
samplerNames[2] = "$dynamicShadowMap"; samplerNames[2] = "$dynamicShadowMap";
samplerNames[3] = "$cookieMap"; samplerNames[3] = "$cookieMap";
samplerNames[4] = "$gTapRotationTex"; samplerNames[4] = "$gTapRotationTex";
samplerNames[5] = "$lightBuffer"; samplerNames[5] = "$colorBuffer";
samplerNames[6] = "$colorBuffer"; samplerNames[6] = "$matInfoBuffer";
samplerNames[7] = "$matInfoBuffer";
pixVersion = 3.0; pixVersion = 3.0;
}; };
@ -205,7 +200,6 @@ new CustomMaterial( AL_SpotLightMaterial )
sampler["shadowMap"] = "$dynamiclight"; sampler["shadowMap"] = "$dynamiclight";
sampler["dynamicShadowMap"] = "$dynamicShadowMap"; sampler["dynamicShadowMap"] = "$dynamicShadowMap";
sampler["cookieMap"] = "$dynamiclightmask"; sampler["cookieMap"] = "$dynamiclightmask";
sampler["lightBuffer"] = "#specularLighting";
sampler["colorBuffer"] = "#color"; sampler["colorBuffer"] = "#color";
sampler["matInfoBuffer"] = "#matinfo"; sampler["matInfoBuffer"] = "#matinfo";

1
Templates/Full/game/shaders/common/lighting/advanced/vectorLightP.hlsl
View file

@ -39,7 +39,6 @@ TORQUE_UNIFORM_SAMPLER2D(ssaoMask, 3);
uniform float4 rtParams3; uniform float4 rtParams3;
#endif #endif
TORQUE_UNIFORM_SAMPLER2D(lightBuffer, 5);
TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 6); TORQUE_UNIFORM_SAMPLER2D(colorBuffer, 6);
TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 7); TORQUE_UNIFORM_SAMPLER2D(matInfoBuffer, 7);