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

Merge pull request #470 from Azaezel/alpha40/fixEmissive

Browse source 
fix emissive
This commit is contained in:
Brian Roberts 2021-02-15 22:27:50 -06:00 • committed by GitHub
commit 7be1e24c06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/pointLightP.glsl
View file

@ -154,8 +154,8 @@ void main()
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
OUT_col = vec4(0.0); OUT_col = vec4(surface.albedo, 0);
return; return;
} }
vec3 L = lightPosition - surface.P; vec3 L = lightPosition - surface.P;

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/spotLightP.glsl
View file

@ -86,8 +86,8 @@ void main()
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
OUT_col = vec4(0.0); OUT_col = vec4(surface.albedo, 0);
return; return;
} }
vec3 L = lightPosition - surface.P; vec3 L = lightPosition - surface.P;

4
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/gl/vectorLightP.glsl
View file

@ -189,8 +189,8 @@ void main()
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
OUT_col = vec4(0); OUT_col = vec4(surface.albedo, 0);
return; return;
} }
//create surface to light //create surface to light

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

@ -157,8 +157,8 @@ float4 main( ConvexConnectP IN ) : SV_TARGET
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
return 0.0.xxxx; return float4(surface.albedo, 0);
} }
float3 L = lightPosition - surface.P; float3 L = lightPosition - surface.P;
float dist = length(L); float dist = length(L);

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

@ -51,7 +51,7 @@ float4 main(PFXVertToPix IN) : SV_TARGET
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
return TORQUE_TEX2D(colorBuffer, IN.uv0.xy); return float4(surface.albedo, 0);
} }
#ifdef USE_SSAO_MASK #ifdef USE_SSAO_MASK

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

@ -91,8 +91,8 @@ float4 main( ConvexConnectP IN ) : SV_TARGET
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
return 0.0.xxxx; return float4(surface.albedo, 0);
} }
float3 L = lightPosition - surface.P; float3 L = lightPosition - surface.P;

2
Templates/BaseGame/game/core/rendering/shaders/lighting/advanced/vectorLightP.hlsl
View file

@ -180,7 +180,7 @@ float4 main(FarFrustumQuadConnectP IN) : SV_TARGET
//early out if emissive //early out if emissive
if (getFlag(surface.matFlag, 0)) if (getFlag(surface.matFlag, 0))
{ {
return 0.0.xxxx; return float4(surface.albedo, 0);
} }
//create surface to light //create surface to light