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

pushed a forgotten feature on OpenGL terrrain.

Browse source 
added this: 69f2efab8f on OpenGL
This commit is contained in:
Anis 2016-03-04 22:51:09 +01:00
parent 87f62c427c
commit 7bba3ee2de
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -624,8 +624,8 @@ void TerrainDetailMapFeatGLSL::processPix( Vector<ShaderComponent*> &component
meta->addStatement( new GenOp( " @ *= @.y * @.w;\r\n", meta->addStatement( new GenOp( " @ *= @.y * @.w;\r\n",
detailColor, detailInfo, inDet ) ); detailColor, detailInfo, inDet ) );
meta->addStatement( new GenOp( " @ = lerp( @, @ + @, @ );\r\n", meta->addStatement( new GenOp( " @ += @ * @;\r\n",
outColor, outColor, baseColor, detailColor, detailBlend ) ); outColor, detailColor, detailBlend));
meta->addStatement( new GenOp( " }\r\n" ) ); meta->addStatement( new GenOp( " }\r\n" ) );
@ -824,7 +824,7 @@ void TerrainMacroMapFeatGLSL::processPix( Vector<ShaderComponent*> &componentL
} }
// Add to the blend total. // Add to the blend total.
meta->addStatement( new GenOp( " @ = max( @, @ );\r\n", blendTotal, blendTotal, detailBlend ) ); meta->addStatement( new GenOp( " @ += @;\r\n", blendTotal, detailBlend ) );
Var *detailColor = (Var*)LangElement::find( "macroColor" ); Var *detailColor = (Var*)LangElement::find( "macroColor" );
if ( !detailColor ) if ( !detailColor )
@ -877,8 +877,8 @@ void TerrainMacroMapFeatGLSL::processPix( Vector<ShaderComponent*> &componentL
Var *outColor = (Var*)LangElement::find( getOutputTargetVarName(target) ); Var *outColor = (Var*)LangElement::find( getOutputTargetVarName(target) );
meta->addStatement( new GenOp( " @ = lerp( @, @ + @, @ );\r\n", meta->addStatement(new GenOp(" @ += @ * @;\r\n",
outColor, outColor, outColor, detailColor, detailBlend ) ); outColor, detailColor, detailBlend));
meta->addStatement( new GenOp( " }\r\n" ) ); meta->addStatement( new GenOp( " }\r\n" ) );