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

Merge pull request #1617 from Azaezel/deferedWrapupOrder

Browse source 
removes w=z trick (was causing fisheye, effectively)
This commit is contained in:
Areloch 2016-05-20 00:10:33 -05:00
commit acf6ddb1ce
12 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp
View file

@ -2805,7 +2805,7 @@ void DeferredSkyGLSL::processVert( Vector<ShaderComponent*> &componentList,
{ {
Var *outPosition = (Var*)LangElement::find( "gl_Position" ); Var *outPosition = (Var*)LangElement::find( "gl_Position" );
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) ); //meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) );
output = meta; output = meta;
} }

2
Engine/source/shaderGen/HLSL/shaderFeatureHLSL.cpp
View file

@ -3000,7 +3000,7 @@ void DeferredSkyHLSL::processVert( Vector<ShaderComponent*> &componentList,
{ {
Var *outPosition = (Var*)LangElement::find( "hpos" ); Var *outPosition = (Var*)LangElement::find( "hpos" );
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) ); //meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) );
output = meta; output = meta;
} }

2
Templates/Empty/game/core/scripts/client/lighting/advanced/deferredShading.cs
View file

@ -55,7 +55,7 @@ new ShaderData( AL_DeferredShader )
singleton PostEffect( AL_DeferredShading ) singleton PostEffect( AL_DeferredShading )
{ {
renderTime = "PFXBeforeBin"; renderTime = "PFXAfterBin";
renderBin = "SkyBin"; renderBin = "SkyBin";
shader = AL_DeferredShader; shader = AL_DeferredShader;
stateBlock = AL_DeferredShadingState; stateBlock = AL_DeferredShadingState;

1
Templates/Empty/game/shaders/common/basicCloudsV.hlsl
View file

@ -46,7 +46,6 @@ ConnectData main( CloudVert IN )
ConnectData OUT; ConnectData OUT;
OUT.hpos = mul(modelview, float4(IN.pos,1.0)); OUT.hpos = mul(modelview, float4(IN.pos,1.0));
OUT.hpos.w = OUT.hpos.z;
float2 uv = IN.uv0; float2 uv = IN.uv0;
uv += texOffset; uv += texOffset;

1
Templates/Empty/game/shaders/common/cloudLayerV.hlsl
View file

@ -63,7 +63,6 @@ ConnectData main( CloudVert IN )
ConnectData OUT; ConnectData OUT;
OUT.hpos = mul(modelview, float4(IN.pos,1.0)); OUT.hpos = mul(modelview, float4(IN.pos,1.0));
OUT.hpos.w = OUT.hpos.z;
// Offset the uv so we don't have a seam directly over our head. // Offset the uv so we don't have a seam directly over our head.
float2 uv = IN.uv0 + float2( 0.5, 0.5 ); float2 uv = IN.uv0 + float2( 0.5, 0.5 );

1
Templates/Empty/game/shaders/common/gl/basicCloudsV.glsl
View file

@ -41,7 +41,6 @@ out vec2 texCoord;
void main() void main()
{ {
gl_Position = tMul(modelview, IN_pos); gl_Position = tMul(modelview, IN_pos);
gl_Position.w = gl_Position.z;
vec2 uv = IN_uv0; vec2 uv = IN_uv0;
uv += texOffset; uv += texOffset;

1
Templates/Empty/game/shaders/common/gl/cloudLayerV.glsl
View file

@ -62,7 +62,6 @@ void main()
vec2 IN_uv0 = vTexCoord0.st; vec2 IN_uv0 = vTexCoord0.st;
gl_Position = modelview * IN_pos; gl_Position = modelview * IN_pos;
gl_Position.w = gl_Position.z;
// Offset the uv so we don't have a seam directly over our head. // Offset the uv so we don't have a seam directly over our head.
vec2 uv = IN_uv0 + vec2( 0.5, 0.5 ); vec2 uv = IN_uv0 + vec2( 0.5, 0.5 );

2
Templates/Full/game/core/scripts/client/lighting/advanced/deferredShading.cs
View file

@ -55,7 +55,7 @@ new ShaderData( AL_DeferredShader )
singleton PostEffect( AL_DeferredShading ) singleton PostEffect( AL_DeferredShading )
{ {
renderTime = "PFXBeforeBin"; renderTime = "PFXAfterBin";
renderBin = "SkyBin"; renderBin = "SkyBin";
shader = AL_DeferredShader; shader = AL_DeferredShader;
stateBlock = AL_DeferredShadingState; stateBlock = AL_DeferredShadingState;

1
Templates/Full/game/shaders/common/basicCloudsV.hlsl
View file

@ -46,7 +46,6 @@ ConnectData main( CloudVert IN )
ConnectData OUT; ConnectData OUT;
OUT.hpos = mul(modelview, float4(IN.pos,1.0)); OUT.hpos = mul(modelview, float4(IN.pos,1.0));
OUT.hpos.w = OUT.hpos.z;
float2 uv = IN.uv0; float2 uv = IN.uv0;
uv += texOffset; uv += texOffset;

1
Templates/Full/game/shaders/common/cloudLayerV.hlsl
View file

@ -63,7 +63,6 @@ ConnectData main( CloudVert IN )
ConnectData OUT; ConnectData OUT;
OUT.hpos = mul(modelview, float4(IN.pos,1.0)); OUT.hpos = mul(modelview, float4(IN.pos,1.0));
OUT.hpos.w = OUT.hpos.z;
// Offset the uv so we don't have a seam directly over our head. // Offset the uv so we don't have a seam directly over our head.
float2 uv = IN.uv0 + float2( 0.5, 0.5 ); float2 uv = IN.uv0 + float2( 0.5, 0.5 );

1
Templates/Full/game/shaders/common/gl/basicCloudsV.glsl
View file

@ -41,7 +41,6 @@ out vec2 texCoord;
void main() void main()
{ {
gl_Position = tMul(modelview, IN_pos); gl_Position = tMul(modelview, IN_pos);
gl_Position.w = gl_Position.z;
vec2 uv = IN_uv0; vec2 uv = IN_uv0;
uv += texOffset; uv += texOffset;

1
Templates/Full/game/shaders/common/gl/cloudLayerV.glsl
View file

@ -62,7 +62,6 @@ void main()
vec2 IN_uv0 = vTexCoord0.st; vec2 IN_uv0 = vTexCoord0.st;
gl_Position = modelview * IN_pos; gl_Position = modelview * IN_pos;
gl_Position.w = gl_Position.z;
// Offset the uv so we don't have a seam directly over our head. // Offset the uv so we don't have a seam directly over our head.
vec2 uv = IN_uv0 + vec2( 0.5, 0.5 ); vec2 uv = IN_uv0 + vec2( 0.5, 0.5 );