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

Merge pull request #710 from lukaspj/3-Textures-Blending-Fix

Browse source 
3 textures blending fix
This commit is contained in:
Daniel Buckmaster 2014-11-04 17:06:04 +11:00
commit 9e4446046f
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Templates/Empty/game/shaders/common/terrain/terrain.hlsl
View file

@ -32,9 +32,12 @@ float calcBlend( float texId, float2 layerCoord, float layerSize, float4 layerSa
float4 diff = saturate( abs( layerSample - texId ) );
float noBlend = any( 1 - diff );
// Use step to see if any of the layer samples
// Check if any of the layer samples
// match the current texture id.
float4 factors = step( texId, layerSample );
float4 factors = 0;
for(int i = 0; i < 4; i++)
if(layerSample[i] == texId)
factors[i] = 1;
// This is a custom bilinear filter.

7
Templates/Full/game/shaders/common/terrain/terrain.hlsl
View file

@ -32,9 +32,12 @@ float calcBlend( float texId, float2 layerCoord, float layerSize, float4 layerSa
float4 diff = saturate( abs( layerSample - texId ) );
float noBlend = any( 1 - diff );
// Use step to see if any of the layer samples
// Check if any of the layer samples
// match the current texture id.
float4 factors = step( texId, layerSample );
float4 factors = 0;
for(int i = 0; i < 4; i++)
if(layerSample[i] == texId)
factors[i] = 1;
// This is a custom bilinear filter.