Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

8 files changed, 126 insertions, 162 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/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;
-var HitRecord = require("js/helper-classes/3D/hit-record").HitRecord;
-var Snap2DRecord = require("js/helper-classes/3D/snap-2d-record").Snap2DRecord;
-var NJUtils = require("js/lib/NJUtils").NJUtils;
+    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,
+    Snap2DRecord = require("js/helper-classes/3D/snap-2d-record").Snap2DRecord,
+    NJUtils = require("js/lib/NJUtils").NJUtils;
 
 var SnapManager = exports.SnapManager = Montage.create(Component, {
         ///////////////////////////////////////////////////////////////////////
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index fc2e6460..e6bcba89 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -33,14 +33,6 @@ function GLCircle()
 
                 this._ovalHeight = this._ovalHeight = 2.0*this.radius;
 
-                // stroke and fill colors
-                this._strokeColor = [0.4, 0.4, 0.4, 1.0];
-                this._fillColor = [0.0, 0.6,  0.0,  1.0];
-
-                // stroke and fill materials
-                this._fillMaterial;
-                this._strokeMaterial;
-
                 this._strokeStyle = "Solid";
 
                 this._aspectRatio = 1.0;
@@ -189,19 +181,19 @@ function GLCircle()
                 var reverseRotMat = Matrix.RotationZ( -angle );
 
                 // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse
-                strokeScaleMat = Matrix.I(4);
+                var strokeScaleMat = Matrix.I(4);
                 strokeScaleMat[0] = xRad;
                 strokeScaleMat[5] = yRad;
 
-                fillScaleMat = Matrix.I(4);
+                var fillScaleMat = Matrix.I(4);
                 fillScaleMat[0] = xRad - xStroke;
                 fillScaleMat[5] = yRad - yStroke;
 
-                innerRadiusScaleMat = Matrix.I(4);
+                var innerRadiusScaleMat = Matrix.I(4);
                 innerRadiusScaleMat[0] = xInnRad;
                 innerRadiusScaleMat[5] = yInnRad;
 
-                innerStrokeScaleMat = Matrix.I(4);
+                var innerStrokeScaleMat = Matrix.I(4);
                 innerStrokeScaleMat[0] = xInnRad - xStroke;
                 innerStrokeScaleMat[5] = yInnRad - yStroke;
 
@@ -233,69 +225,24 @@ function GLCircle()
 
                 if (fillPrim)
                 {
-                        this._primArray.push(   fillPrim  );
-
-                        if (this.getFillMaterial())
-                                fillMaterial = this.getFillMaterial().dup();
-                        else
-                                fillMaterial = new FlatMaterial();
+            fillMaterial = this.makeFillMaterial();
 
-                        if (fillMaterial)
-                        {
-                                fillMaterial.init( this.getWorld() );
-                if(!this.getFillMaterial() && this._fillColor)
-                {
-                    fillMaterial.setProperty("color", this._fillColor);
-                }
-                                this._materialArray.push( fillMaterial );
-                                this._materialTypeArray.push( "fill" );
-                                var matNode = fillMaterial.getMaterialNode();
-                                this._materialNodeArray.push( matNode );
-                        }
+            this._primArray.push( fillPrim );
+            this._materialNodeArray.push( fillMaterial.getMaterialNode() );
                 }
                 if (strokePrim0)