Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

1 files changed, 173 insertions, 172 deletions

diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 46462c20..a82e29ca 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 
 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.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -41,90 +42,90 @@ var snapManagerModule = require("js/helper-classes/3D/snap-manager");
 var HitRecord = exports.HitRecord = Object.create(Object.prototype,
 {
 
-        ///////////////////////////////////////////////////////////////////////
-        // Constant definitions
-        ///////////////////////////////////////////////////////////////////////
-        SNAP_TYPE_STAGE : { value: 1, writable: true },
-        SNAP_TYPE_GRID_VERTEX : { value: 2, writable: true },
-        SNAP_TYPE_GRID_HORIZONTAL : { value: 13, writable: true },
-        SNAP_TYPE_GRID_VERTICAL: { value: 14, writable: true },
-        SNAP_TYPE_ALIGN_MERGED: { value: 15, writable: true },
-        SNAP_TYPE_HORIZONTAL_FROM_START: { value: 3, writable: true },
-        SNAP_TYPE_VERTICAL_FROM_START: { value: 4, writable: true },
-        SNAP_TYPE_ELEMENT: { value: 5, writable: true },
-        SNAP_TYPE_ELEMENT_EDGE: { value: 6, writable: true },
-        SNAP_TYPE_ELEMENT_VERTEX: { value: 7, writable: true },
-        SNAP_TYPE_ALIGN_HORIZONTAL: { value: 8, writable: true },
-        SNAP_TYPE_ALIGN_VERTICAL: { value: 9, writable: true },
-        SNAP_TYPE_ALIGN_BOTH: { value: 10, writable: true },
-        SNAP_TYPE_ELEMENT_CENTER: { value: 11, writable: true },
-        SNAP_TYPE_CONTAINED_ELEMENT: { value: 12, writable: true },
-        SNAP_TYPE_UNDEFINED: { value: null, writable: -1 },
-        
-        ///////////////////////////////////////////////////////////////////////
-        // Instance variables
-        ///////////////////////////////////////////////////////////////////////
-        _type: { value: this.SNAP_TYPE_UNDEFINED, writable: true },
-        _elt: { value: null, writable: true },                          // this can be null.  example: snapping to the working plane
-        _screenPt: { value: null, writable: true },             // snap point in global screen space
-        _localPoint: { value: null, writable: true },           // snap point in the local space of the element
-        _plane: { value: null, writable: true },                // plane equation at the snap point in local object space
-        _planeMat: { value: Matrix.I(4) , writable: true },             // transform to take the point from plane space to the transformed view space of the element
-        _assocScrPt: { value: null, writable: true },           // associated screen point
-        _assocScrPt2: { value: null, writable: true },          // a second associated point for drawing multiple snap align hits
-        _planarHit: { value: false, writable: true },
-        _snapBoundaryIndex : { value: -1, writable: true },             // this used for snap align to object boundaries
-        _isQuadPt :{ value: false, writable: true },    // used for snapping to an object's quadrant point
-
-        ///////////////////////////////////////////////////////////////////////
-        // Property accessors
-        ///////////////////////////////////////////////////////////////////////
-        getElt : { value: function()                    {  return this._elt;                                    }},
-        setElt : { value: function(e)                   {  this._elt = e;                                               }},
-        getElement : { value: function()                        {  return this._elt;                                    }},
-        setElement : { value: function(e)                       {  this._elt = e;                                               }},
-
-        getZIndex : { value: function()                 {  return this._zIndex; }},
-        setZIndex : { value: function(i)                        {  this._zIndex = i;                                    }},
-
-        setScreenPoint : { value: function(s)                   {  this._screenPt = s.slice(0);                 }},
-        getScreenPoint : { value: function()                    {  return this._screenPt.slice(0);              }},
-
-        setLocalPoint : { value: function(s)                    {  this._localPt = s.slice(0);                  }},
-        getLocalPoint : { value:  function()                    {  return this._localPt.slice(0);               }},
-
-        setAssociatedScreenPoint : { value: function(s)                 {  this._assocScrPt = s.slice(0);               }},
-        getAssociatedScreenPoint : { value: function()                  {  return this._assocScrPt.slice(0);    }},
-        hasAssociatedScreenPoint : { value: function()                  {  return this._assocScrPt != null;             }},
-
-        setAssociatedScreenPoint2 : { value: function(s)                        {  this._assocScrPt2 = s.slice(0);              }},
-        getAssociatedScreenPoint2 : { value: function()                 {  return this._assocScrPt2.slice(0);   }},
-        hasAssociatedScreenPoint2 : { value: function()                 {  return this._assocScrPt2 != null;    }},
-
-        setPlane : { value: function(p)                 {  this._plane = p.slice(0);                    }},
-        getPlane : { value: function()                  {  return this._plane.slice(0);                 }},
-
-        setPlaneMatrix : { value: function(pm)                  {  this._planeMat = pm.slice(0);                }},
-        getPlaneMatrix : { value: function()                    {  return this._planeMat.slice(0);              }},
-
-        setPlanarHit : { value:  function(p)                    {  this._planarHit = p;                                 }},
-        isPlanarHit : { value: function()                       {  return this._planarHit;                              }},
-
-        getSnapBoundaryIndex : { value: function()                      {  return this._snapBoundaryIndex;              }},
-        setSnapBoundaryIndex : { value: function(i)                     {  this._snapBoundaryIndex = i;                 }},
-
-        getType : { value: function()                   {  return this._type;                                   }},
-        setType : { value: function(t)                  {this._type = t;  if (!this.checkType())  { throw new Error("invalid snap type");  return;  }   }},
-
-        getUseQuadPoint : { value: function()                   {  return this._isQuadPt;                               }},
-        setUseQuadPoint : { value: function(q)                  {this._isQuadPt = q;                                    }},
-
-        ///////////////////////////////////////////////////////////////////////
-        // Methods
-        ///////////////////////////////////////////////////////////////////////
-
-        checkType :{
-        value: function()       {
+    ///////////////////////////////////////////////////////////////////////
+    // Constant definitions
+    ///////////////////////////////////////////////////////////////////////
+    SNAP_TYPE_STAGE : { value: 1, writable: true },
+    SNAP_TYPE_GRID_VERTEX : { value: 2, writable: true },
+    SNAP_TYPE_GRID_HORIZONTAL : { value: 13, writable: true },
+    SNAP_TYPE_GRID_VERTICAL: { value: 14, writable: true },
+    SNAP_TYPE_ALIGN_MERGED: { value: 15, writable: true },
+    SNAP_TYPE_HORIZONTAL_FROM_START: { value: 3, writable: true },
+    SNAP_TYPE_VERTICAL_FROM_START: { value: 4, writable: true },
+    SNAP_TYPE_ELEMENT: { value: 5, writable: true },
+    SNAP_TYPE_ELEMENT_EDGE: { value: 6, writable: true },
+    SNAP_TYPE_ELEMENT_VERTEX: { value: 7, writable: true },
+    SNAP_TYPE_ALIGN_HORIZONTAL: { value: 8, writable: true },
+    SNAP_TYPE_ALIGN_VERTICAL: { value: 9, writable: true },
+    SNAP_TYPE_ALIGN_BOTH: { value: 10, writable: true },
+    SNAP_TYPE_ELEMENT_CENTER: { value: 11, writable: true },
+    SNAP_TYPE_CONTAINED_ELEMENT: { value: 12, writable: true },
+    SNAP_TYPE_UNDEFINED: { value: null, writable: -1 },
+
+    ///////////////////////////////////////////////////////////////////////
+    // Instance variables
+    ///////////////////////////////////////////////////////////////////////
+    _type: { value: this.SNAP_TYPE_UNDEFINED, writable: true },
+    _elt: { value: null, writable: true },              // this can be null.  example: snapping to the working plane
+    _screenPt: { value: null, writable: true },     // snap point in global screen space
+    _localPoint: { value: null, writable: true },       // snap point in the local space of the element
+    _plane: { value: null, writable: true },        // plane equation at the snap point in local object space
+    _planeMat: { value: Matrix.I(4) , writable: true },         // transform to take the point from plane space to the transformed view space of the element
+    _assocScrPt: { value: null, writable: true },       // associated screen point
+    _assocScrPt2: { value: null, writable: true },      // a second associated point for drawing multiple snap align hits
+    _planarHit: { value: false, writable: true },
+    _snapBoundaryIndex : { value: -1, writable: true },     // this used for snap align to object boundaries
+    _isQuadPt :{ value: false, writable: true },    // used for snapping to an object's quadrant point
+
+    ///////////////////////////////////////////////////////////////////////
+    // Property accessors
+    ///////////////////////////////////////////////////////////////////////
+    getElt : { value: function()            {  return this._elt;                    }},
+    setElt : { value: function(e)           {  this._elt = e;                       }},
+    getElement : { value: function()            {  return this._elt;                    }},
+    setElement : { value: function(e)           {  this._elt = e;                       }},
+
+    getZIndex : { value: function()         {  return this._zIndex; }},
+    setZIndex : { value: function(i)            {  this._zIndex = i;                    }},
+
+    setScreenPoint : { value: function(s)           {  this._screenPt = s.slice(0);         }},
+    getScreenPoint : { value: function()            {  return this._screenPt.slice(0);      }},
+
+    setLocalPoint : { value: function(s)            {  this._localPt = s.slice(0);          }},
+    getLocalPoint : { value:  function()            {  return this._localPt.slice(0);       }},
+
+    setAssociatedScreenPoint : { value: function(s)         {  this._assocScrPt = s.slice(0);       }},
+    getAssociatedScreenPoint : { value: function()          {  return this._assocScrPt.slice(0);    }},
+    hasAssociatedScreenPoint : { value: function()          {  return this._assocScrPt != null;     }},
+
+    setAssociatedScreenPoint2 : { value: function(s)            {  this._assocScrPt2 = s.slice(0);      }},
+    getAssociatedScreenPoint2 : { value: function()         {  return this._assocScrPt2.slice(0);   }},
+    hasAssociatedScreenPoint2 : { value: function()         {  return this._assocScrPt2 != null;    }},
+
+    setPlane : { value: function(p)         {  this._plane = p.slice(0);            }},
+    getPlane : { value: function()          {  return this._plane.slice(0);         }},
+
+    setPlaneMatrix : { value: function(pm)          {  this._planeMat = pm.slice(0);        }},
+    getPlaneMatrix : { value: function()            {  return this._planeMat.slice(0);      }},
+
+    setPlanarHit : { value:  function(p)            {  this._planarHit = p;                 }},
+    isPlanarHit : { value: function()           {  return this._planarHit;              }},
+
+    getSnapBoundaryIndex : { value: function()          {  return this._snapBoundaryIndex;      }},
+    setSnapBoundaryIndex : { value: function(i)         {  this._snapBoundaryIndex = i;         }},
+
+    getType : { value: function()           {  return this._type;                   }},
+    setType : { value: function(t)          {this._type = t;  if (!this.checkType())  { throw new Error("invalid snap type");  return;  }   }},
+
+    getUseQuadPoint : { value: function()           {  return this._isQuadPt;               }},
+    setUseQuadPoint : { value: function(q)          {this._isQuadPt = q;                    }},
+
+    ///////////////////////////////////////////////////////////////////////
+    // Methods
+    ///////////////////////////////////////////////////////////////////////
+
+    checkType :{
+        value: function()   {
             var ok = false;
             switch (this._type)
             {
@@ -161,7 +162,7 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
         }
     },
 
-        isSomeGridTypeSnap : {
+    isSomeGridTypeSnap : {