From 51b4e61d6c6df5e88e9a5dfcdfd7944e2a3f64e7 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 30 Jan 2012 13:25:15 -0800
Subject: Syncing stage view when rotating stage.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 js/helper-classes/3D/draw-utils.js | 25 +++++++++++++++++++++++++
 js/models/properties-3d.js         |  2 ++
 js/stage/layout.js                 | 14 +++++++++++---
 js/stage/stage.reel/stage.js       |  2 +-
 js/tools/SelectionTool.js          |  1 -
 5 files changed, 39 insertions(+), 5 deletions(-)

(limited to 'js')

diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index 3fd6e8fc..c26a5cd1 100644
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -107,6 +107,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
             this.eventManager.addEventListener("elementAdded", this, false);
             this.eventManager.addEventListener("elementDeleted", this, false);
+            this.eventManager.addEventListener("elementChange", this, false);
 		}
 	},
 
@@ -124,6 +125,27 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
     },
 
 
+    handleElementChange: {
+        value: function(event) {
+            var els = event.detail.data.els;
+            if(els)
+            {
+                var len = els.length,
+                    i = 0,
+                    item,
+                    el;
+
+                for(i=0; i < len; i++) {
+                    item = els[i];
+                    el = item._element || item;
+                    el.elementModel.props3D.elementPlane.init();
+                }
+
+                this.drawWorkingPlane();
+            }
+        }
+    },
+
 	///////////////////////////////////////////////////////////////////////
 	// Methods
 	///////////////////////////////////////////////////////////////////////
@@ -150,6 +172,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 			plane.setElement( elt );
 			plane.init();
 			this._planesArray.push( plane );
+            elt.elementModel.props3D.elementPlane = plane;
 		}
 	},
 
@@ -166,6 +189,8 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
 
 					// Then remove the element
 					this._eltArray.splice(i, 1);
+
+                    // TODO - May need to delete props3D and elementPlane as well
 					return;
 				}
 			}
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index 6d65bc91..3c809f06 100644
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
@@ -36,6 +36,8 @@ exports.Properties3D = Montage.create(Component, {
     perspectiveDist :   { value : 1400, enumerable: true},
     perspectiveMode :   { value : null, enumerable: true},
 
+    elementPlane :   { value : null, enumerable: true},
+
     init : {
         value : function(elt) {
 
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 625c09ad..89fa44f3 100644
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -112,6 +112,7 @@ exports.Layout = Montage.create(Component, {
             }
 
             this.draw(); // Not a reel yet :)
+            this.draw3DInfo(false);
 
 
         }
@@ -128,9 +129,16 @@ exports.Layout = Montage.create(Component, {
     },
 
     draw3DInfo: {
-        value: function() {
-            drawUtils.updatePlanes();
-            if(this.stage.appModel.show3dGrid) drawUtils.drawWorkingPlane();
+        value: function(updatePlanes) {
+            if(updatePlanes)
+            {
+                drawUtils.updatePlanes();
+            }
+            if(this.stage.appModel.show3dGrid)
+            {
+                this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView();
+                drawUtils.drawWorkingPlane();
+            }
             drawUtils.draw3DCompass();
         }
     },
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 3e0b852e..31d0f8c2 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -175,7 +175,7 @@ exports.Stage = Montage.create(Component, {
             }
             else if(this.updatedStage) {
                 this.layout.draw();
-                this.layout.draw3DInfo();
+                this.layout.draw3DInfo(true);
             }
         }
     },
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 5f2a959f..862b2e88 100644
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -180,7 +180,6 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
                 this._handleMode = null;
                 this._delta = null;
                 this.DrawHandles();
-				console.log( "move: (" + dx + ", " + dy + ")" );
             }
 
             this.endDraw(event);
-- 
cgit v1.2.3