Merge branch 'master' into pentool

5 files changed, 82 insertions, 36 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index fd96af4d..c07391db 100644
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -71,6 +71,9 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
         _selectionCtr : {value: null, writable: true },
 
+    // Properties that require element planes to be updated
+        _updatePlaneProps : {value: ["matrix", "left", "top", "width", "height"], writable: false },
+
         ///////////////////////////////////////////////////////////////////////
         // Property accessors
         ///////////////////////////////////////////////////////////////////////
@@ -107,6 +110,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("deleteSelection", this, false);
             this.eventManager.addEventListener("elementChange", this, false);
                 }
         },
@@ -124,11 +128,44 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
         }
     },
 
+    handleDeleteSelection: {
+        value: function(event) {
+            this.drawWorkingPlane();
+        }
+    },
+
+    _shouldUpdatePlanes: {
+        value: function(props) {
+            if(!props)
+            {
+                return false;
+            }
+            else if (typeof props === "string")
+            {
+                return (this._updatePlaneProps.indexOf(props) !== -1);
+            }
+
+            for (var p in props)
+            {
+                if(this._updatePlaneProps.indexOf(p) !== -1)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    },
 
+    // TODO - Check why handleElementChange is being fired before handleAddElement
     handleElementChange: {
         value: function(event) {
+            if(!event.detail || !event.detail.data)
+            {
+                return;
+            }
             var els = event.detail.data.els;
-            if(els)
+            if(els && this._shouldUpdatePlanes(event.detail.data.prop))
             {
                 var len = els.length,
                     i = 0,
@@ -138,10 +175,15 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 for(i=0; i < len; i++) {
                     item = els[i];
                     el = item._element || item;
-                    el.elementModel.props3D.elementPlane.init();
+                    if(el.elementModel.props3D.elementPlane)
+                    {
+                        el.elementModel.props3D.elementPlane.init();
+                    }
                 }
 
+                this.application.ninja.stage.layout.draw();
                 this.drawWorkingPlane();
+                this.draw3DCompass();
             }
         }
     },
@@ -1065,7 +1107,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         var tmpCanvas = this.application.ninja.stage.canvas;
                         var tmpStage = this.application.ninja.currentDocument.documentRoot;
                         this.viewUtils.pushViewportObj( tmpCanvas );
-                        var tmpStage = this.application.ninja.currentDocument.documentRoot;
 
                         // save the source space object and set to the target object
                         var saveSource = this._sourceSpaceElt;
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 49c77c41..71ed62a0 100644
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -891,36 +891,32 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
+/**
+* decompose matrix in javascript found at https://github.com/joelambert/morf/blob/master/js/src/WebkitCSSMatrix.ext.js
+* used with permission from Joe Lambert: "as long as the original licence text and attribution is left in then you're
+* good to use it as you see fit."
+*
+* WebKitCSSMatrix Extensions
+*
+* Copyright 2011, Joe Lambert (http://www.joelambert.co.uk)
+* Free to use under the MIT license.
+* http://joelambert.mit-license.org/
+*/
+
+/**
+* Decomposes the matrix into its component parts.
+* A Javascript implementation of the pseudo code available from http://www.w3.org/TR/css3-2d-transforms/#matrix-decomposition
+* @author Joe Lambert
+* @returns {Object} An object with each of the components of the matrix (perspective, translate, skew, scale, rotate) or identity matrix on failure
+*/
+
 //      Input: matrix       ; a 4x4 matrix
 //      Output: translation ; a 3 component vector
 //              rotation    ; Euler angles, represented as a 3 component vector
 //              scale       ; a 3 component vector
 //              skew        ; skew factors XY,XZ,YZ represented as a 3 component vector
 //              perspective ; a 4 component vector
-//      Returns false if the matrix cannot be decomposed, an object with the above output values if it can
-//
-//        Supporting functions (point is a 3 component vector, matrix is a 4x4 matrix):
-//          float  determinant(matrix)          returns the 4x4 determinant of the matrix
-//          matrix inverse(matrix)              returns the inverse of the passed matrix
-//          matrix transpose(matrix)            returns the transpose of the passed matrix
-//          point  multVecMatrix(point, matrix) multiplies the passed point by the passed matrix
-//                                              and returns the transformed point
-//          float  length(point)                returns the length of the passed vector
-//          point  normalize(point)             normalizes the length of the passed point to 1
-//          float  dot(point, point)            returns the dot product of the passed points
-//          float  cos(float)                   returns the cosine of the passed angle in radians
-//          float  asin(float)                  returns the arcsine in radians of the passed value
-//          float  atan2(float y, float x)      returns the principal value of the arc tangent of
-//                                              y/x, using the signs of both arguments to determine
-//                                              the quadrant of the return value
-//
-//        Decomposition also makes use of the following function:
-//          point combine(point a, point b, float ascl, float bscl)
-//              result[0] = (ascl * a[0]) + (bscl * b[0])
-//              result[1] = (ascl * a[1]) + (bscl * b[1])
-//              result[2] = (ascl * a[2]) + (bscl * b[2])
-//              return result
-//
+//      Returns false if the matrix cannot be decomposed. An object with the above output values if it can.
     decomposeMatrix2: {
         value: function(m)
         {
@@ -1077,7 +1073,6 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
                 rotate[2] = 0;
             }
 
-//        return true;
             return {translation: translate,
                 rotation: rotate,
                 scale: scale,
@@ -1087,6 +1082,15 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
         }
     },
 
+/**
+* Helper function required for matrix decomposition
+* A Javascript implementation of pseudo code available from http://www.w3.org/TR/css3-2d-transforms/#matrix-decomposition
+* @param {Vector4} aPoint A 3D point
+* @param {float} ascl
+* @param {float} bscl
+* @author Joe Lambert
+* @returns {Vector4}
+*/
     combine: {
         value: function(a, b, ascl, bscl)
         {
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 8819f637..3af7d8cf 100644
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -9,14 +9,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 //      Class to do hit testing of objects in the html page
 ///////////////////////////////////////////////////////////////////////
 var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-var viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils;
-var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
-var drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils;
+    Component = require("montage/ui/component").Component,
+    viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils,
+    vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils,
+    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
+    HitRecord = require("js/helper-classes/3D/hit-record").HitRecord,