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

Merge remote-tracking branch 'GG-Github/development' into fix_opengl_new_terrain_blend

Browse source
This commit is contained in:
LuisAntonRebollo 2014-11-30 04:47:38 +01:00
commit ff83e8c209
1455 changed files with 98353 additions and 15020 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.