optimize setUniforms; add Transform methods; expand color3 method; etc.

Author: peteroupc

glmath.js

@@ -894,7 +894,6 @@ mat4transposeInPlace:function(mat){
 * can't be inverted, returns the identity 3x3 matrix.
 */
 mat4inverseTranspose3:function(m4){
- // Operation equivalent to transpose(invert(mat3(m4)))
 var m=[m4[0],m4[1],m4[2],m4[4],m4[5],m4[6],
    m4[8],m4[9],m4[10]];
 var det=m[0] * m[4] * m[8] +

glutil-mesh.js

@@ -314,14 +314,14 @@ Mesh.prototype.normal3=function(x,y,z){
   * defined (with vertex3()) will have this color. The new current
   * color will apply to future vertices even if the current mode
   * is TRIANGLE_FAN and some vertices were already given for
-  * that mode.
-  * @param {number} r Red component of the color (0-1).
-  * Can also be a string
+  * that mode.  Only the red, green, and blue components will be used.
+  * @param {Array<number>|number|string} r Array of three or
+  * four color components; or the red color component (0-1); or a string
   * specifying an [HTML or CSS color]{@link glutil.GLUtil.toGLColor}.
-  * @param {number} g Green component of the color (0-1).
-  * May be null or omitted if a string is given as the "r" parameter.
-  * @param {number} b Blue component of the color (0-1).
-  * May be null or omitted if a string is given as the "r" parameter.
+  * @param {number} g Green color component (0-1).
+  * May be null or omitted if a string or array is given as the "r" parameter.
+  * @param {number} b Blue color component (0-1).
+  * May be null or omitted if a string or array is given as the "r" parameter.
   * @return {glutil.Mesh} This object.
   */
  Mesh.prototype.color3=function(x,y,z){
@@ -330,10 +330,15 @@ Mesh.prototype.normal3=function(x,y,z){
    this.color[0]=c[0];
    this.color[1]=c[1];
    this.color[2]=c[2];
-  } else {
+  } else if(typeof x=="number" && typeof y=="number" &&
+   typeof z=="number"){
    this.color[0]=x;
    this.color[1]=y;
    this.color[2]=z;
+  } else {
+   this.color[0]=x[0];
+   this.color[1]=x[1];
+   this.color[2]=x[2];  
   }
   this._elementsDefined|=Mesh.COLORS_BIT;
   return this;

glutil-shaderprog.js

@@ -156,21 +156,26 @@ ShaderProgram.prototype._log=function(i,v){
  //console.log("setting "+i+": "+v);
 }
 /** @private */
+ShaderProgram.prototype._saveIfNotCurrent=function(v,i,isCurrentProgram){
+     this._log(i,v);
+     if(isCurrentProgram==null){
+       isCurrentProgram=this.context.getParameter(
+         this.context.CURRENT_PROGRAM)==this.program;
+      }
+      if(!isCurrentProgram){
+       // Save this uniform to write later
+       this.savedUniforms[i]=(typeof v=="number") ? v : v.slice(0,v.length);
+       this.uniformValues[i]=null;
+      } 
+      return isCurrentProgram;
+}
+/** @private */
 ShaderProgram.prototype._setUniform=function(uniforms,i,isCurrentProgram){
   var isCurrentProgram=null;
       var v=uniforms[i];
       var uniform=this.get(i);
       if(uniform===null)return isCurrentProgram;
-      if(isCurrentProgram==null){
-       isCurrentProgram=this.context.getParameter(
-         this.context.CURRENT_PROGRAM)==this.program;
-      }
       var uv=this.uniformValues[i];
-      if(!isCurrentProgram){
-       // Save this uniform to write later
-       this.savedUniforms[i]=(v instanceof Array) ? v.slice(0,v.length) : v;
-       return isCurrentProgram;
-      }
       if(typeof v=="number"){
        var newUv=false;
        if(uv==null){
@@ -182,62 +187,74 @@ ShaderProgram.prototype._setUniform=function(uniforms,i,isCurrentProgram){
         newUv=true;
        }
        if(newUv){
-        if(this.uniformTypes[i]==this.context.FLOAT){
+         if(this.uniformTypes[i]==this.context.FLOAT){
+          if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+           return isCurrentProgram;
          this.context.uniform1f(uniform, uv);
-        this._log(i,v);
         } else {
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
          this.context.uniform1i(uniform, uv);
-        this._log(i,v);
         }
        }
       }
       else if(v.length==3){
        if(!uv){
         this.uniformValues[i]=uv=v.slice(0,v.length)
-        this.context.uniform3f(uniform, uv[0],uv[1],uv[2]);
-        this._log(i,v);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform3fv(uniform, uv);
        } else if(uv[0]!=v[0] || uv[1]!=v[1] || uv[2]!=v[2]){
         uv[0]=v[0]; uv[1]=v[1]; uv[2]=v[2];
-        this._log(i,v);
-        this.context.uniform3f(uniform, uv[0],uv[1],uv[2]);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform3fv(uniform, uv);
        }
       } else if(v.length==2){
        if(!uv){
         this.uniformValues[i]=uv=v.slice(0,v.length)
-        this.context.uniform2f(uniform, uv[0],uv[1]);
-        this._log(i,v);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform2fv(uniform, uv);
        } else if(uv[0]!=v[0] || uv[1]!=v[1]){
         uv[0]=v[0]; uv[1]=v[1];
-        this.context.uniform2f(uniform, uv[0],uv[1]);
-        this._log(i,v);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform2fv(uniform, uv);
        }
       } else if(v.length==4){
        if(!uv){
         this.uniformValues[i]=uv=v.slice(0,v.length)
-        this.context.uniform4f(uniform, uv[0],uv[1],uv[2],uv[3]);
-        this._log(i,v);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform4fv(uniform, uv);
        } else if(uv[0]!=v[0] || uv[1]!=v[1] || uv[2]!=v[2] || uv[3]!=v[3]){
         uv[0]=v[0]; uv[1]=v[1]; uv[2]=v[2]; uv[3]=v[3];
-        this.context.uniform4f(uniform, uv[0],uv[1],uv[2],uv[3]);
-        this._log(i,v);
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
+        this.context.uniform4fv(uniform, uv);
        }
       } else if(v.length==16){
        if(!uv){
         this.uniformValues[i]=uv=v.slice(0,v.length)
+        if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
         this.context.uniformMatrix4fv(uniform,false,uv);
-        this._log(i,v);
        } else if(ShaderProgram._copyIfDifferent(v,uv,16)){
+          if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
         this.context.uniformMatrix4fv(uniform,false,uv);
-        this._log(i,v);
        }
       } else if(v.length==9){
        if(!uv){
         this.uniformValues[i]=uv=v.slice(0,v.length)
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
         this.context.uniformMatrix3fv(uniform,false,uv);
-        this._log(i,v);
        } else if(ShaderProgram._copyIfDifferent(v,uv,9)){
+         if(!(isCurrentProgram=this._saveIfNotCurrent(uv,i,isCurrentProgram)))
+          return isCurrentProgram;
         this.context.uniformMatrix3fv(uniform,false,uv);
-        this._log(i,v);
        }
       }
       return isCurrentProgram;

glutil-transform.js

@@ -105,8 +105,8 @@ Transform.prototype.resetTransform=function(){
 Transform.prototype.setScale=function(x,y,z){
   if(this.complexMatrix)return this;
   if(x!=null && y==null && z==null){
-   if(x.constructor==Array)
-    this.scale=x.slice(0,3);
+   if(typeof x!="number")
+    this.scale=[x[0],x[1],x[2]];
    else
     this.scale=[x,x,x];
   } else {
@@ -134,8 +134,8 @@ Transform.prototype.setScale=function(x,y,z){
 Transform.prototype.setPosition=function(x,y,z){
   if(this.complexMatrix)return this;
   if(x!=null && y==null && z==null){
-   if(x.constructor==Array)
-    this.position=x.slice(0,3);
+   if(typeof x!="number")
+    this.position=[x[0],x[1],x[2]];
    else
     this.position=[x,x,x];
   } else {
@@ -148,6 +148,43 @@ Transform.prototype.setPosition=function(x,y,z){
   this._matrixDirty=true;
   return this;
 }
+
+/**
+ * Moves the relative position of an object from its original
+ * position.  Has no effect if a matrix was defined with {@link glutil.Transform#setMatrix}
+ * and the transform wasn't reset yet with {@link glutil.Transform#resetTransform}.
+ * @param {Array<number>|number} x Number to add to the X-coordinate,
+ * or an array of 3 numbers giving the numbers to add to the x, y, and z coordinates.
+ * @param {number} y Number to add to the Y-coordinate.
+ * If "x" is an array, this parameter may be omitted.
+ * @param {number} z Number to add to the Z-coordinate.
+ * If "x" is an array, this parameter may be omitted.
+ * @return {glutil.Transform} This object.
+ */
+Transform.prototype.movePosition=function(x,y,z){
+  if(this.complexMatrix)return this;
+  if(x!=null && y==null && z==null){
+   if(typeof x!="number"){
+    this.position[0]+=x[0];
+    this.position[1]+=x[1];
+    this.position[2]+=x[2];
+   } else {
+    this.position[0]+=x;
+    this.position[1]+=x;
+    this.position[2]+=x;   
+   }
+  } else {
+    this.position[0]+=x;
+    this.position[1]+=y;
+    this.position[2]+=z;   
+  }
+  this._isIdentity=(this._isIdentity &&
+   this.position[0]==0 &&
+   this.position[1]==0 &&
+   this.position[2]==0);
+  this._matrixDirty=true;
+  return this;
+}
 /**
  * Sets this object's orientation in the form of a [quaternion]{@tutorial glmath} (a 4-element array
  * for describing 3D rotations). Has no effect if a matrix was defined with {@link glutil.Transform#setMatrix}

glutil.js

@@ -689,13 +689,12 @@ function Material(ambient, diffuse, specular,shininess,emission) {
  */
  this.diffuse=diffuse ? diffuse.slice(0,diffuse.length) : [0.8,0.8,0.8,1.0];
  /** Specular highlight reflection of this material.
- * Similar to diffuse reflection, specular reflection
- * is affected by how directly each part of an object faces
- * a light that gives off specular highlights, but unlike diffuse light,
- * specular light doesn't scatter very much to other parts of an object.
- * Specular reflection can make an object shiny.
+ * Specular reflection is a reflection in the same angle as
+ * the light reaches the material, similar to a mirror.  As a result, depending
+ * on the viewing angle, specular reflection can give off
+ * shiny highlights on the material.<p>
  * 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 specular 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>
@@ -1029,6 +1028,9 @@ BufferedSubMesh.prototype.draw=function(program){
    _vertexAttrib(context,
     attr, 3,
     context.FLOAT, stride*4, offset*4);
+  } else {
+   attr=program.get("normal");
+   if(attr!==null)context.disableVertexAttribArray(attr);
   }
   offset=Mesh.colorOffset(format);
   if(offset>=0){
@@ -1040,6 +1042,8 @@ BufferedSubMesh.prototype.draw=function(program){
     context.FLOAT, stride*4, offset*4);
   } else {
    program.setUniforms({"useColorAttr":0.0});
+   attr=program.get("uv");
+   if(attr!==null)context.disableVertexAttribArray(attr);
   }
   offset=Mesh.texCoordOffset(format);
   if(offset>=0){
@@ -1048,6 +1052,9 @@ BufferedSubMesh.prototype.draw=function(program){
    _vertexAttrib(context,
      attr, 2,
     context.FLOAT, stride*4, offset*4);
+  } else {
+   attr=program.get("uv");
+   if(attr!==null)context.disableVertexAttribArray(attr);
   }
   // Drawing phase
   var context=program.getContext();
@@ -1067,7 +1074,7 @@ BufferedSubMesh.prototype.draw=function(program){
   // drawElements calls (in case a future vertex buffer object
   // that doesn't use the attribute needs to be drawn)
   for(var i=0;i<boundAttributes.length;i++){
-   context.disableVertexAttribArray(boundAttributes[i]);
+   //context.disableVertexAttribArray(boundAttributes[i]);
   }
 }
 /**