Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/helper-classes/RDGE/rdge-compiled.js
	js/helper-classes/RDGE/runtime/GLRuntime.js
	js/helper-classes/RDGE/src/core/script/MeshManager.js
	js/helper-classes/RDGE/src/core/script/engine.js
	js/helper-classes/RDGE/src/core/script/fx/ssao.js
	js/helper-classes/RDGE/src/core/script/init_state.js
	js/helper-classes/RDGE/src/core/script/run_state.js
	js/helper-classes/RDGE/src/core/script/scenegraphNodes.js
	js/helper-classes/RDGE/src/core/script/utilities.js
	js/helper-classes/RDGE/src/tools/compile-rdge-core.bat
	js/helper-classes/RDGE/src/tools/compile-rdge-core.sh
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/lib/drawing/world.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/deform-material.js
	js/lib/rdge/materials/flat-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/linear-gradient-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-blur-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/relief-tunnel-material.js
	js/lib/rdge/materials/square-tunnel-material.js
	js/lib/rdge/materials/star-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/tunnel-material.js
	js/lib/rdge/materials/twist-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/uber-material.js
	js/lib/rdge/materials/water-material.js
	js/lib/rdge/materials/z-invert-material.js
	js/preloader/Preloader.js

36 files changed, 0 insertions, 11304 deletions

diff --git a/js/helper-classes/backup-delete/GLAnchorPoint.js b/js/helper-classes/backup-delete/GLAnchorPoint.js
deleted file mode 100755
index c3e95b34..00000000
--- a/js/helper-classes/backup-delete/GLAnchorPoint.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-/////////////////////////////////////////////
-// Class GLAnchorPoint
-//      GL representation of a point clicked 
-//          and dragged during pen tool
-//      
-//    
-/////////////////////////////////////////////
-function GLAnchorPoint() {
-    /////////////////////////////////////////
-    // Instance variables 
-    /////////////////////////////////////////
-    this._x = 0.0;
-    this._y = 0.0;
-    this._z = 0.0;
-
-    this._prevX = 0.0;
-    this._prevY = 0.0;
-    this._prevZ = 0.0;
-
-    this._nextX = 0.0;
-    this._nextY = 0.0;
-    this._nextZ = 0.0;
-}
-    // *********** setters ************
-GLAnchorPoint.prototype.setPos = function (x, y, z) { this._x = x; this._y = y; this._z = z; }
-GLAnchorPoint.prototype.setPrevPos = function (x, y, z) { this._prevX = x; this._prevY = y; this._prevZ = z; }
-GLAnchorPoint.prototype.setNextPos = function (x, y, z) { this._nextX = x; this._nextY = y; this._nextZ = z; }
-
-GLAnchorPoint.prototype.setPrevFromNext = function () {
-    //set the previous control point by reflecting the next control point
-    var dispX = this._nextX - this._x;
-    var dispY = this._nextY - this._y;
-    var dispZ = this._nextZ - this._z;
-
-    this._prevX = this._x - dispX;
-    this._prevY = this._y - dispY;
-    this._prevZ = this._z - dispZ;
-}
-GLAnchorPoint.prototype.setNextFromPrev = function () {
-    //set the previous control point by reflecting the next control point
-    var dispX = this._prevX - this._x;
-    var dispY = this._prevY - this._y;
-    var dispZ = this._prevZ - this._z;
-
-    this._nextX = this._x - dispX;
-    this._nextY = this._y - dispY;
-    this._nextZ = this._z - dispZ;
-}
-
-//translate the next point from the translation that was applied to the prev. point
-GLAnchorPoint.prototype.translateNextFromPrev = function (tx, ty, tz) {
-    //do nothing if the total translation is zero
-    var totalTransSq = (tx*tx) + (ty*ty) + (tz*tz);
-    if (totalTransSq < 0.0000001)
-        return;
-    
-    // *** compute the rotation of the prev vector ***
-    var oldP = Vector.create([this._prevX + tx - this._x, this._prevY + ty - this._y, this._prevZ + tz - this._z]);
-    var newP = Vector.create([this._prevX - this._x, this._prevY - this._y, this._prevZ - this._z]);
-    //compute angle between the two vectors
-    var axis = Vector.create([0, 0, 0]);
-    var angle = MathUtils.getAxisAngleBetween3DVectors(oldP, newP, axis);
-    if (angle === 0)
-        return;
-
-    // *** compute the vector from anchor to next
-    var oldN = Vector.create([this._nextX - this._x, this._nextY - this._y, this._nextZ - this._z]);
-    var rotMat = Matrix.Rotation(-angle, axis);
-    var newN = MathUtils.transformVector(oldN, rotMat);
-
-    //TEMP for some situations the axis angle computation returns NaNs
-    if (isNaN(newN[0]) || isNaN(newN[1]) || isNaN(newN[2])) {
-        console.log("NaN in translateNextFromPrev");
-        return;
-    }
-    //end TEMP
-    this._nextX = this._x + newN[0];
-    this._nextY = this._y + newN[1];
-    this._nextZ = this._z + newN[2];
-}
-//translate the next point from the translation that was applied to the prev. point
-GLAnchorPoint.prototype.translatePrevFromNext = function (tx, ty, tz) {
-    //do nothing if the total translation is zero
-    var totalTransSq = (tx*tx) + (ty*ty) + (tz*tz);
-    if (totalTransSq < 0.0000001)
-        return;
-        
-    // *** compute the rotation of the next vector ***
-    var oldN = Vector.create([this._nextX + tx - this._x, this._nextY + ty - this._y, this._nextZ + tz - this._z]);
-    var newN = Vector.create([this._nextX - this._x, this._nextY - this._y, this._nextZ - this._z]);
-    //compute angle between the two vectors
-    var axis = Vector.create([0, 0, 0]);
-    var angle = MathUtils.getAxisAngleBetween3DVectors(oldN, newN, axis);
-    if (angle === 0)
-        return;
-
-    // *** compute the vector from anchor to prev
-    var oldP = Vector.create([this._prevX - this._x, this._prevY - this._y, this._prevZ - this._z]);
-    var rotMat = Matrix.Rotation(-angle, axis);
-    var newP = MathUtils.transformVector(oldP, rotMat);
-
-    //TEMP for some situations the axis angle computation returns NaNs
-    if (isNaN(newP[0]) || isNaN(newP[1]) || isNaN(newP[2])) {
-        return;
-    }
-    //end TEMP
-    this._prevX = this._x + newP[0];
-    this._prevY = this._y + newP[1];
-    this._prevZ = this._z + newP[2];
-}
-
-
-// ******* modifiers *******
-GLAnchorPoint.prototype.translatePrev = function (x, y, z) {
-    this._prevX += x; this._prevY += y; this._prevZ += z;
-}
-GLAnchorPoint.prototype.translateNext = function (x, y, z) {
-    this._nextX += x; this._nextY += y; this._nextZ += z;
-}
-GLAnchorPoint.prototype.translate = function (x, y, z) {
-    this._x += x; this._y += y; this._z += z;
-}
-GLAnchorPoint.prototype.translateAll = function (x, y, z) {
-    this.translate(x, y, z);
-    this.translatePrev(x, y, z);
-    this.translateNext(x, y, z);
-}
-
-
-GLAnchorPoint.prototype.scaleAll = function(sx,sy,sz){
-    this._x *= sx;this._prevX *= sx;this._nextX *= sx;
-    this._y *= sy;this._prevY *= sy;this._nextY *= sy;
-    this._z *= sz;this._prevZ *= sz;this._nextZ *= sz;
-}
-
-
-// ********* getters **********
-GLAnchorPoint.prototype.getPosX = function () { return this._x; }
-GLAnchorPoint.prototype.getPosY = function () { return this._y; }