Regenerated sample models from COLLADA2GLTF updates (KhronosGroup#76)

2.0/2CylinderEngine/glTF-techniqueWebGL/2CylinderEngine0.vert

@@ -2,19 +2,19 @@ precision highp float;
 uniform mat4 u_modelViewMatrix;
 uniform mat4 u_projectionMatrix;
 uniform mat3 u_normalMatrix;
+uniform mat4 u_light0Transform;
 uniform mat4 u_light1Transform;
-uniform mat4 u_light2Transform;
 attribute vec3 a_position;
 varying vec3 v_position;
 attribute vec3 a_normal;
 varying vec3 v_normal;
+varying vec3 v_light0Direction;
 varying vec3 v_light1Direction;
-varying vec3 v_light2Direction;
 void main(void) {
     vec4 pos = u_modelViewMatrix * vec4(a_position,1.0);
     v_position = pos.xyz;
     gl_Position = u_projectionMatrix * pos;
     v_normal = u_normalMatrix * a_normal;
+    v_light0Direction = mat3(u_light0Transform) * vec3(0., 0., 1.);
     v_light1Direction = mat3(u_light1Transform) * vec3(0., 0., 1.);
-    v_light2Direction = mat3(u_light2Transform) * vec3(0., 0., 1.);
 }

2.0/2CylinderEngine/glTF-techniqueWebGL/2CylinderEngine1.frag

@@ -7,11 +7,10 @@ uniform float u_shininess;
 uniform float u_transparency;
 uniform vec3 u_light0Color;
 uniform vec3 u_light1Color;
-uniform vec3 u_light2Color;
 varying vec3 v_position;
 varying vec3 v_normal;
+varying vec3 v_light0Direction;
 varying vec3 v_light1Direction;
-varying vec3 v_light2Direction;
 void main(void) {
     vec3 normal = normalize(v_normal);
     vec4 diffuse = u_diffuse;
@@ -23,24 +22,22 @@ void main(void) {
     vec3 viewDir = -normalize(v_position);
     vec3 ambientLight = vec3(0.0, 0.0, 0.0);
     {
-        ambientLight += u_light0Color;
-    }
-    {
-    vec3 l = normalize(v_light1Direction);
+    vec3 l = normalize(v_light0Direction);
     float attenuation = 1.0;
-    diffuseLight += u_light1Color * max(dot(normal, l), 0.) * attenuation;
+    diffuseLight += u_light0Color * max(dot(normal, l), 0.) * attenuation;
     vec3 reflectDir = reflect(-l, normal);
     float specularIntensity = max(0., pow(max(dot(reflectDir, viewDir), 0.), u_shininess)) * attenuation;
-    specularLight += u_light1Color * specularIntensity;
+    specularLight += u_light0Color * specularIntensity;
     }
     {
-    vec3 l = normalize(v_light2Direction);
+    vec3 l = normalize(v_light1Direction);
     float attenuation = 1.0;
-    diffuseLight += u_light2Color * max(dot(normal, l), 0.) * attenuation;
+    diffuseLight += u_light1Color * max(dot(normal, l), 0.) * attenuation;
     vec3 reflectDir = reflect(-l, normal);
     float specularIntensity = max(0., pow(max(dot(reflectDir, viewDir), 0.), u_shininess)) * attenuation;
-    specularLight += u_light2Color * specularIntensity;
+    specularLight += u_light1Color * specularIntensity;
     }
+    ambientLight += vec3(0.2, 0.2, 0.2);
     vec3 color = vec3(0.0, 0.0, 0.0);
     color += diffuse.rgb * diffuseLight;
     color += specular * specularLight;