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

Merge pull request #969 from AtomicWalrus/TerrainDetailBlendingNoNormalFix

Browse source 
Fix height blending detail color doubling w/ no normalmap
This commit is contained in:
Brian Roberts 2023-02-20 22:05:59 -06:00 • committed by GitHub
commit e24bd96484
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,11 +587,12 @@ void TerrainDetailMapFeatGLSL::processPix( Vector<ShaderComponent*> &component
meta->addStatement(new GenOp(" @ = lerp( @, tGetMatrix3Row(@, 2), @ ) );\r\n", gbNormal, gbNormal, viewToTangent, detailBlend)); meta->addStatement(new GenOp(" @ = lerp( @, tGetMatrix3Row(@, 2), @ ) );\r\n", gbNormal, gbNormal, viewToTangent, detailBlend));
} }
ShaderFeature::OutputTarget target = (fd.features[MFT_isDeferred]) ? RenderTarget1 : DefaultTarget; if (!fd.features.hasFeature(MFT_TerrainHeightBlend)) // this is only for lerp blending
{
Var* outColor = (Var*)LangElement::find(getOutputTargetVarName(target)); ShaderFeature::OutputTarget target = (fd.features[MFT_isDeferred]) ? RenderTarget1 : DefaultTarget;
Var* outColor = (Var*)LangElement::find(getOutputTargetVarName(target));
meta->addStatement(new GenOp(" @ += @ * @;\r\n", outColor, detailColor, detailBlend)); meta->addStatement(new GenOp(" @ += @ * @;\r\n", outColor, detailColor, detailBlend));
}
} }
output = meta; output = meta;

11
Engine/source/terrain/hlsl/terrFeatureHLSL.cpp
View file

@ -649,11 +649,12 @@ void TerrainDetailMapFeatHLSL::processPix( Vector<ShaderComponent*> &component
meta->addStatement(new GenOp(" @ = lerp( @, @[2], @ );\r\n", gbNormal, gbNormal, viewToTangent, detailBlend)); meta->addStatement(new GenOp(" @ = lerp( @, @[2], @ );\r\n", gbNormal, gbNormal, viewToTangent, detailBlend));
} }
ShaderFeature::OutputTarget target = (fd.features[MFT_isDeferred]) ? RenderTarget1 : DefaultTarget; if (!fd.features.hasFeature(MFT_TerrainHeightBlend))
{
Var* outColor = (Var*)LangElement::find(getOutputTargetVarName(target)); ShaderFeature::OutputTarget target = (fd.features[MFT_isDeferred]) ? RenderTarget1 : DefaultTarget;
Var* outColor = (Var*)LangElement::find(getOutputTargetVarName(target));
meta->addStatement(new GenOp(" @ += @ * @;\r\n", outColor, detailColor, detailBlend)); meta->addStatement(new GenOp(" @ += @ * @;\r\n", outColor, detailColor, detailBlend));
}
} }
output = meta; output = meta;