edit docs; rename variable in shader code

Author: peteroupc

README.md

@@ -91,7 +91,6 @@ Version 0.2:
 
 - First Code Project release
 
-
 Source Code
 ---------
 Source code is available in the [project page](https://github.com/peteroupc/html3dutil).

glmath.js

@@ -424,8 +424,7 @@ return r;
 },
 /**
  * Inverts the rotation given in this quaternion without normalizing it;
- * returns a new quaternion.  The conjugate represents the same
- * rotation as the original.
+ * returns a new quaternion.
  * @param {Array<number>} quat A quaternion, containing four elements.
  * @return {Array<number>}
  */
@@ -434,8 +433,7 @@ quatConjugate:function(quat){
 },
 /**
  * Inverts the rotation given in this quaternion, then normalizes the result;
- * returns a new quaternion. The inverse represents the same
- * rotation as the original.
+ * returns a new quaternion.
  * @param {Array<number>} quat A quaternion, containing four elements.
  * @return {Array<number>}
  */
@@ -605,15 +603,15 @@ quatFromTaitBryan:function(pitchDegrees,yawDegrees,rollDegrees, mode){
   if(mode==GLMath.PitchYawRoll || mode==GLMath.PitchRollYaw){
    var t7 = [rx*yx, ry * yx, rx * yy, ry * yy];
    if(mode==GLMath.PitchYawRoll)t7[0]=-t7[0];
-   t8 = [((t7[3] * px) + (t7[0] * py)), ((t7[1] * py) + (t7[2] * px)), ((t7[2] * py) - (t7[1] * px)), ((t7[3] * py) - (t7[0] * px))];
+   t8 = [t7[3] * px + t7[0] * py, t7[1] * py + t7[2] * px, t7[2] * py - t7[1] * px, t7[3] * py - t7[0] * px];
   } else if(mode==GLMath.YawPitchRoll || mode==GLMath.YawRollPitch){
    var t7 = [ry * px, rx * px, rx * py, ry * py];
    if(mode==GLMath.YawRollPitch)t7[1]=-t7[1];
-   t8 = [((t7[0] * yy) - (t7[2] * yx)), ((t7[3] * yx) + (t7[1] * yy)), ((t7[2] * yy) + (t7[0] * yx)), ((t7[3] * yy) - (t7[1] * yx))];
+   t8 = [t7[0] * yy - t7[2] * yx, t7[3] * yx + t7[1] * yy, t7[2] * yy + t7[0] * yx, t7[3] * yy - t7[1] * yx];
   } else {
    var t7 = [yy * px, yx * py, yx * px, yy * py];
    if(mode==GLMath.RollPitchYaw)t7[2]=-t7[2];
-   t8 = [((t7[0] * ry) + (t7[1] * rx)), ((t7[1] * ry) - (t7[0] * rx)), ((t7[3] * rx) + (t7[2] * ry)), ((t7[3] * ry) - (t7[2] * rx))];
+   t8 = [t7[0] * ry + t7[1] * rx, t7[1] * ry - t7[0] * rx, t7[3] * rx + t7[2] * ry, t7[3] * ry - t7[2] * rx];
   }
   return t8;
 },

glutil-shaderprog.js

@@ -579,7 +579,7 @@ var shader=ShaderProgram.fragmentShaderHeader() +
 "#define SET_LIGHTPOWER(i) "+
 " lightPower[i]=calcLightPower(lights[i],viewWorldPositionVar)\n" +
 "#define ADD_DIFFUSE(i) "+
-" phong+=vec3(lights[i].diffuse)*max(dot(transformedNormalVar," +
+" lightedColor+=vec3(lights[i].diffuse)*max(dot(transformedNormalVar," +
 "   lightPower[i].xyz),0.0)*lightPower[i].w*materialDiffuse;\n" +
 "vec4 lightPower["+Lights.MAX_LIGHTS+"];\n";
 for(var i=0;i<Lights.MAX_LIGHTS;i++){
@@ -588,7 +588,7 @@ for(var i=0;i<Lights.MAX_LIGHTS;i++){
 shader+=""+
 "if(baseColor.a==0.0)discard;\n" +
 "vec3 materialAmbient=mix(ma,baseColor.rgb,sign(useColorAttr+useTexture)); /* ambient*/\n" +
-"vec3 phong=sceneAmbient*materialAmbient; /* ambient*/\n" +
+"vec3 lightedColor=sceneAmbient*materialAmbient; /* ambient*/\n" +
 " // diffuse\n"+
 " vec3 materialDiffuse=vec3(md)*baseColor.rgb;\n";
 for(var i=0;i<Lights.MAX_LIGHTS;i++){
@@ -609,14 +609,14 @@ shader+="  spectmp = dot(transformedNormalVar, lightPower["+i+"].xyz) >= 0.0;\n"
 "    specular=max(specular,0.0);\n" +
 "    specular=pow(specular,mshin);\n"+
 "    specular=specular*lightPower["+i+"].w;\n" +
-"    phong+=ms*specular*lightSpecular;\n" +
+"    lightedColor+=ms*specular*lightSpecular;\n" +
 "  }\n";
 }
 shader+="}\n";
 shader+="#endif\n";
 shader+=" // emission\n"+
-" phong+=me;\n" +
-" baseColor=vec4(phong,baseColor.a);\n" +
+" lightedColor+=me;\n" +
+" baseColor=vec4(lightedColor,baseColor.a);\n" +
 "#endif\n" +
 " gl_FragColor=baseColor;\n" +
 "}";

glutil.js

@@ -653,12 +653,12 @@ function Material(ambient, diffuse, specular,shininess,emission) {
  this.shininess=(shininess==null) ? 0 : Math.min(Math.max(0,shininess),128);
  /** Ambient reflection of this material.<p>
  * Ambient reflection indicates how much an object reflects
- * ambient colors, those that color pixels the same way regardless
+ * ambient colors, those that color pixels the same way regardless 
  * of direction or distance.
  * Because every part of an object will be shaded the same way by ambient
  * light, an object with just ambient reflection will not look much like a 3D object.<p>
  * This value is a 3-element array giving the red, green, and blue
- * components of the ambient reflection; the final ambient color depends
+ * components of the ambient reflection; the final ambient color depends 
  * on the ambient color of the scene.
  * (0,0,0) means no ambient reflection,
  * and (1,1,1) means total ambient reflection.<p>
@@ -669,13 +669,13 @@ function Material(ambient, diffuse, specular,shininess,emission) {
  */
  this.ambient=ambient ? ambient.slice(0,3) : [0.2,0.2,0.2];
  /**
- * Diffuse reflection of this material. Diffuse reflection is the color that a material
- * reflects equally in all directions. Because different parts of an object are shaded
+ * Diffuse reflection of this material. Diffuse reflection is the color that a material 
+ * reflects equally in all directions. Because different parts of an object are shaded 
  * differently depending
  * on how directly they face diffuse lights, diffuse reflection can contribute
  * much of the 3D effect of that object.<p>
  * This value is a 4-element array giving the red, green, blue, and
- * alpha components of the diffuse reflection; the final diffuse color depends
+ * alpha components of the diffuse reflection; the final diffuse color depends 
  * on the reflected colors of lights that shine on the material.
  * (0,0,0,1) means no diffuse reflection,
  * and (1,1,1,1) means total diffuse reflection.<p>
@@ -694,7 +694,7 @@ function Material(ambient, diffuse, specular,shininess,emission) {
  * specular light doesn't scatter very much to other parts of an object.
  * Specular reflection can make an object shiny.
  * This value is a 3-element array giving the red, green, and blue
- * components of the ambient reflection; the final specular color depends
+ * components of the ambient reflection; the final specular color depends 
  * on the specular color of lights that shine on the material.
  * (0,0,0) means no specular reflection,
  * and (1,1,1) means total specular reflection.<p>
@@ -708,7 +708,7 @@ function Material(ambient, diffuse, specular,shininess,emission) {
 * default shader if [Scene3D.disableLighting()]{@link glutil.Scene3D#disableLighting}
 * is called, disabling lighting calculations).<p>
 * This value is a 3-element array giving the red, green, and blue
-* components.
+* components. 
 * For each of the three color components, positive values add to that component,
 * while negative values subtract from it. (0,0,0) means no additive color.
  */
@@ -881,7 +881,7 @@ Texture.prototype.loadImage=function(){
  });
 }
 /**
- * Disposes the texture image in this object.
+ * Disposes the texture data in this object.
  */
 Texture.prototype.dispose=function(){
  if(this.loadedTexture==null){
@@ -1642,8 +1642,8 @@ Scene3D.prototype.setViewMatrix=function(matrix){
 * the point in world space that the camera is looking at. May be null or omitted,
 * in which case the default is the coordinates (0,0,0).
 * @param {Array<number>} [up] A 3-element vector specifying
-* the direction from the center of the camera to its top. This parameter may
-* be null or omitted, in which case the default is the vector (0, 1, 0),
+* the direction from the center of the camera to its top. This parameter may 
+* be null or omitted, in which case the default is the vector (0, 1, 0), 
 * the vector that results when the camera is held upright.  This
 * vector must not point in the same or opposite direction as
 * the camera's view direction. (For best results, rotate the vector (0, 1, 0)