Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

1 files changed, 66 insertions, 52 deletions

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 6a84c86b..bd47ffc3 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -247,18 +247,18 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
     // TODO - Check why handleElementChange is being fired before handleAddElement
     handleElementChange: {
         value: function(event) {
-            this._elementChangeHelper(event);
+            this._elementChangeHelper(event, false);
         }
     },
 
     handleElementChanging: {
         value: function(event) {
-            this._elementChangeHelper(event);
+            this._elementChangeHelper(event, true);
         }
     },
 
     _elementChangeHelper: {
-        value: function(event) {
+        value: function(event, isChanging) {
             if(!event.detail || !event.detail.data) {
                 return;
             }
@@ -273,35 +273,45 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     l,
                     t,
                     plane,
-                    changed = false;
+                    changed = false,
+                    adjustStagePadding = !isChanging || (event.detail.data.prop !== "matrix");
                 for(var i=0; i < len; i++) {
                     plane = els[i].elementModel.props3D.elementPlane;
                     if(plane) {
                         plane.init();
-                        l = plane._rect.m_left - docLeft;
-                        t = plane._rect.m_top - docTop;
-                        if(l < minLeft) {
-                            minLeft = l;
-                        }
-                        if(t < minTop) {
-                            minTop = t;
+                        if(adjustStagePadding) {
+                            l = plane._rect.m_left - docLeft;
+                            t = plane._rect.m_top - docTop;
+                            if(l < minLeft) {
+                                minLeft = l;
+                            }
+                            if(t < minTop) {
+                                minTop = t;
+                            }
                         }
                     }
                 }
 
-                if(minLeft !== stage.userPaddingLeft) {
-                    stage.userPaddingLeft = minLeft;
-                    changed = true;
-                }
-                if(minTop !== stage.userPaddingTop) {
-                    stage.userPaddingTop = minTop;
-                    changed = true;
+                if(adjustStagePadding) {
+                    if(minLeft !== stage.userPaddingLeft) {
+                        stage.userPaddingLeft = minLeft;
+                        changed = true;
+                    }
+                    if(minTop !== stage.userPaddingTop) {
+                        stage.userPaddingTop = minTop;
+                        changed = true;
+                    }
                 }
 
                 if(!changed) {
                     this.drawWorkingPlane();
                     this.draw3DCompass();
                 }
+
+                // TODO - Remove this once all stage drawing is consolidated into a single draw cycle
+                if(!isChanging && this.application.ninja.toolsData.selectedToolInstance.captureSelectionDrawn) {
+                    this.application.ninja.toolsData.selectedToolInstance.captureSelectionDrawn(null);
+                }
             }
         }
     },
@@ -620,6 +630,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 value: function ()
                 {
             this.application.ninja.stage.clearGridCanvas();
+            this.drawStageOutline();
                         if (!this.isDrawingGrid()) return;
 
                         var saveContext = this.getDrawingSurfaceElement();
@@ -691,21 +702,6 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         this._lineColor = saveColor;
                         this._drawingContext.lineWidth = saveLineWidth;
 
-            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
-                // draw an outline around the body
-                var stagePt = MathUtils.getPointOnPlane([0,0,1,0]);
-                var stageMat = this.getPlaneToWorldMatrix([0,0,1], stagePt);
-    //            glmat4.multiply( tMat, stageMat, stageMat);
-                pt0 = [0, 0, 0];
-                pt1 = [0, height, 0];
-                delta = [width, 0, 0];
-                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
-                pt0 = [0, 0, 0];
-                pt1 = [width, 0, 0];
-                delta = [0, height, 0];
-                this.drawGridLines(pt0, pt1, delta, stageMat, 2);
-            }
-
                         // draw the lines
                         this.redrawGridLines();
 
@@ -728,15 +724,11 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 var sourceSpaceMat = this.viewUtils.getLocalToGlobalMatrix( this._sourceSpaceElt );
                                 for (var i = 0; i < nLines; i++) {
                                         // transform the points from working plane space to world space
-                                        //var t0 = mat.multiply(p0),
-                                        //      t1 = mat.multiply(p1);
                                         var t0 = glmat4.multiplyVec3( mat, p0, [] ),
                                                 t1 = glmat4.multiplyVec3( mat, p1, [] );
 
                                         // transform from world space to global screen space
                                         if (this._sourceSpaceElt) {
-//                                              t0 = this.viewUtils.localToGlobal(t0, this._sourceSpaceElt);
-//                                              t1 = this.viewUtils.localToGlobal(t1, this._sourceSpaceElt);
                                                 t0 = this.viewUtils.localToGlobal2(t0, sourceSpaceMat);
                                                 t1 = this.viewUtils.localToGlobal2(t1, sourceSpaceMat);
                                         }
@@ -754,9 +746,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                                         line.setVisibility(vis);
 
                                         // increment the points to the next position
-//                                      p0 = p0.add(d); p0[3] = 1.0;
                                         p0 = vecUtils.vecAdd(4, p0, d); p0[3] = 1.0;
-//                                      p1 = p1.add(d); p1[3] = 1.0;
                                         p1 = vecUtils.vecAdd(4, p1, d); p1[3] = 1.0;
                                 }
                         }
@@ -809,25 +799,12 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                         // draw the lines
             var line,
                             nLines = this._gridLineArray.length;
-            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
-                            nLines = this._gridLineArray.length-4;
-            }
 
                         for (var i = 0; i < nLines; i++) {
                                 line = this._gridLineArray[i];
                                 this.drawIntersectedLine(line, this._drawingContext);
                         }
 
-            if(this.application.ninja.currentDocument.model.documentRoot.id !== "UserContent") {
-                this._lineColor = "red";
-                i = nLines;
-                nLines += 4;
-                for (; i < nLines; i++) {
-                    line = this._gridLineArray[i];
-                    this.drawIntersectedLine(line, this._drawingContext);
-                }
-            }
-
                         this.popState();
                 }
         },
@@ -1203,6 +1180,43 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                 }
         },
 
+    drawStageOutline : {
+        value: function() {
+            var context = this.application.ninja.stage.gridContext;
+            var stage = this.application.ninja.stage;
+            var stageRoot = this.application.ninja.currentDocument.model.documentRoot;
+            var bounds3D = this.viewUtils.getElementBoundsInGlobal(stageRoot);
+
+            var l = MathUtils.segSegIntersection2D(bounds3D[0], bounds3D[3], [0, 0, 0], [0, stage.canvas.height, 0], 0.1);
+            if(!l) return;
+            var r = MathUtils.segSegIntersection2D(bounds3D[0], bounds3D[3], [stage.canvas.width, 0, 0], [stage.canvas.width, stage.canvas.height, 0], 0.1);
+            if(!r) return;
+
+            var t = MathUtils.segSegIntersection2D(bounds3D[0], bounds3D[1], [0, 0, 0], [stage.canvas.width, 0, 0], 0.1);
+            if(!t) return;
+            var b = MathUtils.segSegIntersection2D(bounds3D[0], bounds3D[1], [0, stage.canvas.height, 0], [stage.canvas.width, stage.canvas.height, 0], 0.1);