fixed indentation, removed commented code

brownman · Aug 27, 2010 · a1c71e5 · a1c71e5
1 parent a3287f8
commit a1c71e5
Show file tree

Hide file tree

Showing 13 changed files with 270 additions and 266 deletions.
diff --git a/c3dl/actors/actor.js b/c3dl/actors/actor.js
@@ -107,7 +107,7 @@ c3dl.Actor.prototype.getTransform = function ()
   var mat = c3dl.makePoseMatrix(this.left, this.up, this.dir, this.pos);
   var smat = c3dl.makeMatrix();
   c3dl.setMatrix(smat, this.scaleVec[0], 0, 0, 0, 0, this.scaleVec[1], 0, 0, 0, 0, 
-    this.scaleVec[2], 0, 0, 0, 0, 1);
+  this.scaleVec[2], 0, 0, 0, 0, 1);
   mat = c3dl.multiplyMatrixByMatrix(mat, smat);
   return mat;
 }
@@ -169,7 +169,7 @@ c3dl.Actor.prototype.scale = function (scaleVec)
   if (scaleVec[0] > 0.0 && scaleVec[1] > 0.0 && scaleVec[2] > 0.0)
   {
     this.scaleVec[0] = this.scaleVec[0] * scaleVec[0]; 
-	this.scaleVec[1] = this.scaleVec[1] * scaleVec[1]; 
+  	this.scaleVec[1] = this.scaleVec[1] * scaleVec[1]; 
     this.scaleVec[2] = this.scaleVec[2] * scaleVec[2];
   }
 }

diff --git a/c3dl/c3dapi.js b/c3dl/c3dapi.js
@@ -86,7 +86,6 @@ c3dl_require('texture/textureutils.js');
 
 //collada management
 c3dl_require('collada/colladamanager.js');
-//c3dl_require('collada/instancegeometry.js');
 c3dl_require('collada/colladaloader.js');
 c3dl_require('collada/colladaqueue.js');
 c3dl_require('collada/geometry.js');

diff --git a/c3dl/c3dlnamespace.js b/c3dl/c3dlnamespace.js
@@ -43,8 +43,11 @@ var c3dl =
    */
   extend: function (baseObj, extObj)
   {
-    for (var i in extObj)
-    if (extObj[i] != null && extObj[i] != undefined) baseObj[i] = extObj[i];
+    for (var i in extObj){
+      if (extObj[i] != null && extObj[i] != undefined){
+        baseObj[i] = extObj[i];
+      }
+    }
     return baseObj;
   },
 
@@ -97,7 +100,9 @@ var c3dl =
     var tmpparent = o.__parent;
     // Temporarily change our parent to be our parent's parent to
     // avoid infinite recursion.
-    if (o.__parent.prototype.__parent) o.__parent = o.__parent.prototype.__parent;
+    if (o.__parent.prototype.__parent){
+      o.__parent = o.__parent.prototype.__parent;
+    }
     tmpparent.prototype.constructor.apply(o);
     delete o.__parent;
   },

diff --git a/c3dl/camera/camera.js b/c3dl/camera/camera.js
@@ -40,7 +40,7 @@ c3dl.Camera.prototype.applyToWorld = function (aspectRatio)
 
   // Create a projection matrix and store it inside a globally accessible place.
   this.projMatrix = c3dl.makePerspective(this.fieldOfView, aspectRatio, this.nearClippingPlane, 
-    this.farClippingPlane);
+  this.farClippingPlane);
   c3dl.matrixMode(c3dl.PROJECTION);
   c3dl.loadMatrix(this.projMatrix);
   c3dl.matrixMode(c3dl.MODELVIEW);

diff --git a/c3dl/camera/freecamera.js b/c3dl/camera/freecamera.js
@@ -194,7 +194,7 @@ c3dl.FreeCamera.prototype.toString = function (delimiter)
   // get the c3dl.Camera's toString()
   var cameraToStr = c3dl._super(this, arguments, "toString");
   var FreeCameraToStr = "c3dl.FreeCamera: " + delimiter + "angular velocity = " +
-    this.getAngularVel() + delimiter + "linear velocity = " + this.getLinearVel() + delimiter;
+  this.getAngularVel() + delimiter + "linear velocity = " + this.getLinearVel() + delimiter;
   return cameraToStr + FreeCameraToStr;
 }
 

diff --git a/c3dl/camera/orbitcamera.js b/c3dl/camera/orbitcamera.js
@@ -376,7 +376,7 @@ c3dl.OrbitCamera.prototype.setPosition = function (position)
     this.pos = c3dl.copyObj(position);
     var camPosToOrbitPoint = c3dl.subtractVectors(this.orbitPoint, this.pos);
 
-	// if the position was set such that the direction vector is parallel to the global
+    // if the position was set such that the direction vector is parallel to the global
     // up axis, the cross product won't work. In that case, leave the left vector as it was.
     if (c3dl.isVectorEqual([0, 0, 0], c3dl.vectorCrossProduct(camPosToOrbitPoint, [0, 1, 0])))
     {