Additionnal fixes

This commit is contained in:
Vincent Lejeune 2014-10-05 21:45:56 +02:00
parent 4c4aba2ad8
commit 300a09746f
2 changed files with 2 additions and 2 deletions

View File

@ -24,5 +24,5 @@ void main(void)
#endif
col.xyz *= pow(color.xyz, vec3(2.2));
float specmap = texture(SpecMap, uv).g;
FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap), 1.);
FragColor = vec4(getLightFactor(col.xyz, vec3(1.), specmap), 1.);
}

View File

@ -23,5 +23,5 @@ void main(void)
col.xyz *= pow(color.xyz, vec3(2.2));
if (col.a * color.a < 0.5) discard;
float specmap = texture(SpecMap, uv).g;
FragColor = vec4(getLightFactor(color.xyz, vec3(1.), specmap), 1.);
FragColor = vec4(getLightFactor(col.xyz, vec3(1.), specmap), 1.);
}