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

Merge pull request #378 from Azaezel/alpha40MacCompilePreprocessor

Browse source 
shader preprocessor fixes
This commit is contained in:
Brian Roberts 2020-11-11 12:20:33 -06:00 • committed by GitHub
commit f5f0eb2bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Templates/BaseGame/game/core/rendering/shaders/gl/lighting.glsl
View file

@ -24,7 +24,7 @@
#include "./brdf.glsl" #include "./brdf.glsl"
#ifndef TORQUE_SHADERGEN #ifndef TORQUE_SHADERGEN
#line 26 #line 27
// These are the uniforms used by most lighting shaders. // These are the uniforms used by most lighting shaders.
uniform vec4 inLightPos[4]; uniform vec4 inLightPos[4];
@ -52,6 +52,18 @@ uniform vec4 albedo;
#define MAX_FORWARD_LIGHT 4 #define MAX_FORWARD_LIGHT 4
#ifndef CAPTURING
#define CAPTURING 0
#endif
#ifndef DEBUGVIZ_ATTENUATION
#define DEBUGVIZ_ATTENUATION 0
#endif
#ifndef DEBUGVIZ_CONTRIB
#define DEBUGVIZ_CONTRIB 0
#endif
vec3 getDistanceVectorToPlane( vec3 origin, vec3 direction, vec4 plane ) vec3 getDistanceVectorToPlane( vec3 origin, vec3 direction, vec4 plane )
{ {
float denum = dot( plane.xyz, direction.xyz ); float denum = dot( plane.xyz, direction.xyz );
@ -219,7 +231,7 @@ vec3 evaluateStandardBRDF(Surface surface, SurfaceToLight surfaceToLight)
float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq); float D = D_GGX(surfaceToLight.NdotH, surface.linearRoughnessSq);
vec3 Fr = D * F * Vis; vec3 Fr = D * F * Vis;
#if CAPTURING == true #if (CAPTURING == 1)
return mix(Fd + Fr,surface.f0,surface.metalness); return mix(Fd + Fr,surface.f0,surface.metalness);
#else #else
return Fd + Fr; return Fd + Fr;
@ -416,7 +428,7 @@ vec4 computeForwardProbes(Surface surface,
} }
} }
#if DEBUGVIZ_ATTENUATION == 1 #if (DEBUGVIZ_ATTENUATION == 1)
float contribAlpha = 1; float contribAlpha = 1;
for (i = 0; i < numProbes; ++i) for (i = 0; i < numProbes; ++i)
{ {
@ -426,7 +438,7 @@ vec4 computeForwardProbes(Surface surface,
return vec4(1 - contribAlpha, 1 - contribAlpha, 1 - contribAlpha, 1); return vec4(1 - contribAlpha, 1 - contribAlpha, 1 - contribAlpha, 1);
#endif #endif
#if DEBUGVIZ_CONTRIB == 1 #if (DEBUGVIZ_CONTRIB == 1)
vec3 probeContribColors[4]; vec3 probeContribColors[4];
probeContribColors[0] = vec3(1,0,0); probeContribColors[0] = vec3(1,0,0);
probeContribColors[1] = vec3(0,1,0); probeContribColors[1] = vec3(0,1,0);

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

@ -53,6 +53,18 @@ uniform float4 albedo;
#define MAX_FORWARD_LIGHT 4 #define MAX_FORWARD_LIGHT 4
#ifndef CAPTURING
#define CAPTURING 0
#endif
#ifndef DEBUGVIZ_ATTENUATION
#define DEBUGVIZ_ATTENUATION 0
#endif
#ifndef DEBUGVIZ_CONTRIB
#define DEBUGVIZ_CONTRIB 0
#endif
inline float3 getDistanceVectorToPlane( float3 origin, float3 direction, float4 plane ) inline float3 getDistanceVectorToPlane( float3 origin, float3 direction, float4 plane )
{ {
float denum = dot( plane.xyz, direction.xyz ); float denum = dot( plane.xyz, direction.xyz );