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

cleanups for shadergen and the visibility feature

Browse source 
math fixes, feature inclusion removal. will still need to circle back on why the crosshatch.. isn't
This commit is contained in:
AzaezelX 2021-09-17 01:24:20 -05:00
parent 328319b853
commit 21c17d0ed1
4 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/lighting/shadowMap/shadowMatHook.cpp
View file

@ -186,10 +186,8 @@ void ShadowMaterialHook::_overrideFeatures( ProcessedMaterial *mat,
type == MFT_TexAnim || type == MFT_TexAnim ||
type == MFT_DiffuseMap || type == MFT_DiffuseMap ||
type == MFT_IsTranslucent || type == MFT_IsTranslucent ||
type == MFT_Visibility ||
type == MFT_UseInstancing || type == MFT_UseInstancing ||
type == MFT_EyeSpaceDepthOut || type == MFT_EyeSpaceDepthOut)
type == MFT_DeferredConditioner)
newFeatures.addFeature(type); newFeatures.addFeature(type);
else if (type.getGroup() == MFG_PreTransform || else if (type.getGroup() == MFG_PreTransform ||
type.getGroup() == MFG_Transform || type.getGroup() == MFG_Transform ||

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

@ -455,12 +455,12 @@ Var* ShaderFeatureGLSL::addOutVpos( MultiLine *meta,
outVpos = connectComp->getElement( RT_TEXCOORD ); outVpos = connectComp->getElement( RT_TEXCOORD );
outVpos->setName( "outVpos" ); outVpos->setName( "outVpos" );
outVpos->setStructName( "OUT" ); outVpos->setStructName( "OUT" );
outVpos->setType( "vec4" ); outVpos->setType( "vec3" );
Var *outPosition = (Var*) LangElement::find( "gl_Position" ); Var *outPosition = (Var*) LangElement::find( "gl_Position" );
AssertFatal( outPosition, "ShaderFeatureGLSL::addOutVpos - Didn't find the output position." ); AssertFatal( outPosition, "ShaderFeatureGLSL::addOutVpos - Didn't find the output position." );
meta->addStatement( new GenOp( " @ = @;\r\n", outVpos, outPosition ) ); meta->addStatement( new GenOp( " @ = @.xyz;\r\n", outVpos, outPosition ) );
} }
return outVpos; return outVpos;
@ -474,25 +474,11 @@ Var* ShaderFeatureGLSL::getInVpos( MultiLine *meta,
return inVpos; return inVpos;
ShaderConnector *connectComp = dynamic_cast<ShaderConnector*>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector*>( componentList[C_CONNECTOR] );
/*
if ( GFX->getPixelShaderVersion() >= 3.0f )
{
inVpos = connectComp->getElement( RT_VPOS );
inVpos->setName( "vpos" );
inVpos->setStructName( "IN" );
inVpos->setType( "vec2" );
return inVpos;
}
*/
inVpos = connectComp->getElement( RT_TEXCOORD ); inVpos = connectComp->getElement( RT_TEXCOORD );
inVpos->setName( "inVpos" ); inVpos->setName( "inVpos" );
inVpos->setStructName( "IN" ); inVpos->setStructName( "IN" );
inVpos->setType( "vec4" ); inVpos->setType( "vec4" );
return inVpos;
Var *vpos = new Var( "vpos", "vec2" );
meta->addStatement( new GenOp( " @ = @.xy / @.w;\r\n", new DecOp( vpos ), inVpos, inVpos ) );
return vpos;
} }
Var* ShaderFeatureGLSL::getInWorldToTangent( Vector<ShaderComponent*> &componentList ) Var* ShaderFeatureGLSL::getInWorldToTangent( Vector<ShaderComponent*> &componentList )
@ -2473,7 +2459,7 @@ void VisibilityFeatGLSL::processPix( Vector<ShaderComponent*> &componentList,
// Everything else does a fizzle. // Everything else does a fizzle.
Var *vPos = getInVpos( meta, componentList ); Var *vPos = getInVpos( meta, componentList );
meta->addStatement( new GenOp( " fizzle( @, @ );\r\n", vPos, visibility ) ); meta->addStatement( new GenOp( " fizzle( @.xy, @ );\r\n", vPos, visibility ) );
} }
ShaderFeature::Resources VisibilityFeatGLSL::getResources( const MaterialFeatureData &fd ) ShaderFeature::Resources VisibilityFeatGLSL::getResources( const MaterialFeatureData &fd )
@ -2616,7 +2602,7 @@ void FoliageFeatureGLSL::processVert( Vector<ShaderComponent*> &componentList,
tangent->setType( "vec3" ); tangent->setType( "vec3" );
tangent->setName( "T" ); tangent->setName( "T" );
LangElement *tangentDec = new DecOp( tangent ); LangElement *tangentDec = new DecOp( tangent );
meta->addStatement( new GenOp( " @;\n", tangentDec ) ); meta->addStatement( new GenOp( " @ = vec3(1.0,0,0);\n", tangentDec ) );
// We add a float foliageFade to the OUT structure. // We add a float foliageFade to the OUT structure.
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );

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

@ -453,12 +453,12 @@ Var* ShaderFeatureHLSL::addOutVpos( MultiLine *meta,
outVpos = connectComp->getElement( RT_TEXCOORD ); outVpos = connectComp->getElement( RT_TEXCOORD );
outVpos->setName( "outVpos" ); outVpos->setName( "outVpos" );
outVpos->setStructName( "OUT" ); outVpos->setStructName( "OUT" );
outVpos->setType( "float4" ); outVpos->setType( "float3" );
Var *outPosition = (Var*) LangElement::find( "hpos" ); Var *outPosition = (Var*) LangElement::find( "hpos" );
AssertFatal( outPosition, "ShaderFeatureHLSL::addOutVpos - Didn't find the output position." ); AssertFatal( outPosition, "ShaderFeatureHLSL::addOutVpos - Didn't find the output position." );
meta->addStatement( new GenOp( " @ = @;\r\n", outVpos, outPosition ) ); meta->addStatement( new GenOp( " @ = @.xyz;\r\n", outVpos, outPosition ) );
} }
return outVpos; return outVpos;
@ -2686,7 +2686,7 @@ void FoliageFeatureHLSL::processVert( Vector<ShaderComponent*> &componentList,
tangent->setType( "float3" ); tangent->setType( "float3" );
tangent->setName( "T" ); tangent->setName( "T" );
LangElement *tangentDec = new DecOp( tangent ); LangElement *tangentDec = new DecOp( tangent );
meta->addStatement( new GenOp( " @;\n", tangentDec ) ); meta->addStatement( new GenOp( " @ = float3(1.0,0,0);\n", tangentDec ) );
// We add a float foliageFade to the OUT structure. // We add a float foliageFade to the OUT structure.
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );

4
Templates/BaseGame/game/core/rendering/shaders/gl/torque.glsl
View file

@ -291,8 +291,8 @@ void fizzle(vec2 vpos, float visibility)
// I'm sure there are many more patterns here to // I'm sure there are many more patterns here to
// discover for different effects. // discover for different effects.
mat2x2 m = mat2x2( vpos.x, vpos.y, 0.916, 0.350 ); mat2x2 m = mat2x2( vpos.x, 0.916, vpos.y, 0.350 );
if( (visibility - fract( determinant( m ) )) < 0 ) //if(a < 0) discard; if( (visibility - fract( determinant( m ) )) < 0 )
discard; discard;
} }
#endif //TORQUE_PIXEL_SHADER #endif //TORQUE_PIXEL_SHADER