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

Update blendContrast, add glsl support

Browse source
This commit is contained in:
Lukas Aldershaab 2021-01-02 03:30:08 +01:00
parent 1ffec9ab56
commit 3c165b7d45
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1345,6 +1345,16 @@ void TerrainHeightMapBlendGLSL::processPix(Vector<ShaderComponent*>& componentLi
blendDepth->constSortPos = cspPrimitive;
}
Var* blendContrast = (Var*)LangElement::find(String::ToString("blendContrast%d", idx));
if (!blendContrast)
{
blendContrast = new Var;
blendContrast->setType("float");
blendContrast->setName(String::ToString("blendContrast%d", idx));
blendContrast->uniform = true;
blendContrast->constSortPos = cspPrimitive;
}
Var* detailH = (Var*)LangElement::find(String::ToString("detailH%d", idx));
if (!detailH)
{
@ -1365,6 +1375,10 @@ void TerrainHeightMapBlendGLSL::processPix(Vector<ShaderComponent*>& componentLi
meta->addStatement(new GenOp(" @ = clamp(0.5 + @, 0.0, 1.0);\r\n",
detailH, blendDepth));
}
meta->addStatement(new GenOp(" @ = (@ * 2.0f - 1.0f) * @ + 0.5f;\r\n",
detailH, detailH, blendContrast));
meta->addStatement(new GenOp(" }\r\n"));
}
}

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

@ -1456,7 +1456,7 @@ void TerrainHeightMapBlendHLSL::processPix(Vector<ShaderComponent*>& componentLi
detailH, blendDepth));
}
meta->addStatement(new GenOp(" @ = ((@ - 0.5f) * max(@, 0.0f)) + 0.5f;\r\n",
meta->addStatement(new GenOp(" @ = (@ * 2.0f - 1.0f) * @ + 0.5f;\r\n",
detailH, detailH, blendContrast));
meta->addStatement(new GenOp(" }\r\n"));