fix bug with attributes causing light-4 not to display

Author: mikolalysenko

exercises/light-4/files/fragment.glsl

@@ -1,8 +1,19 @@
-precision highp float;
+precision mediump float;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+uniform mat4 inverseModel;
+uniform mat4 inverseView;
+uniform mat4 inverseProjection;
+
+uniform vec3 ambient;
+uniform vec3 diffuse;
+uniform vec3 specular;
+
+uniform vec3 lightPosition;
 
-uniform mat4 model, view, projection;
-uniform mat4 inverseModel, inverseView, inverseProjection;
-uniform vec3 ambient, diffuse, specular, lightPosition, eyeDirection;
 uniform float shininess;
 
 void main() {

exercises/light-4/files/vertex.glsl

@@ -1,12 +1,18 @@
-precision highp float;
+precision mediump float;
 
-attribute vec4 position, normal;
+attribute vec3 position;
+attribute vec3 normal;
 
-uniform mat4 model, view, projection;
-uniform mat4 inverseModel, inverseView, inverseProjection;
-uniform vec3 ambient, diffuse, specular, lightPosition;
-uniform float shininess;
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+uniform mat4 inverseModel;
+uniform mat4 inverseView;
+uniform mat4 inverseProjection;
+
+uniform vec3 lightPosition;
 
 void main() {
-  gl_Position = position;
+  gl_Position = vec4(position, 1);
 }

exercises/light-4/index.js

@@ -35,6 +35,7 @@ require('../common')({
 window.addEventListener('resize', fit(canvas), false)
 
 var vertexNormals = getNormals(dragon.cells, dragon.positions, 0.1)
+var vertexCount = dragon.cells.length * 3
 var vertexData = []
 for(var i=0; i<dragon.cells.length; ++i) {
   var loop = dragon.cells[i]
@@ -43,30 +44,17 @@ for(var i=0; i<dragon.cells.length; ++i) {
   }
 }
 var vertexBuffer = createBuffer(gl, vertexData)
-var vertexArray = createVAO(gl, [
-  {
-    "buffer": vertexBuffer,
-    "size": 3 
-  },
-  {
-    "buffer": createBuffer(gl, vertexNormals),
-    "size": 3
-  }
-])
+var normalBuffer = createBuffer(gl, vertexNormals)
 
 var actualShader = createShader({
     frag: process.env.file_fragment_glsl
   , vert: process.env.file_vertex_glsl
 })(gl)
-actualShader.attributes.position.location = 0
-actualShader.attributes.normal.location = 1
 
 var expectedShader = createShader({
     frag: './shaders/fragment.glsl'
   , vert: './shaders/vertex.glsl'
 })(gl)
-expectedShader.attributes.position.location = 0
-expectedShader.attributes.normal.location = 1
 
 var pointShader = createShader({
     frag: './shaders/point-fragment.glsl'
@@ -136,12 +124,17 @@ function actual(fbo) {
   actualShader.bind()
   actualShader.uniforms = camera
 
-  vertexArray.bind()
-  vertexArray.draw(gl.TRIANGLES, vertexData.length / 3)
+  vertexBuffer.bind()
+  actualShader.attributes.position.pointer()
+
+  normalBuffer.bind()
+  actualShader.attributes.normal.pointer()
+
+  gl.drawArrays(gl.TRIANGLES, 0, vertexCount)
 
   pointShader.bind()
   pointShader.uniforms = camera
-  vertexArray.draw(gl.POINTS, 1)
+  gl.drawArrays(gl.POINTS, 0, 1)
 }
 
 function expected(fbo) {
@@ -156,10 +149,15 @@ function expected(fbo) {
   expectedShader.bind()
   expectedShader.uniforms = camera
 
-  vertexArray.bind()
-  vertexArray.draw(gl.TRIANGLES, vertexData.length / 3)
+  vertexBuffer.bind()
+  expectedShader.attributes.position.pointer()
+
+  normalBuffer.bind()
+  expectedShader.attributes.normal.pointer()
+
+  gl.drawArrays(gl.TRIANGLES, 0, vertexCount)
 
   pointShader.bind()
   pointShader.uniforms = camera
-  vertexArray.draw(gl.POINTS, 1)
+  gl.drawArrays(gl.POINTS, 0, 1)
 }

exercises/light-4/shaders/fragment.glsl

@@ -1,8 +1,15 @@
 precision mediump float;
 
-uniform vec3 ambient, diffuse, specular, lightPosition;
+uniform vec3 ambient;
+uniform vec3 diffuse;
+uniform vec3 specular;
+uniform vec3 lightPosition;
+
 uniform float shininess;
-varying vec3 fragNormal, fragPosition, lightDirection;
+
+varying vec3 fragNormal;
+varying vec3 fragPosition;
+varying vec3 lightDirection;
 
 void main() {
   vec3 eyeDirection = normalize(fragPosition);

exercises/light-4/shaders/vertex.glsl

@@ -1,11 +1,21 @@
 precision mediump float;
 
-attribute vec3 position, normal;
+attribute vec3 position;
+attribute vec3 normal;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+uniform mat4 inverseModel;
+uniform mat4 inverseView;
+uniform mat4 inverseProjection;
 
-uniform mat4 model, view, projection;
-uniform mat4 inverseModel, inverseView, inverseProjection;
 uniform vec3 lightPosition;
-varying vec3 fragNormal, fragPosition, lightDirection;
+
+varying vec3 fragNormal;
+varying vec3 fragPosition;
+varying vec3 lightDirection;
 
 void main() {
   vec4 viewPosition = view * model * vec4(position, 1.0);