Merge branch 'refs/heads/Ninja-Internal' into Color

11 files changed, 131 insertions, 491 deletions

diff --git a/js/helper-classes/3D/ParseUtils.js b/js/helper-classes/3D/ParseUtils.js
deleted file mode 100755
index 556253e9..00000000
--- a/js/helper-classes/3D/ParseUtils.js
+++ /dev/null
@@ -1,84 +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 Utils
-//      Vector Utility functions
-///////////////////////////////////////////////////////////////////////
-function ParseUtils( theStr )
-{
-    ///////////////////////////////////////////////////////////////////////
-    // Instance variables
-    ///////////////////////////////////////////////////////////////////////
-        this._strBuffer = theStr;
-
-    ///////////////////////////////////////////////////////////////////////
-    // Property accessors
-    ///////////////////////////////////////////////////////////////////////
-        this.getBuffer = function()             {  return this._strBuffer;              }
-        this.setBuffer = function(b)    {  this._strBuffer = b;                 }
-
-    ///////////////////////////////////////////////////////////////////////
-    // Methods
-    ///////////////////////////////////////////////////////////////////////
-        this.nextValue = function( prop, endKeyArg, advanceBufferArg )
-        {
-                if (!this._strBuffer)  return;
-
-                // make the 2 & 3rd argument optional.  default is to advance the string
-                var endKey = "\n",  advanceBuffer = true;
-                if (endKeyArg)
-                        endKey = endKeyArg;
-                if (advanceBufferArg)
-                        advanceBuffer = advanceBufferArg;
-
-                var iStart = this._strBuffer.indexOf( prop );
-                if (iStart < 0)  return;
-
-                var iEnd = this._strBuffer.indexOf( endKey, iStart );
-                if (iEnd < 0)  throw new Error( "property " + prop + " improperly terminated: " + this._strBuffer);
-
-                iStart += prop.length;
-                var nChars = iEnd - iStart;
-                var rtnStr = this._strBuffer.substr( iStart, nChars );
-
-                if (advanceBuffer)
-                        this._strBuffer = this._strBuffer.substr( iEnd + endKey.length  );
-
-                return rtnStr;
-        }
-
-        this.nextToken = function()
-        {
-                if (!this._strBuffer)  return;
-
-                // find the limits
-                var index = this._strBuffer.search( /\S/ );             // first non-whitespace character
-                if (index > 0) this._strBuffer = this._strBuffer.slice(index);
-                index   = this._strBuffer.search( /\s/ );               // first whitespace character marking the end of the token
-
-                var token;
-                if (index > 0)
-                {
-                        token = this._strBuffer.slice(0, index);
-                        this._strBuffer = this._strBuffer.slice( index  );
-                }
-
-                return token;
-        }
-
-        this.advancePastToken = function( token )
-        {
-                var index = this._strBuffer.indexOf( token );
-                if (index < 0)
-                        console.log( "could not find token: " + token + " in string: " + this._strBuffer );
-                else
-                        this._strBuffer = this._strBuffer.substr( index + token.length );
-        }
-
-}
-
-
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js
index e797eedf..b8906f18 100755
--- a/js/helper-classes/3D/Rectangle.js
+++ b/js/helper-classes/3D/Rectangle.js
@@ -35,7 +35,7 @@ var Rectangle = exports.Rectangle = Object.create(Object.prototype, {
     getTop: { value: function()        {  return this.m_top;                       } },
     setTop: { value: function(t)       {  this.m_top = t;                          } },
 
-    getCenter: { value: function()        {  return Vector.create( [this.m_left + 0.5*this.m_width,  this.m_top + 0.5*this.m_height] );       } },
+    getCenter: { value: function()        {  return [this.m_left + 0.5*this.m_width,  this.m_top + 0.5*this.m_height];       } },
 
     getWidth: { value: function()        {  return this.m_width;                     } },
     setWidth: { value: function(w)       {  this.m_width = w;                        } },
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js
index e0e7a8e3..b86673d1 100755
--- a/js/helper-classes/3D/StageLine.js
+++ b/js/helper-classes/3D/StageLine.js
@@ -149,8 +149,8 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
                 var vec = vecUtils.vecSubtract(3, bPt1, bPt0);
                 if (plane.isBackFacing())
                     MathUtils.negate( vec );
-                planeEq = Vector.create( [-vec[1], vec[0], 0] );
-                var normal = Vector.create( [planeEq[0], planeEq[1], planeEq[2]] );
+                planeEq = [-vec[1], vec[0], 0];
+                var normal = [planeEq[0], planeEq[1], planeEq[2]];
 //                      var d = -planeEq.dot(bPt0);
                 var d = -vecUtils.vecDot(3, planeEq, bPt0);
                 planeEq[3] = d;
@@ -414,8 +414,8 @@ var StageLine = exports.StageLine = Object.create(Object.prototype, {
             if (pt0[1] < pt1[1])  {  yMin = pt0[1];  yMax = pt1[1];  }  else  {  yMin = pt1[1];  yMax = pt0[1];  }
             if (pt0[2] < pt1[2])  {  zMin = pt0[2];  zMax = pt1[2];  }  else  {  zMin = pt1[2];  zMax = pt0[2];  }
 
-            this._minPt = Vector.create( [xMin, yMin, zMin] );
-            this._maxPt = Vector.create( [xMax, yMax, zMax] );
+            this._minPt = [xMin, yMin, zMin];
+            this._maxPt = [xMax, yMax, zMax];
         }
     }//,
 
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 85870097..63e7799a 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -112,6 +112,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this.eventManager.addEventListener("elementDeleted", this, false);
             this.eventManager.addEventListener("deleteSelection", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
+            this.eventManager.addEventListener("closeDocument", this, false);
                 }
         },
 
@@ -123,7 +124,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
             this._planesArray = [];
             this.setDrawingSurfaceElement(this.application.ninja.stage.canvas);
             this.setSourceSpaceElement( this.application.ninja.stage.stageDeps.currentStage );
-            this.setWorkingPlane( Vector.create( [0,0,1,0] ) );
+            this.setWorkingPlane( [0,0,1,0] );
 
             //Loop through all the top-level children of the current document and call drawUtils.addElement on them
             if(this.application.ninja.currentDocument._liveNodeList.length > 0){
@@ -135,6 +136,15 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
+    handleCloseDocument:{
+        value: function() {
+            if(this.application.ninja.documentController._documents.length === 0){
+                this._eltArray = [];
+                this._planesArray = [];
+            }
+        }
+    },
+
     handleElementAdded: {
         value: function(event) {
             this.addElement(event.detail);
diff --git a/js/helper-classes/3D/element-planes.js b/js/helper-classes/3D/element-planes.js
index 7ccf311e..38a7bf47 100755
--- a/js/helper-classes/3D/element-planes.js
+++ b/js/helper-classes/3D/element-planes.js
@@ -88,7 +88,7 @@ var ElementPlanes = exports.ElementPlanes = Object.create(Object.prototype, {
                 // create the plane equation
                 //var d = -( nrm.dot( this._boundaryPts[0]) );
                 var d = -vecUtils.vecDot(3, nrm, this._boundaryPts[0]);
-                var planeEq = Vector.create( [nrm[0], nrm[1], nrm[2], d] );
+                var planeEq = [nrm[0], nrm[1], nrm[2], d] ;
                 this.setPlaneEq( planeEq );
 
                 // get the 2D rectangle
diff --git a/js/helper-classes/3D/glUtils.js b/js/helper-classes/3D/glUtils.js
deleted file mode 100755
index f6d075f8..00000000
--- a/js/helper-classes/3D/glUtils.js
+++ /dev/null
@@ -1,319 +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> */
-
-// Constructor function
-function Vector() {}
-Vector.create = function(elements)
-{
-        var rtn;
-  if (elements)
-        rtn = elements.slice( 0 );
-  else
-        rtn = [];
-
-  return rtn;