mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 15:44:36 +00:00
fix particle glow
This commit is contained in:
parent
5d260bc58f
commit
ab80a842aa
5 changed files with 20 additions and 3 deletions
|
|
@ -77,6 +77,7 @@ vec4 lmSample( vec3 nrm )
|
|||
|
||||
uniform float alphaFactor;
|
||||
uniform float alphaScale;
|
||||
uniform int glow;
|
||||
|
||||
out vec4 OUT_col;
|
||||
|
||||
|
|
@ -106,7 +107,11 @@ void main()
|
|||
|
||||
// Scale output color by the alpha factor (turn LerpAlpha into pre-multiplied alpha)
|
||||
vec3 colorScale = ( alphaFactor < 0.0 ? IN_color.rgb * diffuse.rgb : vec3( alphaFactor > 0.0 ? IN_color.a * diffuse.a * alphaFactor * softBlend : softBlend ) );
|
||||
|
||||
if (glow >0)
|
||||
{
|
||||
vec4 glowCol = vec4(pow(max((IN_color * diffuse).rgb*10,0.0),3.54406804435),(IN_color * diffuse).a);
|
||||
colorScale *= glowCol.rgb;
|
||||
}
|
||||
OUT_col = hdrEncode( vec4( IN_color.rgb * diffuse.rgb * colorScale,
|
||||
IN_color.a * diffuse.a * softBlend * alphaScale ) );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -75,6 +75,7 @@ float4 lmSample( float3 nrm )
|
|||
|
||||
uniform float alphaFactor;
|
||||
uniform float alphaScale;
|
||||
uniform int glow;
|
||||
|
||||
float4 main( Conn IN ) : TORQUE_TARGET0
|
||||
{
|
||||
|
|
@ -102,7 +103,11 @@ float4 main( Conn IN ) : TORQUE_TARGET0
|
|||
|
||||
// Scale output color by the alpha factor (turn LerpAlpha into pre-multiplied alpha)
|
||||
float3 colorScale = ( alphaFactor < 0.0 ? IN.color.rgb * diffuse.rgb : ( alphaFactor > 0.0 ? IN.color.a * diffuse.a * alphaFactor * softBlend : softBlend ) );
|
||||
|
||||
if (glow >0)
|
||||
{
|
||||
float4 glowCol = float4(pow(max((IN.color * diffuse).rgb*10,0.0),3.54406804435),(IN.color * diffuse).a);
|
||||
colorScale *= glowCol.rgb;
|
||||
}
|
||||
return hdrEncode( float4( IN.color.rgb * diffuse.rgb * colorScale,
|
||||
IN.color.a * diffuse.a * softBlend * alphaScale ) );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue