Clean: Update a_normals to a_normal for consistency

Farhad Ghayour · Farhad Ghayour · commit 2977bd08aac6 · 2015-07-08T13:23:44.000-07:00
diff --git a/webgl-geometries/DynamicGeometry.js b/webgl-geometries/DynamicGeometry.js
@@ -138,7 +138,7 @@ DynamicGeometry.prototype.setVertexPositions = function (value) {
  * @return {Object}            current geometry.
  */
 DynamicGeometry.prototype.setNormals = function (value) {
-    return this.setVertexBuffer('a_normals', value, 3);
+    return this.setVertexBuffer('a_normal', value, 3);
 };
 
 /**
@@ -190,7 +190,7 @@ DynamicGeometry.prototype.getVertexPositions = function () {
  * @return {Array} Vertex Buffer.
  */
 DynamicGeometry.prototype.getNormals = function () {
-    return this.getVertexBuffer('a_normals');
+    return this.getVertexBuffer('a_normal');
 };
 
 /**
diff --git a/webgl-geometries/primitives/Box.js b/webgl-geometries/primitives/Box.js
@@ -84,7 +84,7 @@ function BoxGeometry(options) {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Circle.js b/webgl-geometries/primitives/Circle.js
@@ -55,7 +55,7 @@ function Circle (options) {
         buffers: [
             { name: 'a_pos', data: buffers.vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: buffers.indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Cylinder.js b/webgl-geometries/primitives/Cylinder.js
@@ -60,7 +60,7 @@ function Cylinder (options) {
         buffers: [
             { name: 'a_pos', data: buffers.vertices },
             { name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },
-            { name: 'a_normals', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
+            { name: 'a_normal', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
             { name: 'indices', data: buffers.indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/GeodesicSphere.js b/webgl-geometries/primitives/GeodesicSphere.js
@@ -1,18 +1,18 @@
 /**
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2015 Famous Industries Inc.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,7 +36,7 @@ var GeometryHelper = require('../GeometryHelper');
  *
  * @param {Object} options Parameters that alter the
  * vertex buffers of the generated geometry.
- * 
+ *
  * @return {Object} constructed geometry
  */
 function GeodesicSphere (options) {
@@ -69,7 +69,7 @@ function GeodesicSphere (options) {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Icosahedron.js b/webgl-geometries/primitives/Icosahedron.js
@@ -1,18 +1,18 @@
 /**
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2015 Famous Industries Inc.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -36,7 +36,7 @@ var GeometryHelper = require('../GeometryHelper');
  *
  * @param {Object} options Parameters that alter the
  * vertex buffers of the generated geometry.
- * 
+ *
  * @return {Object} constructed geometry
  */
 function Icosahedron() {
@@ -65,7 +65,7 @@ function Icosahedron() {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/ParametricCone.js b/webgl-geometries/primitives/ParametricCone.js
@@ -58,7 +58,7 @@ function ParametricCone (options) {
         buffers: [
             { name: 'a_pos', data: buffers.vertices },
             { name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },
-            { name: 'a_normals', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
+            { name: 'a_normal', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
             { name: 'indices', data: buffers.indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Plane.js b/webgl-geometries/primitives/Plane.js
@@ -80,7 +80,7 @@ function Plane(options) {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Sphere.js b/webgl-geometries/primitives/Sphere.js
@@ -56,7 +56,7 @@ function ParametricSphere (options) {
         buffers: [
             { name: 'a_pos', data: buffers.vertices },
             { name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },
-            { name: 'a_normals', data: GeometryHelper.getSpheroidNormals(buffers.vertices) },
+            { name: 'a_normal', data: GeometryHelper.getSpheroidNormals(buffers.vertices) },
             { name: 'indices', data: buffers.indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Tetrahedron.js b/webgl-geometries/primitives/Tetrahedron.js
@@ -92,7 +92,7 @@ function Tetrahedron(options) {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Torus.js b/webgl-geometries/primitives/Torus.js
@@ -56,7 +56,7 @@ function Torus(options) {
         buffers: [
             { name: 'a_pos', data: buffers.vertices },
             { name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },
-            { name: 'a_normals', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
+            { name: 'a_normal', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },
             { name: 'indices', data: buffers.indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/primitives/Triangle.js b/webgl-geometries/primitives/Triangle.js
@@ -69,7 +69,7 @@ function Triangle (options) {
         buffers: [
             { name: 'a_pos', data: vertices },
             { name: 'a_texCoord', data: textureCoords, size: 2 },
-            { name: 'a_normals', data: normals },
+            { name: 'a_normal', data: normals },
             { name: 'indices', data: indices, size: 1 }
         ]
     });
diff --git a/webgl-geometries/test/DynamicGeometry.spec.js b/webgl-geometries/test/DynamicGeometry.spec.js
@@ -151,13 +151,13 @@ test('DynamicGeometry', function(t) {
         geometry.setNormals(vertexNormals);
 
         t.deepEquals(
-            geometry.spec.bufferValues[geometry.spec.bufferNames.indexOf('a_normals')],
+            geometry.spec.bufferValues[geometry.spec.bufferNames.indexOf('a_normal')],
             vertexNormals,
             'Should set vertex data to the "normal" attribute of the geometry'
         );
 
         t.equals(
-            geometry.spec.bufferSpacings[geometry.spec.bufferNames.indexOf('a_normals')],
+            geometry.spec.bufferSpacings[geometry.spec.bufferNames.indexOf('a_normal')],
             3,
             'Should set buffer spacing to 3 for normal attribute'
         );
diff --git a/webgl-geometries/test/Primitives.spec.js b/webgl-geometries/test/Primitives.spec.js
@@ -48,7 +48,7 @@ test('Primitives', function(t) {
         t.ok(primitive instanceof Geometry, 'should be an instance of a static geometry');
 
         t.notEquals(primitive.spec.bufferNames.indexOf('a_texCoord'), -1, 'should contain a texCoord buffer');
-        t.notEquals(primitive.spec.bufferNames.indexOf('a_normals'), -1, 'should contain a normal buffer');
+        t.notEquals(primitive.spec.bufferNames.indexOf('a_normal'), -1, 'should contain a normal buffer');
         t.notEquals(primitive.spec.bufferNames.indexOf('a_pos'), -1, 'should contain a pos buffer');
 
         if (name !== 'Circle') {
diff --git a/webgl-renderers/Program.js b/webgl-renderers/Program.js
@@ -89,7 +89,7 @@ var uniforms = keyValueToArrays({
 var attributes = keyValueToArrays({
     a_pos: [0, 0, 0],
     a_texCoord: [0, 0],
-    a_normals: [0, 0, 0]
+    a_normal: [0, 0, 0]
 });
 
 /**
diff --git a/webgl-shaders/VertexShader.glsl b/webgl-shaders/VertexShader.glsl
@@ -1,18 +1,18 @@
 /**
  * The MIT License (MIT)
- * 
+ *
  * Copyright (c) 2015 Famous Industries Inc.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -37,7 +37,7 @@
  */
 
 vec4 applyTransform(vec4 pos) {
-    //TODO: move this multiplication to application code. 
+    //TODO: move this multiplication to application code.
 
     /**
      * Currently multiplied in the vertex shader to avoid consuming the complexity of holding an additional
@@ -59,7 +59,7 @@ vec4 applyTransform(vec4 pos) {
      *
      * where convertToDOMSpace represents the transform matrix:
      *
-     *                           size.x 0       0       size.x 
+     *                           size.x 0       0       size.x
      *                           0      -size.y 0       size.y
      *                           0      0       1       0
      *                           0      0       0       1
@@ -71,7 +71,7 @@ vec4 applyTransform(vec4 pos) {
      * Later in the transformation chain, the projection transform negates the rigidbody translation.
      * Equivalent to (but much faster than) multiplying a translation matrix "origin"
      *
-     *                           1 0 0 1 
+     *                           1 0 0 1
      *                           0 1 0 -1
      *                           0 0 1 0
      *                           0 0 0 1
@@ -87,7 +87,7 @@ vec4 applyTransform(vec4 pos) {
      * by the inverse of the canvas' resolution.
      * Equivalent to (but much faster than) multiplying a scale matrix "sizeScale"
      *
-     *                           size.x 0      0      0 
+     *                           size.x 0      0      0
      *                           0      size.y 0      0
      *                           0      0      size.z 0
      *                           0      0      0      1
@@ -97,11 +97,11 @@ vec4 applyTransform(vec4 pos) {
     pos.xyz *= u_size * 0.5;
 
     /**
-     * Inverts the object space's y axis in order to match DOM space conventions. 
+     * Inverts the object space's y axis in order to match DOM space conventions.
      * Later in the transformation chain, the projection transform reinverts the y axis to convert to clip space.
      * Equivalent to (but much faster than) multiplying a scale matrix "invertYAxis"
      *
-     *                           1 0 0 0 
+     *                           1 0 0 0
      *                           0 -1 0 0
      *                           0 0 1 0
      *                           0 0 0 1
@@ -166,7 +166,7 @@ vec3 calculateOffset(vec3 ID) {
  */
 void main() {
     v_textureCoordinate = a_texCoord;
-    vec3 invertedNormals = a_normals + (u_normals.x < 0.0 ? calculateOffset(u_normals) * 2.0 - 1.0 : vec3(0.0));
+    vec3 invertedNormals = a_normal + (u_normals.x < 0.0 ? calculateOffset(u_normals) * 2.0 - 1.0 : vec3(0.0));
     invertedNormals.y *= -1.0;
     v_normal = transpose(mat3(inverse(u_transform))) * invertedNormals;
     vec3 offsetPos = a_pos + calculateOffset(u_positionOffset);

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ function BoxGeometry(options) {`
`84`	`84`	`buffers: [`
`85`	`85`	`{ name: 'a_pos', data: vertices },`
`86`	`86`	`{ name: 'a_texCoord', data: textureCoords, size: 2 },`
`87`		`- { name: 'a_normals', data: normals },`
	`87`	`+ { name: 'a_normal', data: normals },`
`88`	`88`	`{ name: 'indices', data: indices, size: 1 }`
`89`	`89`	`]`
`90`	`90`	`});`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function Circle (options) {`
`55`	`55`	`buffers: [`
`56`	`56`	`{ name: 'a_pos', data: buffers.vertices },`
`57`	`57`	`{ name: 'a_texCoord', data: textureCoords, size: 2 },`
`58`		`- { name: 'a_normals', data: normals },`
	`58`	`+ { name: 'a_normal', data: normals },`
`59`	`59`	`{ name: 'indices', data: buffers.indices, size: 1 }`
`60`	`60`	`]`
`61`	`61`	`});`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ function Cylinder (options) {`
`60`	`60`	`buffers: [`
`61`	`61`	`{ name: 'a_pos', data: buffers.vertices },`
`62`	`62`	`{ name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },`
`63`		`- { name: 'a_normals', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },`
	`63`	`+ { name: 'a_normal', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },`
`64`	`64`	`{ name: 'indices', data: buffers.indices, size: 1 }`
`65`	`65`	`]`
`66`	`66`	`});`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ function ParametricCone (options) {`
`58`	`58`	`buffers: [`
`59`	`59`	`{ name: 'a_pos', data: buffers.vertices },`
`60`	`60`	`{ name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },`
`61`		`- { name: 'a_normals', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },`
	`61`	`+ { name: 'a_normal', data: GeometryHelper.computeNormals(buffers.vertices, buffers.indices) },`
`62`	`62`	`{ name: 'indices', data: buffers.indices, size: 1 }`
`63`	`63`	`]`
`64`	`64`	`});`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ function Plane(options) {`
`80`	`80`	`buffers: [`
`81`	`81`	`{ name: 'a_pos', data: vertices },`
`82`	`82`	`{ name: 'a_texCoord', data: textureCoords, size: 2 },`
`83`		`- { name: 'a_normals', data: normals },`
	`83`	`+ { name: 'a_normal', data: normals },`
`84`	`84`	`{ name: 'indices', data: indices, size: 1 }`
`85`	`85`	`]`
`86`	`86`	`});`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function ParametricSphere (options) {`
`56`	`56`	`buffers: [`
`57`	`57`	`{ name: 'a_pos', data: buffers.vertices },`
`58`	`58`	`{ name: 'a_texCoord', data: GeometryHelper.getSpheroidUV(buffers.vertices), size: 2 },`
`59`		`- { name: 'a_normals', data: GeometryHelper.getSpheroidNormals(buffers.vertices) },`
	`59`	`+ { name: 'a_normal', data: GeometryHelper.getSpheroidNormals(buffers.vertices) },`
`60`	`60`	`{ name: 'indices', data: buffers.indices, size: 1 }`
`61`	`61`	`]`
`62`	`62`	`});`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ function Tetrahedron(options) {`
`92`	`92`	`buffers: [`
`93`	`93`	`{ name: 'a_pos', data: vertices },`
`94`	`94`	`{ name: 'a_texCoord', data: textureCoords, size: 2 },`
`95`		`- { name: 'a_normals', data: normals },`
	`95`	`+ { name: 'a_normal', data: normals },`
`96`	`96`	`{ name: 'indices', data: indices, size: 1 }`
`97`	`97`	`]`
`98`	`98`	`});`