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

Merge pull request #1223 from Azaezel/detailNormalOrderOfOperations

Browse source 
DeferredBumpFeat order of operations corrections
This commit is contained in:
Luis Anton Rebollo 2015-03-08 22:49:27 +01:00
commit 825912e800
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/lighting/advanced/glsl/advancedLightingFeaturesGLSL.cpp
View file

@ -225,10 +225,10 @@ void DeferredBumpFeatGLSL::processVert( Vector<ShaderComponent*> &componentLis
// We need the view to tangent space transform in the pixel shader.
getOutViewToTangent( componentList, meta, fd );
const bool useTexAnim = fd.features[MFT_TexAnim];
// Make sure there are texcoords
if( !fd.features[MFT_Parallax] && !fd.features[MFT_DiffuseMap] )
{
const bool useTexAnim = fd.features[MFT_TexAnim];
getOutTexCoord( "texCoord",
"vec2",
@ -236,12 +236,12 @@ void DeferredBumpFeatGLSL::processVert( Vector<ShaderComponent*> &componentLis
useTexAnim,
meta,
componentList );
}
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
addOutDetailTexCoord( componentList,
meta,
useTexAnim );
}
output = meta;
}

6
Engine/source/lighting/advanced/hlsl/advancedLightingFeaturesHLSL.cpp
View file

@ -225,10 +225,10 @@ void DeferredBumpFeatHLSL::processVert( Vector<ShaderComponent*> &componentLis
// We need the view to tangent space transform in the pixel shader.
getOutViewToTangent( componentList, meta, fd );
const bool useTexAnim = fd.features[MFT_TexAnim];
// Make sure there are texcoords
if( !fd.features[MFT_Parallax] && !fd.features[MFT_DiffuseMap] )
{
const bool useTexAnim = fd.features[MFT_TexAnim];
getOutTexCoord( "texCoord",
"float2",
@ -236,12 +236,12 @@ void DeferredBumpFeatHLSL::processVert( Vector<ShaderComponent*> &componentLis
useTexAnim,
meta,
componentList );
}
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
addOutDetailTexCoord( componentList,
meta,
useTexAnim );
}
output = meta;
}