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

Merge pull request #719 from rextimmy/dxtnm-parallax-fix

Browse source 
Fix to allow parallax mapping with dxtnm textures via the red channel.
This commit is contained in:
Areloch 2015-08-27 23:59:20 -05:00
commit 95ab3a33a5
5 changed files with 52 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -396,11 +396,9 @@ void ProcessedShaderMaterial::_determineFeatures( U32 stageNum,
// cannot do on SM 2.0 and below.
if ( shaderVersion > 2.0f )
{
// Only allow parallax if we have a normal map and
// we're not using DXTnm compression.
if ( mMaterial->mParallaxScale[stageNum] > 0.0f &&
fd.features[ MFT_NormalMap ] &&
!fd.features[ MFT_IsDXTnm ] )
fd.features[ MFT_NormalMap ] )
fd.features.addFeature( MFT_Parallax );
// If not parallax then allow per-pixel specular if