move remaining BufferHelper methods to BufferAccessor; rename h3du-bufferhelper.js to h3du-bufferaccessor.js; etc.

Author: peteroupc

demos/bsp.js

@@ -25,14 +25,43 @@ BspTree._negatePlane = function(plane) {
   "use strict";
   return [-plane[0], -plane[1], -plane[2], plane[3], plane[4], plane[5]];
 };
+
+/** @constructor
+ * @ignore */
+BspTree._MiniBuilder = function() {
+  "use strict";
+  this.vertices = [];
+  this.normals = [];
+  this.indices = [];
+  this.addPoly = function(poly) {
+    var index = this.vertices.length / 3;
+    for(var i = 0; i < poly.vertices.length; i++) {
+      var v = poly.vertices[i];
+      this.normals.push(poly.plane[0], poly.plane[1], poly.plane[2]);
+      this.vertices.push(v[0], v[1], v[2]);
+    }
+    for(i = 0; i < poly.vertices.length - 2; i++) {
+      this.indices.push(index);
+      this.indices.push(index + i + 1);
+      this.indices.push(index + i + 2);
+    }
+  };
+  this.toMeshBuffer = function() {
+    return new H3DU.MeshBuffer()
+    .setAttribute("POSITION", 0, this.vertices, 0, 3)
+    .setAttribute("NORMAL", 0, this.normals, 0, 3)
+    .setIndices(this.indices);
+  };
+};
+
 /**
  * Generates a mesh buffer containing the polygons
  * stored in this BSP tree.
  * @returns {H3DU.MeshBuffer} Return value.
  */
 BspTree.prototype.toMeshBuffer = function() {
   "use strict";
-  var mesh = new H3DU.Mesh();
+  var mesh = new BspTree._MiniBuilder();
   this._toMeshInternal(mesh);
   return mesh.toMeshBuffer();
 };
@@ -42,12 +71,7 @@ BspTree.prototype._toMeshInternal = function(mesh) {
   if(typeof this.faces !== "undefined" && this.faces !== null) {
     for(var polyIndex = 0; polyIndex < this.faces.length; polyIndex++) {
       var poly = this.faces[polyIndex];
-      mesh.mode(H3DU.Mesh.TRIANGLE_FAN);
-      mesh.normal3(poly.plane);
-      for(var i = 0; i < poly.vertices.length; i++) {
-        mesh.vertex3(poly.vertices[i]);
-      }
-      mesh.vertex3(poly.vertices[0]);
+      mesh.addPoly(poly);
     }
   }
   if(typeof this.frontTree !== "undefined" && this.frontTree !== null) {

doc/H3DU.BufferAccessor.md

@@ -30,6 +30,9 @@ value to the start of the next.
 * [get](#H3DU.BufferAccessor_get)<br>Gets the first element of the attribute value with the given vertex index.
 * [getVec](#H3DU.BufferAccessor_getVec)<br>Gets the elements of a vertex attribute value.
 * [makeBlank](#H3DU.BufferAccessor.makeBlank)<br>Generates a vertex attribute buffer, with each value set to all zeros.
+* [makeIndices](#H3DU.BufferAccessor.makeIndices)<br>Generates an array of increasing vertex indices.
+* [merge](#H3DU.BufferAccessor.merge)<br>Merges two vertex attributes, whose vertices can be indexed differently, into one
+combined vertex attribute.
 * [set](#H3DU.BufferAccessor_set)<br>Sets the first element of the attribute value with the given vertex index.
 * [setVec](#H3DU.BufferAccessor_setVec)<br>Sets the elements of a vertex attribute value.
 
@@ -141,6 +144,38 @@ Generates a vertex attribute buffer, with each value set to all zeros.
 
 A blank vertex attribute buffer. (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)
 
+<a name='H3DU.BufferAccessor.makeIndices'></a>
+### (static) H3DU.BufferAccessor.makeIndices(numIndices)
+
+Generates an array of increasing vertex indices.
+
+#### Parameters
+
+* `numIndices` (Type: number)<br>The number of vertex indices to generate. The array will range from 0 to the number of vertex indices minus 1.
+
+#### Return Value
+
+An array of vertex indices. (Type: Uint16Array | Uint32Array)
+
+<a name='H3DU.BufferAccessor.merge'></a>
+### (static) H3DU.BufferAccessor.merge(attr1, indices1, attr2, indices2)
+
+Merges two vertex attributes, whose vertices can be indexed differently, into one
+combined vertex attribute.
+
+#### Parameters
+
+* `attr1` (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)<br>A vertex buffer accessor for the first vertex attribute. Can be null, in which case it is assumed that the attribute contains as many values as the length of "indices1" and all the values are zeros.
+* `indices1` (Type: Array.&lt;number> | Uint16Array | Uint8Array | Uint32Array)<br>An array of vertex indices associated with the first vertex attribute.
+* `attr2` (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)<br>A vertex buffer accessor for the second vertex attribute. Can be null, in which case it is assumed that the attribute contains as many values as the length of "indices2" and all the values are zeros.
+* `indices2` (Type: Array.&lt;number> | Uint16Array | Uint8Array | Uint32Array)<br>An array of vertex indices associated with the second vertex attribute.
+
+#### Return Value
+
+The merged attribute, where the vertices from the first vertex
+attribute come before those from the second. The merged attribute will have as many
+values as the sum of the lengths of "indices1" and "indices2". (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)
+
 <a name='H3DU.BufferAccessor_set'></a>
 ### H3DU.BufferAccessor#set(index, value)
 

doc/H3DU.BufferHelper.md

@@ -6,7 +6,7 @@
 ### H3DU.MeshBuffer()
 
 A geometric mesh in the form of buffer objects.
-A mesh buffer is made up of one or more <a href="H3DU.BufferHelper.md">vertex attribute objects</a>,
+A mesh buffer is made up of one or more <a href="H3DU.BufferAccessor.md">vertex attribute objects</a>,
 and an array of vertex indices. Each vertex attribute object contains
 the values of one attribute of the mesh, such as positions,
 vertex normals, and texture coordinates. A mesh buffer
@@ -299,7 +299,7 @@ semantic is unsupported. (Type: <a href="H3DU.MeshBuffer.md">H3DU.MeshBuffer</a>
 
 Sets all the vertices in this mesh to the given color, by
 assigning each value with the attribute semantic <code>COLOR</code>
-to the given color. (If the attribute's count per value
+to the given color. (If the attribute's <a href="H3DU.BufferAccessor.md#H3DU.BufferAccessor_countPerValue">count per value</a>
 is less than 4, each such value will be set to as many elements of the converted 4-element
 color as possible.) If an attribute with the semantic <code>COLOR</code>
 doesn't exist, an attribute with the semantic <code>COLOR_0</code> and a count per

doc/H3DU.MeshBuffer.md

@@ -18,7 +18,6 @@ to create a B&eacute;zier curve.</b>
 * <a href="H3DU.BezierSurface.md">H3DU.BezierSurface</a><br><b>Deprecated: Instead of this class, use <a href="H3DU.BSplineSurface.md#H3DU.BSplineSurface.fromBezierSurface">H3DU.BSplineSurface.fromBezierSurface</a>
 to create a B&eacute;zier surface.</b>
 * <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a><br>A <b>vertex attribute object</b>.
-* <a href="H3DU.BufferHelper.md">H3DU.BufferHelper</a><br>A helper class for accessing and setting data in vertex attributes.
 * <a href="H3DU.BufferedMesh.md">H3DU.BufferedMesh</a><br><b>Deprecated: This class is likely to become a private class.
 Use the <a href="H3DU.MeshBuffer.md">H3DU.MeshBuffer</a> class instead, which is not coupled to WebGL
 contexts.</b>

doc/index.md

@@ -1,7 +1,8 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><title>H3DU.BufferAccessor</title></head><body><h1> H3DU.BufferAccessor</h1><p><a href='index.html'>Back to documentation index.</a></p><a name='H3DU.BufferAccessor'></a>
 <h3> H3DU.BufferAccessor(buffer, offset, countPerValue, [stride])</h3>A <b>vertex attribute object</b>.<h4> Parameters</h4><ul><li><code>buffer</code> (Type: Float32Array)<br>A buffer to store vertex attribute data; see <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_buffer">H3DU.BufferAccessor#buffer</a>.<li><code>offset</code> (Type: number)<br>Offset to the first value; see <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_offset">H3DU.BufferAccessor#offset</a>. Throws an error if less than 0.<li><code>countPerValue</code> (Type: number)<br>Number of elements per value; see <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_countPerValue">H3DU.BufferAccessor#countPerValue</a>. Throws an error if 0 or less.<li><code>stride</code> (Type: number) (optional)<br>Number of elements from the start of one value to the start of the next; see <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_stride">H3DU.BufferAccessor#stride</a>. If null, undefined, or omitted, has the same value as "countPerValue". Throws an error if 0 or less.</ul><h3> Members</h3><ul><li><a href='#H3DU.BufferAccessor_buffer'>buffer</a><br>A <i>buffer</i> of arbitrary size.<li><a href='#H3DU.BufferAccessor_countPerValue'>countPerValue</a><br>A count of the number of elements each value has.<li><a href='#H3DU.BufferAccessor_offset'>offset</a><br>An offset, which identifies the index, starting from 0, of the first value
 of the attribute within the buffer.<li><a href='#H3DU.BufferAccessor_stride'>stride</a><br>A stride, which gives the number of elements from the start of one
-value to the start of the next.</ul><h3> Methods</h3><ul><li><a href='#H3DU.BufferAccessor_copy'>copy</a><br>Copies the values of this accessor into a new vertex attribute object.<li><a href='#H3DU.BufferAccessor_count'>count</a><br>Gets the number of <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_buffer">values</a> defined for this accessor.<li><a href='#H3DU.BufferAccessor_get'>get</a><br>Gets the first element of the attribute value with the given vertex index.<li><a href='#H3DU.BufferAccessor_getVec'>getVec</a><br>Gets the elements of a vertex attribute value.<li><a href='#H3DU.BufferAccessor.makeBlank'>makeBlank</a><br>Generates a vertex attribute buffer, with each value set to all zeros.<li><a href='#H3DU.BufferAccessor_set'>set</a><br>Sets the first element of the attribute value with the given vertex index.<li><a href='#H3DU.BufferAccessor_setVec'>setVec</a><br>Sets the elements of a vertex attribute value.</ul><a name='H3DU.BufferAccessor_buffer'></a>
+value to the start of the next.</ul><h3> Methods</h3><ul><li><a href='#H3DU.BufferAccessor_copy'>copy</a><br>Copies the values of this accessor into a new vertex attribute object.<li><a href='#H3DU.BufferAccessor_count'>count</a><br>Gets the number of <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_buffer">values</a> defined for this accessor.<li><a href='#H3DU.BufferAccessor_get'>get</a><br>Gets the first element of the attribute value with the given vertex index.<li><a href='#H3DU.BufferAccessor_getVec'>getVec</a><br>Gets the elements of a vertex attribute value.<li><a href='#H3DU.BufferAccessor.makeBlank'>makeBlank</a><br>Generates a vertex attribute buffer, with each value set to all zeros.<li><a href='#H3DU.BufferAccessor.makeIndices'>makeIndices</a><br>Generates an array of increasing vertex indices.<li><a href='#H3DU.BufferAccessor.merge'>merge</a><br>Merges two vertex attributes, whose vertices can be indexed differently, into one
+combined vertex attribute.<li><a href='#H3DU.BufferAccessor_set'>set</a><br>Sets the first element of the attribute value with the given vertex index.<li><a href='#H3DU.BufferAccessor_setVec'>setVec</a><br>Sets the elements of a vertex attribute value.</ul><a name='H3DU.BufferAccessor_buffer'></a>
 <h3> H3DU.BufferAccessor#buffer
 
 </h3>A <i>buffer</i> of arbitrary size. This buffer
@@ -45,7 +46,12 @@ <h3> H3DU.BufferAccessor#get(index)</h3>Gets the first element of the attribute
 <h3> H3DU.BufferAccessor#getVec(index, vec)</h3>Gets the elements of a vertex attribute value.<p>
 Note that currently, this method does no bounds checking beyond the
 checking naturally done when accessing the attribute's buffer.<h4> Parameters</h4><ul><li><code>index</code> (Type: number)<br>A numeric index, starting from 0, that identifies a value stored in the attribute's buffer. For example, 0 identifies the first value, 1 identifies the second, and so on.<li><code>vec</code> (Type: Array.&lt;number>)<br>An array whose elements will be set to those of the value at the given index. The number of elements copied to this array is the attribute's count per value (see <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_countPerValue">H3DU.BufferAccessor#countPerValue</a>).</ul><h4> Return Value</h4>The parameter "vec". (Type: Array.&lt;number>)<a name='H3DU.BufferAccessor.makeBlank'></a>
-<h3> (static) H3DU.BufferAccessor.makeBlank(count, countPerValue)</h3>Generates a vertex attribute buffer, with each value set to all zeros.<h4> Parameters</h4><ul><li><code>count</code> (Type: number)<br>The number of <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_buffer">values</a> the buffer will hold. For example, (10, 20, 5) is a 3-element value.<li><code>countPerValue</code> (Type: number)<br>The number of elements each value will take in the buffer.</ul><h4> Return Value</h4>A blank vertex attribute buffer. (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<a name='H3DU.BufferAccessor_set'></a>
+<h3> (static) H3DU.BufferAccessor.makeBlank(count, countPerValue)</h3>Generates a vertex attribute buffer, with each value set to all zeros.<h4> Parameters</h4><ul><li><code>count</code> (Type: number)<br>The number of <a href="H3DU.BufferAccessor.html#H3DU.BufferAccessor_buffer">values</a> the buffer will hold. For example, (10, 20, 5) is a 3-element value.<li><code>countPerValue</code> (Type: number)<br>The number of elements each value will take in the buffer.</ul><h4> Return Value</h4>A blank vertex attribute buffer. (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<a name='H3DU.BufferAccessor.makeIndices'></a>
+<h3> (static) H3DU.BufferAccessor.makeIndices(numIndices)</h3>Generates an array of increasing vertex indices.<h4> Parameters</h4><ul><li><code>numIndices</code> (Type: number)<br>The number of vertex indices to generate. The array will range from 0 to the number of vertex indices minus 1.</ul><h4> Return Value</h4>An array of vertex indices. (Type: Uint16Array | Uint32Array)<a name='H3DU.BufferAccessor.merge'></a>
+<h3> (static) H3DU.BufferAccessor.merge(attr1, indices1, attr2, indices2)</h3>Merges two vertex attributes, whose vertices can be indexed differently, into one
+combined vertex attribute.<h4> Parameters</h4><ul><li><code>attr1</code> (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<br>A vertex buffer accessor for the first vertex attribute. Can be null, in which case it is assumed that the attribute contains as many values as the length of "indices1" and all the values are zeros.<li><code>indices1</code> (Type: Array.&lt;number> | Uint16Array | Uint8Array | Uint32Array)<br>An array of vertex indices associated with the first vertex attribute.<li><code>attr2</code> (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<br>A vertex buffer accessor for the second vertex attribute. Can be null, in which case it is assumed that the attribute contains as many values as the length of "indices2" and all the values are zeros.<li><code>indices2</code> (Type: Array.&lt;number> | Uint16Array | Uint8Array | Uint32Array)<br>An array of vertex indices associated with the second vertex attribute.</ul><h4> Return Value</h4>The merged attribute, where the vertices from the first vertex
+attribute come before those from the second. The merged attribute will have as many
+values as the sum of the lengths of "indices1" and "indices2". (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<a name='H3DU.BufferAccessor_set'></a>
 <h3> H3DU.BufferAccessor#set(index, value)</h3>Sets the first element of the attribute value with the given vertex index.<p>
 Note that currently, this method does no bounds checking beyond the
 checking naturally done when writing to the attribute's buffer.<h4> Parameters</h4><ul><li><code>index</code> (Type: number)<br>A numeric index, starting from 0, that identifies a value stored in the attribute's buffer. For example, 0 identifies the first value, 1 identifies the second, and so on.<li><code>value</code> (Type: number)<br>The number to set the first element to.</ul><h4> Return Value</h4>This object. (Type: <a href="H3DU.BufferAccessor.html">H3DU.BufferAccessor</a>)<a name='H3DU.BufferAccessor_setVec'></a>