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

general cleanup GLSL side for terrain

Browse source
This commit is contained in:
AzaezelX 2019-12-21 08:49:47 -06:00
parent 29a8d5d36c
commit 596dcb935d
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Engine/source/terrain/glsl/terrFeatureGLSL.cpp
View file

@ -1103,11 +1103,9 @@ void TerrainAdditiveFeatGLSL::processPix( Vector<ShaderComponent*> &componentLis
const MaterialFeatureData &fd ) const MaterialFeatureData &fd )
{ {
Var *color = NULL; Var *color = NULL;
Var *normal = NULL;
if (fd.features[MFT_isDeferred]) if (fd.features[MFT_isDeferred])
{ {
color = (Var*) LangElement::find( getOutputTargetVarName(ShaderFeature::RenderTarget1) ); color = (Var*) LangElement::find( getOutputTargetVarName(ShaderFeature::RenderTarget1) );
normal = (Var*) LangElement::find( getOutputTargetVarName(ShaderFeature::DefaultTarget) );
} }
else else
color = (Var*)LangElement::find(getOutputTargetVarName(ShaderFeature::DefaultTarget)); color = (Var*)LangElement::find(getOutputTargetVarName(ShaderFeature::DefaultTarget));
@ -1120,8 +1118,6 @@ void TerrainAdditiveFeatGLSL::processPix( Vector<ShaderComponent*> &componentLis
meta->addStatement( new GenOp( " clip( @ - 0.0001 );\r\n", blendTotal ) ); meta->addStatement( new GenOp( " clip( @ - 0.0001 );\r\n", blendTotal ) );
meta->addStatement( new GenOp( " @.a = @;\r\n", color, blendTotal ) ); meta->addStatement( new GenOp( " @.a = @;\r\n", color, blendTotal ) );
if (normal)
meta->addStatement(new GenOp(" @.a = @;\r\n", normal, blendTotal));
output = meta; output = meta;
} }
@ -1249,22 +1245,22 @@ void TerrainCompositeMapFeatGLSL::processPix(Vector<ShaderComponent*> &component
texOp = new GenOp("tex2D(@, @.xy)", compositeMap, inDet); texOp = new GenOp("tex2D(@, @.xy)", compositeMap, inDet);
// search for material var // search for material var
Var *material; Var * pbrConfig;
OutputTarget targ = RenderTarget1; OutputTarget targ = RenderTarget1;
if (fd.features[MFT_isDeferred]) if (fd.features[MFT_isDeferred])
{ {
targ = RenderTarget2; targ = RenderTarget2;
} }
material = (Var*)LangElement::find(getOutputTargetVarName(targ)); pbrConfig = (Var*)LangElement::find(getOutputTargetVarName(targ));
MultiLine * meta = new MultiLine; MultiLine * meta = new MultiLine;
if (!material) if (!pbrConfig)
{ {
// create color var // create color var
material = new Var; pbrConfig = new Var;
material->setType("fragout"); pbrConfig->setType("fragout");
material->setName(getOutputTargetVarName(targ)); pbrConfig->setName(getOutputTargetVarName(targ));
material->setStructName("OUT"); pbrConfig->setStructName("OUT");
} }
Var *detailBlend = (Var*)LangElement::find(String::ToString("detailBlend%d", compositeIndex)); Var *detailBlend = (Var*)LangElement::find(String::ToString("detailBlend%d", compositeIndex));
@ -1276,15 +1272,19 @@ void TerrainCompositeMapFeatGLSL::processPix(Vector<ShaderComponent*> &component
Var *priorComp = (Var*)LangElement::find(String::ToString("matinfoCol%d", compositeIndex - 1)); Var *priorComp = (Var*)LangElement::find(String::ToString("matinfoCol%d", compositeIndex - 1));
if (priorComp) if (priorComp)
{ {
meta->addStatement(new GenOp(" @ = @.grb*@;\r\n", new DecOp(matinfoCol), texOp, detailBlend)); meta->addStatement(new GenOp(" @ = @.rgb*@;\r\n", new DecOp(matinfoCol), texOp, detailBlend));
meta->addStatement(new GenOp(" @.gba += @;\r\n", material, matinfoCol)); meta->addStatement(new GenOp(" @.bga += @;\r\n", pbrConfig, matinfoCol));
} }
else else
{ {
meta->addStatement(new GenOp(" @ = lerp(vec3(1,0,0),@.grb,@);\r\n", new DecOp(matinfoCol), texOp, detailBlend)); meta->addStatement(new GenOp(" @ = lerp(vec3(0,1,0),@.rgb,@);\r\n", new DecOp(matinfoCol), texOp, detailBlend));
meta->addStatement(new GenOp(" @ = vec4(0.0,@);\r\n", material, matinfoCol)); meta->addStatement(new GenOp(" @ = vec4(0.0,@);\r\n", pbrConfig, matinfoCol));
} }
if (!fd.features[MFT_InvertSmoothness])
{
meta->addStatement(new GenOp(" @.b = 1.0-@.b;\r\n", pbrConfig, pbrConfig));
}
output = meta; output = meta;
} }