current revision

This commit is contained in:
2016-09-28 12:16:45 +02:00
parent 075d8bb633
commit d47322e73b
90 changed files with 8228 additions and 606 deletions

View File

@@ -9,6 +9,7 @@ uniform vec3 lightWorldPos;
uniform sampler2D texDiffuse;
uniform sampler2D texNormalMap;
uniform float alpha;
// interpolated values
varying vec3 v_WorldPos;
@@ -55,12 +56,12 @@ void main() {
// Set fragment color from texture
vec4 finalColor =
ambient * 0.05 +
diffuse * 0.95 * diffuseIntensity * lightInt +
ambient * 0.30 +
diffuse * 0.70 * diffuseIntensity * lightInt +
clamp(specular * specularIntensity, 0.0, 1.0) * 1.0;
gl_FragColor = clamp(finalColor, 0.0, 1.0);
gl_FragColor.a = 0.4;
gl_FragColor.a = alpha;
// FOG
//float mixing = pow((1.0 - v_CamPos.z * 3.0), 2);