add primitive counter; fix mat4orthoAspect bugs

Author: peteroupc

frame.js

@@ -33,17 +33,22 @@ FrameCounter.prototype.update=function(){
 FrameCounter.prototype.getFPS=function(){
  return this.fps;
 }
+
 function FrameCounterDiv(scene){
  var canvas=scene.getContext().canvas
+ this.div=FrameCounterDiv._makeDiv(canvas);
+ this.count=0;
+ this.scene=scene;
+ this.fc=new FrameCounter();
+}
+FrameCounterDiv._makeDiv=function(element){
  var div=document.createElement("div")
  div.style.backgroundColor="white"
  div.style.position="absolute"
- div.style.left=canvas.offsetLeft+"px"
- div.style.top=canvas.offsetTop+"px"
+ div.style.left=element.offsetLeft+"px"
+ div.style.top=element.offsetTop+"px"
  document.body.appendChild(div)
- this.div=div;
- this.count=0;
- this.fc=new FrameCounter();
+ return div
 }
 FrameCounterDiv.prototype.update=function(){
  this.fc.update();
@@ -58,3 +63,15 @@ FrameCounterDiv.prototype.update=function(){
   }
  }
 }
+
+function PrimitiveCounter(scene){
+ var canvas=scene.getContext().canvas
+ this.div=FrameCounterDiv._makeDiv(canvas);
+ this.count=0;
+ this.scene=scene;
+}
+PrimitiveCounter.prototype.update=function(){
+ var v=this.scene.vertexCount();
+ var p=this.scene.primitiveCount();
+ this.div.innerHTML=v+" vertices, "+p+" primitives"
+}

glmath.js

@@ -1280,14 +1280,14 @@ mat4ortho2dAspect:function(l,r,b,t,aspect){
 * @return {Array<number>} The resulting 4x4 matrix.
  */
 mat4orthoAspect:function(l,r,b,t,n,f,aspect){
- var xdist=Math.abs(right-left);
- var ydist=Math.abs(top-bottom);
+ var xdist=Math.abs(r-l);
+ var ydist=Math.abs(t-b);
  var boxAspect=xdist/ydist;
  aspect/=boxAspect;
  if(aspect<1){
-  return GLMath.mat4ortho(left,right,bottom/aspect,top/aspect,near,far);
+  return GLMath.mat4ortho(l,r,b/aspect,t/aspect,n,f);
  } else {
-  return GLMath.mat4ortho(left*aspect,right*aspect,bottom,top,near,far);
+  return GLMath.mat4ortho(l*aspect,r*aspect,b,t,n,f);
  }
 },
 /**

glutil-binders.js

@@ -163,24 +163,21 @@ TextureBinder.prototype.bind=function(program){
       // set magnification
       context.texParameteri(context.TEXTURE_2D,
        context.TEXTURE_MAG_FILTER, context.LINEAR);
+      var wrapMode=context.CLAMP_TO_EDGE;
       if(GLUtil._isPowerOfTwo(texture.width) &&
           GLUtil._isPowerOfTwo(texture.height)){
        // Enable mipmaps if texture's dimensions are powers of two
+       if(!texture.clamp)wrapMode=context.REPEAT;
        context.texParameteri(context.TEXTURE_2D,
          context.TEXTURE_MIN_FILTER, context.LINEAR_MIPMAP_LINEAR);
-       context.texParameteri(context.TEXTURE_2D,
-         context.TEXTURE_WRAP_S, context.REPEAT);
-       context.texParameteri(context.TEXTURE_2D,
-        context.TEXTURE_WRAP_T, context.REPEAT);
       } else {
        context.texParameteri(context.TEXTURE_2D,
         context.TEXTURE_MIN_FILTER, context.LINEAR);
-       // Other textures require this wrap mode
-       context.texParameteri(context.TEXTURE_2D,
-        context.TEXTURE_WRAP_S, context.CLAMP_TO_EDGE);
-       context.texParameteri(context.TEXTURE_2D,
-        context.TEXTURE_WRAP_T, context.CLAMP_TO_EDGE);
       }
+      context.texParameteri(context.TEXTURE_2D,
+        context.TEXTURE_WRAP_S, wrapMode);
+      context.texParameteri(context.TEXTURE_2D,
+        context.TEXTURE_WRAP_T, wrapMode);
     }
 }
 

glutil.js

@@ -826,9 +826,25 @@ var Texture=function(name){
  this.loadedTexture=null;
  this.name=name;
  this.width=0;
+ this.clamp=false;
  this.height=0;
 }
 
+/**
+* Sets the wrapping behavior of texture coordinates that 
+* fall out of range when using this texture.
+* @param {boolean} clamp If true, the image's texture
+* coordinates will be clamped to the range [0, 1].  If false,
+* the image's texture coordinates' fractional parts will
+* be used as the coordinates (causing wraparound).
+* The default is false.
+* @return {glutil.Texture} This object.
+*/
+Texture.prototype.setClamp=function(clamp){
+ this.clamp=clamp;
+ return this;
+}
+
 /**
 *  Loads a texture by its URL.
 * @param {string} name URL of the texture data.  Images with a TGA
@@ -861,6 +877,18 @@ Texture.loadTexture=function(name, textureCache){
   });
 }
 
+Texture.fromUint8Array=function(array, width, height){
+ if(width<0)throw new Error("width less than 0")
+ if(height<0)throw new Error("height less than 0")
+ if(array.length<width*height*4)throw new Error("array too short for texture")
+ var texImage=new Texture("")
+ texImage.image=array;
+ texImage.width=Math.ceil(width);
+ texImage.height=Math.ceil(height);
+ texImage.loadStatus=2;
+ return texImage;
+}
+
 /** @private */
 Texture.loadTga=function(name){
  var tex=this;