address TODO; move more BufferHelper methods; again fix initial occlusion map implementation; fix bug in GraphicsPath.getCurves; change default base color; etc.

Author: peteroupc

demos/implicit.html

@@ -74,7 +74,7 @@
     var mesh = new H3DU.Mesh();
     mesh.color3("blue");
     surf.evalSurface(mesh, 48, 48, 48, -5, 5, -5, 5, -5, 5);
-    return new H3DU.MeshBuffer(mesh);
+    return mesh.toMeshBuffer();
   }
 
   var shapeGroup = new H3DU.ShapeGroup();

demos/pathshapes.html

@@ -59,7 +59,7 @@
  .arcTo(0.5, 0.5, 0, 0.5, 0.5)
  .lineTo(-0.5, 0.5)
  .closePath().reverse();
-path = path.merge(path2); // TODO: Fix path tube
+path = path.merge(path2);
 
 function makeLinePath(path, z, flatness) {
   "use strict";
@@ -69,7 +69,7 @@
     var line = lines[i];
     mesh.vertex3(line[0], line[1], z).vertex3(line[2], line[3], z);
   }
-  return mesh;
+  return mesh.toMeshBuffer();
 }
 function extrudePath(path, zStart, zEnd, flatness) {
   "use strict";
@@ -90,7 +90,7 @@
    .vertex3(line[2], line[3], z2)
    .vertex3(line[0], line[1], z2);
   }
-  return new H3DU.MeshBuffer(mesh).recalcNormals();
+  return mesh.toMeshBuffer().recalcNormals(true);
 }
 function pathClosedFigure(path, zBottom, zTop, flatness) {
   "use strict";
@@ -104,13 +104,13 @@
   "use strict";
   switch(index) {
   case 0:
-    return pathFloor(path, 0, 0.01);
+     return pathFloor(path, 0, 0.01);
   case 1:
     return extrudePath(path, -0.2, 0.2, 0.01);
   case 2:
     return pathClosedFigure(path, -0.25, 0.25, 0.01);
   case 3:
-    return makeTubeFromPath(path, 0.01, 0.1);
+   return makeTubeFromPath(path, 0.01, 0.1);
   case 4: {
     var p = new H3DU.GraphicsPath().regularPolygon(0, 0, 8, 1);
     return pathClosedFigure(p, -0.25, 0.25, 0.01);

doc/H3DU.BufferHelper.md

@@ -9,26 +9,9 @@ A helper class for accessing and setting data in vertex attributes.
 
 ### Methods
 
-* [copy](#H3DU.BufferHelper_copy)<br>Copies the values of a vertex attribute into a new vertex attribute object.
 * [makeIndices](#H3DU.BufferHelper_makeIndices)<br>Generates an array of increasing vertex indices
 * [merge](#H3DU.BufferHelper_merge)<br>Merges two vertex attributes, whose vertices can be indexed differently, into one
 combined vertex attribute.
-* [resolveSemantic](#H3DU.BufferHelper_resolveSemantic)<br>Resolves an attribute semantic and semantic index, which
-may optionally be given as a string instead, into two numbers giving
-the semantic and index.
-
-<a name='H3DU.BufferHelper_copy'></a>
-### H3DU.BufferHelper#copy(attr)
-
-Copies the values of a vertex attribute into a new vertex attribute object.
-
-#### Parameters
-
-* `attr` (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)<br>A vertex buffer accessor.
-
-#### Return Value
-
-A copy of the vertex attribute object. (Type: <a href="H3DU.BufferAccessor.md">H3DU.BufferAccessor</a>)
 
 <a name='H3DU.BufferHelper_makeIndices'></a>
 ### H3DU.BufferHelper#makeIndices(numIndices)
@@ -62,23 +45,4 @@ 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.BufferHelper_resolveSemantic'></a>
-### H3DU.BufferHelper#resolveSemantic(name, [index])
-
-Resolves an attribute semantic and semantic index, which
-may optionally be given as a string instead, into two numbers giving
-the semantic and index.
-
-#### Parameters
-
-* `name` (Type: number | string)<br>An attribute semantic, such as <a href="H3DU.Semantic.md#H3DU.Semantic.POSITION">H3DU.Semantic.POSITION</a>, "POSITION", or "TEXCOORD_0". Throws an error if this value is a string and the string is invalid.
-* `index` (Type: number) (optional)<br>The set index of the attribute for the given semantic. 0 is the first index of the attribute, 1 is the second, and so on. This is ignored if "name" is a string. Otherwise, if this value is null, undefined, or omitted, the default is 0.
-
-#### Return Value
-
-A two-element array consisting
-of the semantic and semantic index, respectively, described in
-the "name" and "index" parameters. Returns null if "name" is a string,
-but doesn't describe a valid semantic. (Type: Array.&lt;number>)
-
 [Back to documentation index.](index.md)

doc/H3DU.Material.md

@@ -22,8 +22,8 @@ the <a href="H3DU.Math.md#H3DU.Math.colorTosRGB">sRGB color space</a>.
 
 ### Members
 
+* [albedo](#H3DU.Material_albedo)<br>Diffusion color of this material (also called "albedo").
 * [ambient](#H3DU.Material_ambient)<br>Ambient color of this material.
-* [diffuse](#H3DU.Material_diffuse)<br>Diffusion color of this material (also called "albedo").
 * [emission](#H3DU.Material_emission)<br>Additive color emitted by objects with this material.
 * [emissionMap](#H3DU.Material_emissionMap)<br>Emission map texture.
 * [normalMap](#H3DU.Material_normalMap)<br>Normal map (bump map) texture.
@@ -46,6 +46,20 @@ object from an RGBA color.
 object from a texture to apply to a 3D object's surface.
 * [setParams](#H3DU.Material_setParams)<br>Sets parameters for this material object.
 
+<a name='H3DU.Material_albedo'></a>
+### H3DU.Material#albedo
+
+Diffusion color of this material (also called "albedo").
+This is the generally perceived color of the material when
+specular highlights are absent on the material's surface.
+See also <a href="H3DU.PbrMaterial.md#H3DU.PbrMaterial_albedo">H3DU.PbrMaterial#albedo</a>; this property corresponds
+more closely to that in the metallic workflow rather than the specular
+workflow.
+
+Type: Array.&lt;number>
+
+Default Value: `"[1,1,1,1]"`
+
 <a name='H3DU.Material_ambient'></a>
 ### H3DU.Material#ambient
 
@@ -70,20 +84,6 @@ color.
 
 Default Value: `"[0.2,0.2,0.2]"`
 
-<a name='H3DU.Material_diffuse'></a>
-### H3DU.Material#diffuse
-
-Diffusion color of this material (also called "albedo").
-This is the generally perceived color of the material when
-specular highlights are absent on the material's surface.
-See also <a href="H3DU.PbrMaterial.md#H3DU.PbrMaterial_albedo">H3DU.PbrMaterial#albedo</a>; this property corresponds
-more closely to that in the metallic workflow rather than the specular
-workflow.
-
-Type: Array.&lt;number>
-
-Default Value: `"[0.8,0.8,0.8,1]"`
-
 <a name='H3DU.Material_emission'></a>
 ### H3DU.Material#emission
 
@@ -97,7 +97,7 @@ Default Value: `"[0,0,0]"`
 <a name='H3DU.Material_emissionMap'></a>
 ### H3DU.Material#emissionMap
 
-Emission map texture.
+Emission map texture. See <a href="H3DU.PbrMaterial.md#H3DU.PbrMaterial_emissionMap">H3DU.PbrMaterial#emissionMap</a>.
 
 Type: <a href="H3DU.Texture.md">H3DU.Texture</a> | <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> | <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a>
 
@@ -116,6 +116,7 @@ Default Value: `null`
 ### H3DU.Material#occlusionMap
 
 Ambient occlusion map texture.
+See <a href="H3DU.PbrMaterial.md#H3DU.PbrMaterial_occlusionMap">H3DU.PbrMaterial#occlusionMap</a>.
 
 Type: <a href="H3DU.Texture.md">H3DU.Texture</a> | <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> | <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a>
 
@@ -249,7 +250,7 @@ Sets parameters for this material object.
 
 #### Parameters
 
-* `params` (Type: Object)<br>An object whose keys have the possibilities given below, and whose values are those allowed for each key.<ul> <li><code>ambient</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the ambient color. (See <a href="H3DU.Material.md#H3DU.Material_ambient">H3DU.Material#ambient</a>.) The default is (0.2, 0.2, 0.2). <li><code>diffuse</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the diffusion color (also called "albedo"). (See <a href="H3DU.Material.md#H3DU.Material_diffuse">H3DU.Material#diffuse</a>.) The default is (0.8, 0.8, 0.8). <li><code>specular</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the specular reflection. (See <a href="H3DU.Material.md#H3DU.Material_specular">H3DU.Material#specular</a>.) The default is (0,0,0), meaning no specular highlights. <li><code>shininess</code> - Specular reflection exponent. (See <a href="H3DU.Material.md#H3DU.Material_shininess">H3DU.Material#shininess</a>). Ranges from 0 through 128. The default is 0. <li><code>emission</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the additive color. (See <a href="H3DU.Material.md#H3DU.Material_emission">H3DU.Material#emission</a>.) If this is an array, its numbers can range from -1 to 1. The default is (0,0,0). <li><code>texture</code> - <a href="H3DU.Texture.md">H3DU.Texture</a> object, <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> object, <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a> object, ora string with the URL of the texture to use. Can be null. <li><code>specularMap</code> - Specular map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_specularMap">H3DU.Material#specularMap</a>). Can be null. <li><code>normalMap</code> - Normal map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_normalMap">H3DU.Material#normalMap</a>). Can be null. <li><code>occlusionMap</code> - Ambient occlusion map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_occlusionMap">H3DU.Material#occlusionMap</a>). Can be null. <li><code>emissionMap</code> - Emission map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_emissionMap">H3DU.Material#emissionMap</a>). Can be null. <li><code>shader</code> - <a href="H3DU.ShaderInfo.md">H3DU.ShaderInfo</a> object for a WebGL shader program to use when rendering objects with this material. <i>Using <a href="H3DU.ShaderProgram.md">H3DU.ShaderProgram</a> objects in this parameter is deprecated.</i> </ul> Any or all of these keys can exist in the parameters object. If a value is null or undefined, it is ignored unless otherwise noted.
+* `params` (Type: Object)<br>An object whose keys have the possibilities given below, and whose values are those allowed for each key.<ul> <li><code>ambient</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the ambient color. (See <a href="H3DU.Material.md#H3DU.Material_ambient">H3DU.Material#ambient</a>.) The default is (0.2, 0.2, 0.2). <li><code>diffuse</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the diffusion color (also called "albedo"). (See H3DU.Material#diffuse.) The default is (0.8, 0.8, 0.8). <li><code>specular</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the specular reflection. (See <a href="H3DU.Material.md#H3DU.Material_specular">H3DU.Material#specular</a>.) The default is (0,0,0), meaning no specular highlights. <li><code>shininess</code> - Specular reflection exponent. (See <a href="H3DU.Material.md#H3DU.Material_shininess">H3DU.Material#shininess</a>). Ranges from 0 through 128. The default is 0. <li><code>emission</code> - A <a href="H3DU.md#H3DU.toGLColor">color vector or string</a> giving the additive color. (See <a href="H3DU.Material.md#H3DU.Material_emission">H3DU.Material#emission</a>.) If this is an array, its numbers can range from -1 to 1. The default is (0,0,0). <li><code>texture</code> - <a href="H3DU.Texture.md">H3DU.Texture</a> object, <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> object, <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a> object, ora string with the URL of the texture to use. Can be null. <li><code>specularMap</code> - Specular map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_specularMap">H3DU.Material#specularMap</a>). Can be null. <li><code>normalMap</code> - Normal map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_normalMap">H3DU.Material#normalMap</a>). Can be null. <li><code>occlusionMap</code> - Ambient occlusion map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_occlusionMap">H3DU.Material#occlusionMap</a>). Can be null. <li><code>emissionMap</code> - Emission map texture, taking the same types as the "texture" parameter (see <a href="H3DU.Material.md#H3DU.Material_emissionMap">H3DU.Material#emissionMap</a>). Can be null. <li><code>shader</code> - <a href="H3DU.ShaderInfo.md">H3DU.ShaderInfo</a> object for a WebGL shader program to use when rendering objects with this material. <i>Using <a href="H3DU.ShaderProgram.md">H3DU.ShaderProgram</a> objects in this parameter is deprecated.</i> </ul> Any or all of these keys can exist in the parameters object. If a value is null or undefined, it is ignored unless otherwise noted.
 
 #### Return Value
 

doc/H3DU.PbrMaterial.md

@@ -25,15 +25,17 @@ the <a href="H3DU.Math.md#H3DU.Math.colorTosRGB">sRGB color space</a>.
 * [albedoMap](#H3DU.PbrMaterial_albedoMap)<br>A texture indicating the albedo (or base color) of each part of the texture,
 in the red, green, blue, and alpha channels.
 * [emission](#H3DU.PbrMaterial_emission)<br>Additive color emitted by objects with this material.
-* [emissionMap](#H3DU.PbrMaterial_emissionMap)<br>Emission map texture.
+* [emissionMap](#H3DU.PbrMaterial_emissionMap)<br>A texture where each pixel identifies the emission of that
+part of the texture, as specified in the texture's red, green, and blue channel.
 * [invertRoughness](#H3DU.PbrMaterial_invertRoughness)<br>If true, the roughness property is treated as a "glossiness" property,
 or 1 minus roughness, and the roughness map is treated as a "glossiness"
 map, or an inverted roughness map.
 * [metalness](#H3DU.PbrMaterial_metalness)<br>A value indicating whether objects described by this material are metals.
 * [metalnessMap](#H3DU.PbrMaterial_metalnessMap)<br>A texture indicating the metalness of each part of the texture,
 as specified in the texture's blue channel.
 * [normalMap](#H3DU.PbrMaterial_normalMap)<br>Normal map (bump map) texture.
-* [occlusionMap](#H3DU.PbrMaterial_occlusionMap)<br>Ambient occlusion map texture.
+* [occlusionMap](#H3DU.PbrMaterial_occlusionMap)<br>A texture where each pixel identifies the ambient occlusion of that
+part of the texture, as specified in the texture's red channel.
 * [roughness](#H3DU.PbrMaterial_roughness)<br>Describes the roughness of the surface described
 by this material.
 * [roughnessMap](#H3DU.PbrMaterial_roughnessMap)<br>A texture indicating the roughness of each part of the texture,
@@ -98,7 +100,7 @@ colors are used rather than this property to set the color defined here.
 
 Type: Array.&lt;number>
 
-Default Value: `"[0.8,0.8,0.8,1]"`
+Default Value: `"[1,1,1,1]"`
 
 <a name='H3DU.PbrMaterial_albedoMap'></a>
 ### H3DU.PbrMaterial#albedoMap
@@ -130,7 +132,10 @@ Default Value: `"[0,0,0]"`
 <a name='H3DU.PbrMaterial_emissionMap'></a>
 ### H3DU.PbrMaterial#emissionMap
 
-Emission map texture.
+A texture where each pixel identifies the emission of that
+part of the texture, as specified in the texture's red, green, and blue channel.
+If a texture is given, the emission found with this texture is multiplied by
+the value of the <a href="H3DU.PbrMaterial.md#H3DU.PbrMaterial_emission">H3DU.PbrMaterial#emission</a> property.
 
 Type: <a href="H3DU.Texture.md">H3DU.Texture</a> | <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> | <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a>
 
@@ -216,7 +221,8 @@ Default Value: `null`
 <a name='H3DU.PbrMaterial_occlusionMap'></a>
 ### H3DU.PbrMaterial#occlusionMap
 
-Ambient occlusion map texture.
+A texture where each pixel identifies the ambient occlusion of that
+part of the texture, as specified in the texture's red channel.
 
 Type: <a href="H3DU.Texture.md">H3DU.Texture</a> | <a href="H3DU.TextureInfo.md">H3DU.TextureInfo</a> | <a href="H3DU.FrameBufferInfo.md">H3DU.FrameBufferInfo</a>