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

augment ShaderFeatureHLSL::getSurface pixel shader feature with a fallback for missing normalmaps (really should correct this one vertex frag side)

Browse source
This commit is contained in:
AzaezelX 2019-07-02 19:26:20 -05:00
parent e51726aac6
commit 1ec9177557
2 changed files with 22 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -818,7 +818,7 @@ Var* ShaderFeatureHLSL::addOutDetailTexCoord( Vector<ShaderComponent*> &compon
return outTex; return outTex;
} }
Var* ShaderFeatureHLSL::getSurface(Vector<ShaderComponent*>& componentList, MultiLine* meta) Var* ShaderFeatureHLSL::getSurface(Vector<ShaderComponent*>& componentList, MultiLine* meta, const MaterialFeatureData& fd)
{ {
ShaderConnector* connectComp = dynamic_cast<ShaderConnector*>(componentList[C_CONNECTOR]); ShaderConnector* connectComp = dynamic_cast<ShaderConnector*>(componentList[C_CONNECTOR]);
@ -853,22 +853,21 @@ Var* ShaderFeatureHLSL::getSurface(Vector<ShaderComponent*>& componentList, Mult
return nullptr; return nullptr;
Var* wsNormal = (Var*)LangElement::find("wsNormal"); Var* wsNormal = (Var*)LangElement::find("wsNormal");
if (!wsNormal) Var* normal = (Var*)LangElement::find("normal");
if (!normal)
{ {
wsNormal = connectComp->getElement(RT_TEXCOORD); normal = new Var("normal", "float3");
wsNormal->setName("wsNormal"); meta->addStatement(new GenOp(" @;\r\n\n", new DecOp(normal)));
wsNormal->setStructName("IN");
wsNormal->setType("float3"); }
if (!fd.features[MFT_NormalMap])
// If we loaded the normal its our responsibility {
// to normalize it... the interpolators won't. Var* worldToTangent = getInWorldToTangent(componentList);
// meta->addStatement(new GenOp(" @ = normalize(mul(@,float3(0,0,1.0f)));\r\n\n", normal, worldToTangent));
// Note we cast to half here to get partial precision }
// optimized code which is an acceptable loss of else
// precision for normals and performs much better {
// on older Geforce cards. meta->addStatement(new GenOp(" @ = normalize( half3( @ ) );\r\n", normal, wsNormal));
//
meta->addStatement(new GenOp(" @ = normalize( half3( @ ) );\r\n", wsNormal, wsNormal));
} }
Var* wsEyePos = (Var*)LangElement::find("eyePosWorld"); Var* wsEyePos = (Var*)LangElement::find("eyePosWorld");
@ -880,7 +879,7 @@ Var* ShaderFeatureHLSL::getSurface(Vector<ShaderComponent*>& componentList, Mult
if (!surface) if (!surface)
{ {
surface = new Var("surface", "Surface"); surface = new Var("surface", "Surface");
meta->addStatement(new GenOp(" @ = createForwardSurface(@,@,@,@,@,@,@);\r\n\n", new DecOp(surface), diffuseColor, wsNormal, matinfo, meta->addStatement(new GenOp(" @ = createForwardSurface(@,@,@,@,@,@,@);\r\n\n", new DecOp(surface), diffuseColor, normal, matinfo,
inTex, wsPosition, wsEyePos, wsView)); inTex, wsPosition, wsEyePos, wsView));
} }
@ -2119,6 +2118,7 @@ void RTLightingFeatHLSL::processVert( Vector<ShaderComponent*> &componentList,
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
getOutWorldToTangent(componentList, meta, fd);
// Special case for lighting imposters. We dont have a vert normal and may not // Special case for lighting imposters. We dont have a vert normal and may not
// have a normal map. Generate and pass the normal data the pixel shader needs. // have a normal map. Generate and pass the normal data the pixel shader needs.
@ -2200,36 +2200,10 @@ void RTLightingFeatHLSL::processPix( Vector<ShaderComponent*> &componentList,
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
// Look for a wsNormal or grab it from the connector.
Var *wsNormal = (Var*)LangElement::find( "wsNormal" );
if ( !wsNormal )
{
wsNormal = connectComp->getElement( RT_TEXCOORD );
wsNormal->setName( "wsNormal" );
wsNormal->setStructName( "IN" );
wsNormal->setType( "float3" );
// If we loaded the normal its our responsibility
// to normalize it... the interpolators won't.
//
// Note we cast to half here to get partial precision
// optimized code which is an acceptable loss of
// precision for normals and performs much better
// on older Geforce cards.
//
meta->addStatement( new GenOp( " @ = normalize( half3( @ ) );\r\n", wsNormal, wsNormal ) );
}
// Now the wsPosition and wsView. // Now the wsPosition and wsView.
Var *wsPosition = getInWsPosition( componentList ); Var *wsPosition = getInWsPosition( componentList );
Var *wsView = getWsView( wsPosition, meta ); Var *wsView = getWsView( wsPosition, meta );
// Create temporaries to hold results of lighting.
//Var *rtShading = new Var( "rtShading", "float4" );
//Var *specular = new Var( "specular", "float4" );
//meta->addStatement( new GenOp( " @; @;\r\n",
// new DecOp( rtShading ), new DecOp( specular ) ) );
// Look for a light mask generated from a previous // Look for a light mask generated from a previous
// feature (this is done for BL terrain lightmaps). // feature (this is done for BL terrain lightmaps).
LangElement *lightMask = LangElement::find( "lightMask" ); LangElement *lightMask = LangElement::find( "lightMask" );
@ -2262,13 +2236,12 @@ void RTLightingFeatHLSL::processPix( Vector<ShaderComponent*> &componentList,
lightSpotParams->arraySize = 4; lightSpotParams->arraySize = 4;
lightSpotParams->constSortPos = cspPotentialPrimitive; lightSpotParams->constSortPos = cspPotentialPrimitive;
Var* surface = getSurface(componentList, meta); Var* surface = getSurface(componentList, meta, fd);
if (!surface) if (!surface)
{ {
Con::errorf("ShaderGen::RTLightingFeatHLSL() - failed to generate surface!"); Con::errorf("ShaderGen::RTLightingFeatHLSL() - failed to generate surface!");
return; return;
} }
Var *smoothness = (Var*)LangElement::find("smoothness"); Var *smoothness = (Var*)LangElement::find("smoothness");
Var *metalness = (Var*)LangElement::find("metalness"); Var *metalness = (Var*)LangElement::find("metalness");
@ -3103,7 +3076,7 @@ void ReflectionProbeFeatHLSL::processPix(Vector<ShaderComponent*> &componentList
irradianceCubemapARTex->texture = true; irradianceCubemapARTex->texture = true;
irradianceCubemapARTex->constNum = irradianceCubemapAR->constNum; irradianceCubemapARTex->constNum = irradianceCubemapAR->constNum;
Var* surface = getSurface(componentList, meta); Var* surface = getSurface(componentList, meta, fd);
if (!surface) if (!surface)
{ {

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

@ -135,7 +135,7 @@ public:
bool useInstancing, bool useInstancing,
MultiLine *meta ); MultiLine *meta );
Var* getSurface(Vector<ShaderComponent*>& componentList, MultiLine* meta); Var* getSurface(Vector<ShaderComponent*>& componentList, MultiLine* meta, const MaterialFeatureData& fd);
// ShaderFeature // ShaderFeature
Var* getVertTexCoord( const String &name ); Var* getVertTexCoord( const String &name );