rewrite setUniforms

Author: peteroupc

glutil-shaderprog.js

@@ -151,6 +151,81 @@ ShaderProgram.prototype.use=function(){
  this.savedUniforms={};
  return this;
 }
+/** @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;
+//      console.log("setting "+i+": "+v);
+      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){
+        this.uniformValues[i]=uv=v;
+        newUv=true;
+       } else if(uv!=v){
+        uv=v;
+        newUv=true;
+       }
+       if(newUv){
+        if(this.uniformTypes[i]==this.context.FLOAT){
+         this.context.uniform1f(uniform, uv);
+        } else {
+         this.context.uniform1i(uniform, uv);
+        }
+       }
+      }      
+      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]);
+       } 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.context.uniform3f(uniform, uv[0],uv[1],uv[2]);
+       }
+      } else if(v.length==2){
+       if(!uv){
+        this.uniformValues[i]=uv=v.slice(0,v.length)
+        this.context.uniform2f(uniform, uv[0],uv[1]);
+       } 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]);
+       }
+      } 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]);
+       } 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]);
+       }
+      } else if(v.length==16){
+       if(!uv){
+        this.uniformValues[i]=uv=v.slice(0,v.length)
+        this.context.uniformMatrix4fv(uniform,false,uv);
+       } else if(ShaderProgram._copyIfDifferent(v,uv,16)){
+        this.context.uniformMatrix4fv(uniform,false,uv);
+       }
+      } else if(v.length==9){
+       if(!uv){
+        this.uniformValues[i]=uv=v.slice(0,v.length)
+        this.context.uniformMatrix3fv(uniform,false,uv);
+       } else if(ShaderProgram._copyIfDifferent(v,uv,9)){
+        this.context.uniformMatrix3fv(uniform,false,uv);
+       }
+      }
+      return isCurrentProgram;
+}
 /**
 * Sets uniform variables for this program.  Uniform variables
 * are called uniform because they uniformly apply to all vertices
@@ -178,40 +253,30 @@ ShaderProgram.prototype.use=function(){
 */
 ShaderProgram.prototype.setUniforms=function(uniforms){
   var isCurrentProgram=null;
-  for(var i in uniforms){
-      v=uniforms[i];
-      var uniform=this.get(i);
-      if(uniform===null)continue;
-//      console.log("setting "+i+": "+v);
-      if(isCurrentProgram==null){
-       isCurrentProgram=this.context.getParameter(
-         this.context.CURRENT_PROGRAM)==this.program;
-      }
-      var val=(v instanceof Array) ? v.slice(0,v.length) : v;
-      this.uniformValues[i]=val;
-      if(!isCurrentProgram){
-       // Save this uniform to write later
-       this.savedUniforms[i]=val;
-      } else if(v.length==3){
-       this.context.uniform3f(uniform, v[0],v[1],v[2]);
-      } else if(v.length==2){
-       this.context.uniform2f(uniform, v[0],v[1]);
-      } else if(v.length==4){
-       this.context.uniform4f(uniform, v[0],v[1],v[2],v[3]);
-      } else if(v.length==16){
-       this.context.uniformMatrix4fv(uniform,false,v);
-      } else if(v.length==9){
-       this.context.uniformMatrix3fv(uniform,false,v);
-      } else {
-       if(this.uniformTypes[i]==this.context.FLOAT){
-        this.context.uniform1f(uniform, v);
-       } else {
-        this.context.uniform1i(uniform, v);
-       }
-      }
+  if(typeof Object.keys!=="undefined"){
+    var keys=Object.keys(uniforms);for(var ki=0;ki<keys.length;ki++){var i=keys[ki];
+     isCurrentProgram=this._setUniform(uniforms,i,isCurrentProgram);
+    }  
+  } else {
+    for(var i in uniforms){
+     isCurrentProgram=this._setUniform(uniforms,i,isCurrentProgram);
+    }
   }
   return this;
 }
+ShaderProgram._copyIfDifferent=function(src,dst,len){
+ for(var i=0;i<len;i++){
+  if(src[i]!=dst[i]){
+   // Arrays are different
+   dst[i]=src[i];
+   for(var j=i+1;j<len;j++){
+    dst[j]=src[j];
+   }
+   return true;
+  }
+ }
+ return false;
+}
 /** @private */
 ShaderProgram._compileShaders=function(context, vertexShader, fragmentShader){
   function compileShader(context, kind, text){

glutil.js

@@ -86,7 +86,7 @@ var GLUtil={
   if(!canvasElement)return null;
   if(!canvasElement.getContext)return null;
   var context=null;
-  var options={antialias:true};
+  var options={"antialias":true};
   try { context=canvasElement.getContext("webgl", options);
   } catch(e) { context=null; }
   if(!context){