BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed blendmaps

Browse Source 
Merge remote-tracking branch 'origin/gui' into deffered_rendering

Conflicts:
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
Tleety
2014-05-28 22:08:50 +02:00
parent 761b8e21e1 cc42b94000
commit eb37cc2296
21 changed files with 932 additions and 1201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Shaders/BlendMap.frag.glsl
+5 -5
View File
@@ -58,11 +58,11 @@ float Shadow(vec4 ShadowCoord, vec3 normal)
void main()
{
vec4 BlendMap = texture2D(DiffuseTexture, Input.TextureCoord.st);
vec4 BlendMap = texture(DiffuseTexture, Input.TextureCoord);
vec4 TextureRedTexel = texture2D(TextureRed, Input.TextureCoord.st * TextureRepeats);
vec4 TextureGreenTexel = texture2D(TextureGreen, Input.TextureCoord.st * TextureRepeats);
vec4 TextureBlueTexel = texture2D(TextureBlue, Input.TextureCoord.st * TextureRepeats);
vec4 TextureRedTexel = texture(TextureRed, Input.TextureCoord * TextureRepeats);
vec4 TextureGreenTexel = texture(TextureGreen, Input.TextureCoord * TextureRepeats);
vec4 TextureBlueTexel = texture(TextureBlue, Input.TextureCoord * TextureRepeats);
//Mix the Terrain-textures together
TextureRedTexel *= BlendMap.r;
@@ -79,7 +79,7 @@ void main()
//frag_Normal = vec4(Input.Normal, 0.0);
// Diffuse Texture
frag_Diffuse = finalBlendTexel * Shadow(Input.ShadowCoord, vec3(frag_Normal));
frag_Diffuse = finalBlendTexel;
//G-buffer Specular
frag_Specular = texture(SpecularMapTexture, Input.TextureCoord);