add new ShapeGroup methods, fix bugs, expand squares.html demo

Author: peteroupc

glutil-shaderprog.js

@@ -153,7 +153,7 @@ ShaderProgram.prototype.use=function(){
 }
 /** @private */
 ShaderProgram.prototype._log=function(i,v){
-// console.log("setting "+i+": "+v);
+ //console.log("setting "+i+": "+v);
 }
 /** @private */
 ShaderProgram.prototype._setUniform=function(uniforms,i,isCurrentProgram){
@@ -178,6 +178,7 @@ ShaderProgram.prototype._setUniform=function(uniforms,i,isCurrentProgram){
         newUv=true;
        } else if(uv!=v){
         uv=v;
+        this.uniformValues[i]=v;
         newUv=true;
        }
        if(newUv){

glutil.js

@@ -641,6 +641,7 @@ Lights.prototype.setPointLight=function(index,position){
 * May be null or omitted; default is (0,0,0).
 */
 function Material(ambient, diffuse, specular,shininess,emission) {
+ //console.log([ambient,diffuse,specular,shininess,emission]+"")
  if(ambient!=null)ambient=GLUtil["toGLColor"](ambient)
  if(diffuse!=null)diffuse=GLUtil["toGLColor"](diffuse)
  if(specular!=null)specular=GLUtil["toGLColor"](specular)
@@ -1795,12 +1796,12 @@ Scene3D.prototype.render=function(){
   if(typeof this.fboFilter!="undefined" && this.fboFilter){
    // Render to the framebuffer, then to the main buffer via
    // a filter
-   this.fbo.bind(this.program);
-   this._renderInner();
-   this.fbo.unbind();
    var oldProgram=this.program;
    var oldProj=this._projectionMatrix.slice(0,16);
    var oldView=this._viewMatrix.slice(0,16);
+   this.fbo.bind(this.program);
+   this._renderInner();
+   this.fbo.unbind();
    this.useProgram(this.fboFilter);
    this.context.clear(
     this.context.COLOR_BUFFER_BIT|this.context.DEPTH_BUFFER_BIT);
@@ -1906,13 +1907,17 @@ function ShapeGroup(){
  * @param {*} shape
  */
 ShapeGroup.prototype.addShape=function(shape){
- this.shapes.add(shape);
+ shape.parent=this;
+ this.shapes.push(shape);
 }
 /**
  * Not documented yet.
  */
 ShapeGroup.prototype.getTransform=function(){
- return this.getTransform();
+ return this.transform;
+}
+ShapeGroup.prototype.getMatrix=function(){
+ return this.getTransform().getMatrix();
 }
 /**
  * Not documented yet.
@@ -1922,6 +1927,18 @@ ShapeGroup.prototype.setTransform=function(transform){
  this.transform=transform.copy();
  return this;
 }
+ShapeGroup.prototype.setPosition=function(x,y,z){
+ this.transform.setPosition(x,y,z)
+ return this;
+}
+ShapeGroup.prototype.setQuaternion=function(quat){
+ this.transform.setQuaternion(quat);
+ return this;
+}
+ShapeGroup.prototype.setScale=function(x,y,z){
+ this.transform.setScale(x,y,z);
+ return this;
+}
 /**
 * An object that associates a geometric mesh (the shape of the object) with
 *  material data (which defines what is seen on the object's surface)
@@ -2060,7 +2077,12 @@ Shape.prototype.setQuaternion=function(quat){
  * @return {Array<number>} The current transformation matrix.
  */
 Shape.prototype.getMatrix=function(){
-  return this.getTransform().getMatrix();
+  var mat=this.getTransform().getMatrix();
+  if(this.parent!=null){
+   var pmat=this.parent.getMatrix();
+   mat=GLMath.mat4multiply(pmat,mat);
+  }
+  return mat;
 }
 /////////////
 // Deprecated methods