fix point sprite bug and light-5

Author: mikolalysenko

exercises/light-4/index.js

@@ -124,12 +124,14 @@ function actual(fbo) {
   actualShader.bind()
   actualShader.uniforms = camera
 
+  if(actualShader.attributes.normal.location >= 0) {
+    normalBuffer.bind()
+    actualShader.attributes.normal.pointer()
+  }
+  
   vertexBuffer.bind()
   actualShader.attributes.position.pointer()
 
-  normalBuffer.bind()
-  actualShader.attributes.normal.pointer()
-
   gl.drawArrays(gl.TRIANGLES, 0, vertexCount)
 
   pointShader.bind()

exercises/light-4/shaders/point-vertex.glsl

@@ -1,6 +1,7 @@
+attribute vec3 position;
 uniform mat4 model, view, projection;
 uniform vec3 lightPosition;
 void main() {
-  gl_Position = projection * view * model * vec4(lightPosition, 1);
+  gl_Position = projection * view * model * vec4(lightPosition + 0.0 * position, 1);
   gl_PointSize = 10.0;
 }

exercises/light-5/files/fragment.glsl

@@ -1,10 +1,17 @@
-precision highp float;
+precision mediump float;
 
 #pragma glslify: PointLight = require(./light.glsl)
 
-uniform mat4 model, view, projection;
-uniform mat4 inverseModel, inverseView, inverseProjection;
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
+
+uniform mat4 inverseModel;
+uniform mat4 inverseView;
+uniform mat4 inverseProjection;
+
 uniform vec3 ambient;
+
 uniform PointLight lights[4];
 
 void main() {

exercises/light-5/files/vertex.glsl

@@ -1,14 +1,22 @@
-precision highp float;
+precision mediump float;
 
 #pragma glslify: PointLight = require(./light.glsl)
 
-attribute vec4 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 ambient;
+
 uniform PointLight lights[4];
 
 void main() {
-  gl_Position = position;
+  gl_Position = vec4(position, 1);
 }

exercises/light-5/index.js

@@ -36,23 +36,15 @@ window.addEventListener('resize', fit(canvas), false)
 
 var vertexNormals = getNormals(dragon.cells, dragon.positions, 0.1)
 var vertexData = []
+var vertexCount = dragon.cells.length * 3
 for(var i=0; i<dragon.cells.length; ++i) {
   var loop = dragon.cells[i]
   for(var j=0; j<loop.length; ++j) {
     vertexData.push.apply(vertexData, dragon.positions[loop[j]])
   }
 }
 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
@@ -72,6 +64,7 @@ var pointShader = createShader({
     frag: './shaders/point-fragment.glsl'
   , vert: './shaders/point-vertex.glsl'
 })(gl)
+pointShader.attributes.position.location = 0
 
 function getCamera() {
   var projection = mat4.perspective(
@@ -154,8 +147,15 @@ function actual(fbo) {
   actualShader.bind()
   actualShader.uniforms = camera
 
-  vertexArray.bind()
-  vertexArray.draw(gl.TRIANGLES, vertexData.length / 3)
+  if(actualShader.attributes.normal.location > 0) {
+    normalBuffer.bind()
+    actualShader.attributes.normal.pointer()
+  }
+
+  vertexBuffer.bind()
+  actualShader.attributes.position.pointer()
+
+  gl.drawArrays(gl.TRIANGLES, 0, vertexCount)
 
   pointShader.bind()
   pointShader.uniforms.model = camera.model
@@ -164,7 +164,7 @@ function actual(fbo) {
   for(var i=0; i<4; ++i) {
     pointShader.uniforms.lightPosition = camera.lights[i].position
     pointShader.uniforms.diffuse = camera.lights[i].diffuse
-    vertexArray.draw(gl.POINTS, 1)
+    gl.drawArrays(gl.POINTS, 0, 1)
   }
 }
 
@@ -180,16 +180,24 @@ function expected(fbo) {
   expectedShader.bind()
   expectedShader.uniforms = camera
 
-  vertexArray.bind()
-  vertexArray.draw(gl.TRIANGLES, vertexData.length / 3)
+  normalBuffer.bind()
+  expectedShader.attributes.normal.pointer()
+
+  vertexBuffer.bind()
+  expectedShader.attributes.position.pointer()
+
+  gl.drawArrays(gl.TRIANGLES, 0, vertexCount)
 
   pointShader.bind()
   pointShader.uniforms.model = camera.model
   pointShader.uniforms.view = camera.view
   pointShader.uniforms.projection = camera.projection
+
+  vertexBuffer.bind()
+  pointShader.attributes.position.pointer()
   for(var i=0; i<4; ++i) {
     pointShader.uniforms.lightPosition = camera.lights[i].position
     pointShader.uniforms.diffuse = camera.lights[i].diffuse
-    vertexArray.draw(gl.POINTS, 1)
+    gl.drawArrays(gl.POINTS, 0, 1)
   }
 }

exercises/light-5/shaders/fragment.glsl

@@ -5,7 +5,9 @@ precision mediump float;
 uniform vec3 ambient;
 uniform PointLight lights[4];
 
-varying vec3 fragNormal, fragPosition, lightDirection[4];
+varying vec3 fragNormal;
+varying vec3 fragPosition;
+varying vec3 lightDirection[4];
 
 void main() {
   vec3 eyeDirection = normalize(fragPosition);

exercises/light-5/shaders/point-vertex.glsl

@@ -1,6 +1,7 @@
+attribute vec3 position;
 uniform mat4 model, view, projection;
 uniform vec3 lightPosition;
 void main() {
-  gl_Position = projection * view * model * vec4(lightPosition, 1);
+  gl_Position = projection * view * model * vec4(lightPosition + 0.0 * position, 1);
   gl_PointSize = 10.0;
 }

exercises/light-5/shaders/vertex.glsl

@@ -2,13 +2,22 @@ precision mediump float;
 
 #pragma glslify: PointLight = require(./light.glsl)
 
-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 PointLight lights[4];
 
-varying vec3 fragNormal, fragPosition, lightDirection[4];
+varying vec3 fragNormal;
+varying vec3 fragPosition;
+varying vec3 lightDirection[4];
 
 void main() {
   vec4 viewPosition = view * model * vec4(position, 1.0);