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

Revert - Merge pull request #962 Fix OpenGL new terrain blend

Browse source 
from BeamNG/fix_opengl_new_terrain_blend (reverted from commit a0d5dc25cd)
This commit is contained in:
LuisAntonRebollo 2014-12-03 21:54:57 +01:00
parent 7097ce6466
commit 7962eef7dd
39 changed files with 86 additions and 842 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/terrain/terrMaterial.cpp
View file

@ -65,8 +65,7 @@ TerrainMaterial::TerrainMaterial()
mMacroSize( 200.0f ),
mMacroStrength( 0.7f ),
mMacroDistance( 500.0f ),
mParallaxScale(0.0f),
mBlendDepth(0.4f)
mParallaxScale( 0.0f )
{
}
@ -98,9 +97,6 @@ void TerrainMaterial::initPersistFields()
addField( "parallaxScale", TypeF32, Offset( mParallaxScale, TerrainMaterial ), "Used to scale the height from the normal map to give some self "
"occlusion effect (aka parallax) to the terrain material" );
addField("blendDepth", TypeF32, Offset(mBlendDepth, TerrainMaterial), "Depth for blending the textures using the new blending method by Lukas Joergensen."
"Higher numbers = larger blend radius.");
Parent::initPersistFields();
// Gotta call this at least once or it won't get created!