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

add getInWorldNormal method glsl side

Browse source
This commit is contained in:
AzaezelX 2021-10-03 21:51:40 -05:00
parent 52040fb072
commit a1117b1c41
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -765,6 +765,21 @@ Var* ShaderFeatureGLSL::getWsView( Var *wsPosition, MultiLine *meta )
return wsView; return wsView;
} }
Var* ShaderFeatureGLSL::getInWorldNormal(Vector<ShaderComponent*>& componentList)
{
Var* wsNormal = (Var*)LangElement::find("wsNormal");
if (!wsNormal)
{
ShaderConnector* connectComp = dynamic_cast<ShaderConnector*>(componentList[C_CONNECTOR]);
wsNormal = connectComp->getElement(RT_TEXCOORD);
wsNormal->setName("wsNormal");
wsNormal->setStructName("IN");
wsNormal->setType("float3");
}
return wsNormal;
}
Var* ShaderFeatureGLSL::addOutDetailTexCoord( Vector<ShaderComponent*> &componentList, Var* ShaderFeatureGLSL::addOutDetailTexCoord( Vector<ShaderComponent*> &componentList,
MultiLine *meta, MultiLine *meta,
bool useTexAnim, bool useTexAnim,
@ -851,21 +866,23 @@ Var* ShaderFeatureGLSL::getSurface(Vector<ShaderComponent*>& componentList, Mult
meta->addStatement(new GenOp(" @ = vec4(0.0,1.0,@,@);\r\n", colorDecl, roughness, metalness)); //reconstruct ormConfig, no ao darkening meta->addStatement(new GenOp(" @ = vec4(0.0,1.0,@,@);\r\n", colorDecl, roughness, metalness)); //reconstruct ormConfig, no ao darkening
} }
Var* wsNormal = (Var*)LangElement::find("wsNormal");
Var* normal = (Var*)LangElement::find("normal"); Var* normal = (Var*)LangElement::find("normal");
if (!normal) if (!normal)
{ {
normal = new Var("normal", "vec3"); normal = new Var("normal", "vec3");
meta->addStatement(new GenOp(" @;\r\n\n", new DecOp(normal))); meta->addStatement(new GenOp(" @;\r\n\n", new DecOp(normal)));
Var* wsNormal = (Var*)LangElement::find("wsNormal");
if (!fd.features[MFT_NormalMap]) if (!fd.features[MFT_NormalMap])
{ {
Var* worldToTangent = getInWorldToTangent(componentList); if (!wsNormal)
meta->addStatement(new GenOp(" @ = normalize(tMul(@,vec3(0,0,1.0f)));\r\n\n", normal, worldToTangent)); wsNormal = getInWorldNormal(componentList);
meta->addStatement(new GenOp(" @ = normalize( @ );\r\n\n", normal, wsNormal));
} }
else else
{ {
meta->addStatement(new GenOp(" @ = normalize( half3( @ ) );\r\n", normal, wsNormal)); meta->addStatement(new GenOp(" @ = normalize( @ );\r\n", normal, wsNormal));
} }
} }
Var* wsEyePos = (Var*)LangElement::find("eyePosWorld"); Var* wsEyePos = (Var*)LangElement::find("eyePosWorld");
@ -2142,14 +2159,10 @@ void RTLightingFeatGLSL::processPix( Vector<ShaderComponent*> &componentList,
// Now the wsPosition and wsView. // Now the wsPosition and wsView.
Var *wsPosition = getInWsPosition( componentList ); Var *wsPosition = getInWsPosition( componentList );
Var* worldToTangent = getInWorldToTangent(componentList);
Var* wsNormal = getInWorldNormal(componentList);
Var *wsView = getWsView( wsPosition, meta ); Var *wsView = getWsView( wsPosition, meta );
// Create temporaries to hold results of lighting.
Var *rtShading = new Var( "rtShading", "vec4" );
Var *specular = new Var( "specular", "vec4" );
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" );

1
Engine/source/shaderGen/GLSL/shaderFeatureGLSL.h
View file

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