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

Added check for when getting the Detail feature's output, to validate if we have the foliage feature, which was causing a stomp on the required float4 texCoord for the foliage featuer to work right

Browse source 
Temporarily disabled wsNormal addition when we have no defined normal map until it's finished being integrated
Fixed the structure for the lighting/probe shadergen logic in GL so it generates correctly, resolving a crash on unix machines.
This commit is contained in:
Areloch 2019-10-03 23:46:53 -05:00
parent f0776fa557
commit 49f4fddd77
8 changed files with 66 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,10 +237,12 @@ void DeferredBumpFeatGLSL::processVert( Vector<ShaderComponent*> &componentLis
componentList );
}
const bool useFoliageTexCoord = fd.features[MFT_Foliage];
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
addOutDetailTexCoord( componentList,
meta,
useTexAnim );
useTexAnim, useFoliageTexCoord);
output = meta;
}

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

@ -245,10 +245,12 @@ void DeferredBumpFeatHLSL::processVert( Vector<ShaderComponent*> &componentLis
componentList );
}
const bool useFoliageTexCoord = fd.features[MFT_Foliage];
if ( fd.features.hasFeature( MFT_DetailNormalMap ) )
addOutDetailTexCoord( componentList,
meta,
useTexAnim );
useTexAnim, useFoliageTexCoord);
output = meta;
}