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

RTLightingFeat work.

Browse source 
1) we do *not* in fact want to early out in the presence of MFT_ImposterVert. it mangles the position-send.
2) dx sucessfuly handles the    if ( !fd.features[MFT_NormalMap] ) case, so use the same for gl
This commit is contained in:
AzaezelX 2021-10-05 14:46:37 -05:00
parent 661a192e87
commit 42e90ad3fb
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2070,7 +2070,6 @@ RTLightingFeatGLSL::RTLightingFeatGLSL()
void RTLightingFeatGLSL::processVert( Vector<ShaderComponent*> &componentList, void RTLightingFeatGLSL::processVert( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd ) const MaterialFeatureData &fd )
{ {
if (fd.features[MFT_ImposterVert]) return;
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
@ -2124,8 +2123,7 @@ void RTLightingFeatGLSL::processVert( Vector<ShaderComponent*> &componentList,
// If there isn't a normal map then we need to pass // If there isn't a normal map then we need to pass
// the world space normal to the pixel shader ourselves. // the world space normal to the pixel shader ourselves.
//Temporarily disabled while we figure out how to better handle normals without a normal map if ( !fd.features[MFT_NormalMap] )
/*if ( !fd.features[MFT_NormalMap] )
{ {
Var *outNormal = connectComp->getElement( RT_TEXCOORD ); Var *outNormal = connectComp->getElement( RT_TEXCOORD );
outNormal->setName( "wsNormal" ); outNormal->setName( "wsNormal" );
@ -2137,7 +2135,7 @@ void RTLightingFeatGLSL::processVert( Vector<ShaderComponent*> &componentList,
// Transform the normal to world space. // Transform the normal to world space.
meta->addStatement( new GenOp( " @ = tMul( @, vec4( normalize( @ ), 0.0 ) ).xyz;\r\n", outNormal, objTrans, inNormal ) ); meta->addStatement( new GenOp( " @ = tMul( @, vec4( normalize( @ ), 0.0 ) ).xyz;\r\n", outNormal, objTrans, inNormal ) );
}*/ }
} }

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

@ -2136,8 +2136,6 @@ RTLightingFeatHLSL::RTLightingFeatHLSL()
void RTLightingFeatHLSL::processVert( Vector<ShaderComponent*> &componentList, void RTLightingFeatHLSL::processVert( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd ) const MaterialFeatureData &fd )
{ {
if (fd.features[MFT_ImposterVert]) return;
MultiLine *meta = new MultiLine; MultiLine *meta = new MultiLine;
ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] ); ShaderConnector *connectComp = dynamic_cast<ShaderConnector *>( componentList[C_CONNECTOR] );
@ -2192,7 +2190,6 @@ void RTLightingFeatHLSL::processVert( Vector<ShaderComponent*> &componentList,
// If there isn't a normal map then we need to pass // If there isn't a normal map then we need to pass
// the world space normal to the pixel shader ourselves. // the world space normal to the pixel shader ourselves.
//Temporarily disabled while we figure out how to better handle normals without a normal map
if ( !fd.features[MFT_NormalMap] ) if ( !fd.features[MFT_NormalMap] )
{ {
Var *outNormal = connectComp->getElement( RT_TEXCOORD ); Var *outNormal = connectComp->getElement( RT_TEXCOORD );