Fixes errors when loading animated meshes in simpleviewer....

samples/o3d-webgl/param_operation.js

 /*
  * Copyright 2010, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 129 matching lines @@
   for (var i = 0; i < 2; i++) {
     o3d.ParamObject.setUpO3DParam_(
         o3d.ParamOp2FloatsToFloat2, "input"+i, "ParamFloat");
   }
   o3d.ParamObject.setUpO3DParam_(
       o3d.ParamOp2FloatsToFloat2, "output", "ParamMatrix4Output");
 })();
 
 /**
  * Called by o3d.Param*Output whenever its value gets read.
- * @return {Array<number>} 2-element array equal to [input0,input1]
+ * @return {!Array<number>} 2-element array equal to [input0,input1]
  */
 o3d.ParamOp2FloatsToFloat2.prototype.updateOutputs = function() {
   this.last_output_value_[0] = this.getParam("input0").value;
   this.last_output_value_[1] = this.getParam("input1").value;
   return this.last_output_value_;
 };
 
 /**
  * A Param operation that takes 3 floats to produce a float3.
  * @constructor
  * @extends {o3d.ParamObject}
  */
 o3d.ParamOp3FloatsToFloat3 = function() {
   o3d.ParamObject.call(this);
   this.last_output_value_ = [0,0,0];
 };
 o3d.inherit('ParamOp3FloatsToFloat3', 'ParamObject');
 
 (function(){
   for (var i = 0; i < 3; i++) {
     o3d.ParamObject.setUpO3DParam_(
         o3d.ParamOp3FloatsToFloat3, "input"+i, "ParamFloat");
   }
   o3d.ParamObject.setUpO3DParam_(
       o3d.ParamOp3FloatsToFloat3, "output", "ParamMatrix4Output");
 })();
 
 /**
  * Called by o3d.Param*Output whenever its value gets read.
- * @return {Array<number>} 3-element array equal to [input0,input1,input2]
+ * @return {!Array<number>} 3-element array equal to [input0,input1,input2]
  */
 o3d.ParamOp3FloatsToFloat3.prototype.updateOutputs = function() {
   this.last_output_value_[0] = this.getParam("input0").value;
   this.last_output_value_[1] = this.getParam("input1").value;
   this.last_output_value_[2] = this.getParam("input2").value;
   return this.last_output_value_;
 };
 
 /**
  * A Param operation that takes 4 floats to produce a float4.
@@ skipping 10 matching lines @@
   for (var i = 0; i < 4; i++) {
     o3d.ParamObject.setUpO3DParam_(
         o3d.ParamOp4FloatsToFloat4, "input"+i, "ParamFloat");
   }
   o3d.ParamObject.setUpO3DParam_(
       o3d.ParamOp4FloatsToFloat4, "output", "ParamMatrix4Output");
 })();
 
 /**
  * Called by o3d.Param*Output whenever its value gets read.
- * @return {Array<number>} 4-element array equal to
+ * @return {!Array<number>} 4-element array equal to
  *     [input0,input1,input2,input3]
  */
 o3d.ParamOp4FloatsToFloat4.prototype.updateOutputs = function() {
   this.last_output_value_[0] = this.getParam("input0").value;
   this.last_output_value_[1] = this.getParam("input1").value;
   this.last_output_value_[2] = this.getParam("input2").value;
   this.last_output_value_[3] = this.getParam("input3").value;
   return this.last_output_value_;
 };
 
@@ skipping 12 matching lines @@
   for (var i = 0; i < 16; i++) {
     o3d.ParamObject.setUpO3DParam_(
         o3d.ParamOp16FloatsToMatrix4, "input"+i, "ParamFloat");
   }
   o3d.ParamObject.setUpO3DParam_(
       o3d.ParamOp16FloatsToMatrix4, "output", "ParamMatrix4Output");
 })();
 
 /**
  * Called by o3d.Param*Output whenever its value gets read.
- * @return {Array<Array<number>>} 4x4 array equal to
+ * @return {!Array<!Array<number>>} 4x4 array equal to
  *     [[i0,i1,i2,i3],[i4,i5,i6,i7],[i8,i9,i10,i11],[i12,i13,i14,i15]]
  */
 o3d.ParamOp16FloatsToMatrix4.prototype.updateOutputs = function() {
   for (var i = 0; i < 16; i++) {
-    this.last_output_value_[i/4][i%4] = this.getParam("input"+i).value;
+    this.last_output_value_[Math.floor(i/4)][i%4] =
+        this.getParam("input"+i).value;
   }
   return this.last_output_value_;
 };
 
 /**
  * A Param operation that takes 9 floats to produce a 4-by-4 matrix.
  * The 9 floats encode a translation vector, angles of rotation around
  * the x, y, and z axes, and three scaling factors. The resulting
  * transformation scales first, then then rotates around the z-axis,
  * then the y-axis, then the x-axis, then translates.
@@ skipping 14 matching lines @@
 
   this.translateX = 0;
   this.translateY = 0;
   this.translateZ = 0;
 
   this.scaleX = 1;
   this.scaleY = 1;
   this.scaleZ = 1;
 
   this.last_output_value_ = [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]];
-
-  this.createParam("output", "ParamMatrix4Output");
 };
 o3d.inherit('TRSToMatrix4', 'ParamObject');
 
 (function(){
   var proplist = ["rotateX", "rotateY", "rotateZ",
                   "translateX", "translateY", "translateZ",
                   "scaleX", "scaleY", "scaleZ"];
   for (var i = 0; i < proplist.length; i++) {
     o3d.ParamObject.setUpO3DParam_(o3d.TRSToMatrix4, proplist[i], "ParamFloat");
   }
   o3d.ParamObject.setUpO3DParam_(
       o3d.TRSToMatrix4, "output", "ParamMatrix4Output");
 })();
 
 /**
  * Called by o3d.Param*Output whenever its value gets read.
- * @return {matrix4} 4x4 array equal to Translate * Rotate * Scale.
+ * @return {!Array<!Array<number>>} Matrix4 equal to Translate * Rotate * Scale.
  */
 o3d.TRSToMatrix4.prototype.updateOutputs = function () {
   var ret = this.last_output_value_;
   var rX = this.rotateX;
   var rY = this.rotateY;
   var rZ = this.rotateZ;
   var sX = this.scaleX;
   var sY = this.scaleY;
   var sZ = this.scaleZ;
   var sinX = Math.sin(rX);
@@ skipping 16 matching lines @@
   ret[2].splice(0, 4, (cosZSinY * cosX + sinZ * sinX) * sZ,
                       (sinZSinY * cosX - cosZ * sinX) * sZ,
                       cosY * cosX * sZ,
                       0);
   ret[3].splice(0, 4, this.translateX,
                       this.translateY,
                       this.translateZ,
                       1);
   return ret;
 };
+
+/**
+ * A Param operation that takes 16 floats to produce a 4-by-4 matrix.
+ * @constructor
+ * @extends {o3d.ParamObject}
+ */
+o3d.Matrix4Composition = function() {
+  o3d.ParamObject.call(this);
+  this.last_output_value_ = [[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]];
+};
+o3d.inherit('Matrix4Composition', 'ParamObject');
+
+o3d.ParamObject.setUpO3DParam_(
+    o3d.Matrix4Composition, "inputMatrix", "ParamMatrix4");
+
+o3d.ParamObject.setUpO3DParam_(
+    o3d.Matrix4Composition, "localMatrix", "ParamMatrix4");
+
+o3d.ParamObject.setUpO3DParam_(
+    o3d.Matrix4Composition, "outputMatrix", "ParamMatrix4Output");
+
+/**
+ * Called by o3d.Param*Output whenever its value gets read.
+ * @return {!Array<!Array<number>>} 4x4 array equal to
+ *     [[i0,i1,i2,i3],[i4,i5,i6,i7],[i8,i9,i10,i11],[i12,i13,i14,i15]]
+ */
+o3d.Matrix4Composition.prototype.updateOutputs = function() {
+  o3d.Transform.compose(this.inputMatrix, this.localMatrix,
+                        this.last_output_value_);
+  return this.last_output_value_;
+};
+
+