Inget funkar, broken commit, dont use.

This commit is contained in:
Tleety
2014-06-04 04:20:15 +02:00
parent e15474c3d4
commit cf2040f038
9 changed files with 141 additions and 102 deletions
+1 -2
View File
@@ -1,6 +1,5 @@
#version 430
//uniform vec3 La;
layout (binding=0) uniform sampler2D DiffuseTexture;
@@ -15,11 +14,11 @@ out vec4 FragmentColor;
void main()
{
vec4 DiffuseTexel = texture(DiffuseTexture, Input.TextureCoord);
//vec4 LightingTexel = texture(LightingTexture, Input.TextureCoord);
//FragmentColor = LightingTexel + vec4(LightingTexel.a, LightingTexel.a, LightingTexel.a, 0.0);
//FragmentColor = DiffuseTexel;
FragmentColor = DiffuseTexel;
//FragmentColor = DiffuseTexel * (vec4(La, 0.0) + vec4(LightingTexel.rgb, 0.0)) + vec4(LightingTexel.a, LightingTexel.a, LightingTexel.a, 0.0);
//FragmentColor = vec4(pow(_FragmentColor.rgb, vec3(1.0 / Gamma)), _FragmentColor.a);
}