aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorhwc4872012-01-31 10:46:48 -0800
committerhwc4872012-01-31 10:46:48 -0800
commitaa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260 (patch)
tree9fd0364c371b8c9bbe1620b9a5a58a45dd0574a9 /js/stage
parent0b8d8b2eb595b64ef53440b949f3c5ec891daf8a (diff)
parent6066b9bda2990c9d6b4311d221b0d0c773b20f60 (diff)
downloadninja-aa1b4b78d9e1b9cc15529dbf7196b7ac8a88e260.tar.gz
Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working
Conflicts: js/stage/stage.reel/stage.js
Diffstat (limited to 'js/stage')
-rw-r--r--js/stage/layout.js14
-rw-r--r--js/stage/stage.reel/stage.js12
2 files changed, 17 insertions, 9 deletions
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, {
112 } 112 }
113 113
114 this.draw(); // Not a reel yet :) 114 this.draw(); // Not a reel yet :)
115 this.draw3DInfo(false);
115 116
116 117
117 } 118 }
@@ -128,9 +129,16 @@ exports.Layout = Montage.create(Component, {
128 }, 129 },
129 130
130 draw3DInfo: { 131 draw3DInfo: {
131 value: function() { 132 value: function(updatePlanes) {
132 drawUtils.updatePlanes(); 133 if(updatePlanes)
133 if(this.stage.appModel.show3dGrid) drawUtils.drawWorkingPlane(); 134 {
135 drawUtils.updatePlanes();
136 }
137 if(this.stage.appModel.show3dGrid)
138 {
139 this.application.ninja.stage.stageDeps.snapManager.updateWorkingPlaneFromView();
140 drawUtils.drawWorkingPlane();
141 }
134 drawUtils.draw3DCompass(); 142 drawUtils.draw3DCompass();
135 } 143 }
136 }, 144 },
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 92ab4033..b72615db 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -175,7 +175,7 @@ exports.Stage = Montage.create(Component, {
175 } 175 }
176 else if(this.updatedStage) { 176 else if(this.updatedStage) {
177 this.layout.draw(); 177 this.layout.draw();
178 this.layout.draw3DInfo(); 178 this.layout.draw3DInfo(true);
179 } 179 }
180 } 180 }
181 }, 181 },
@@ -839,8 +839,8 @@ exports.Stage = Montage.create(Component, {
839 setStageView: { 839 setStageView: {
840 value: function(side) { 840 value: function(side) {
841 var mat, 841 var mat,
842 workingPlane = null, 842 currentDoc = this.application.ninja.currentDocument.documentRoot,
843 currentDoc = this.application.ninja.currentDocument.documentRoot; 843 isDrawingGrid = this.application.ninja.appModel.show3dGrid;
844 // Stage 3d Props. 844 // Stage 3d Props.
845 currentDoc.elementModel.props3D.ResetTranslationValues(); 845 currentDoc.elementModel.props3D.ResetTranslationValues();
846 currentDoc.elementModel.props3D.ResetRotationValues(); 846 currentDoc.elementModel.props3D.ResetRotationValues();
@@ -850,19 +850,19 @@ exports.Stage = Montage.create(Component, {
850 case "top": 850 case "top":
851 mat = Matrix.RotationX(Math.PI * 270.0/180.0); 851 mat = Matrix.RotationX(Math.PI * 270.0/180.0);
852 drawUtils.drawXY = drawUtils.drawYZ = false; 852 drawUtils.drawXY = drawUtils.drawYZ = false;
853 drawUtils.drawXZ = drawUtils.isDrawingGrid(); 853 drawUtils.drawXZ = isDrawingGrid;
854 break; 854 break;
855 855
856 case "side": 856 case "side":
857 mat = Matrix.RotationY(Math.PI * 270/180); 857 mat = Matrix.RotationY(Math.PI * 270/180);
858 drawUtils.drawXY = drawUtils.drawXZ = false; 858 drawUtils.drawXY = drawUtils.drawXZ = false;
859 drawUtils.drawYZ = drawUtils.isDrawingGrid(); 859 drawUtils.drawYZ = isDrawingGrid;
860 break; 860 break;
861 861
862 case "front": 862 case "front":
863 mat = Matrix.I(4); 863 mat = Matrix.I(4);
864 drawUtils.drawYZ = drawUtils.drawXZ = false; 864 drawUtils.drawYZ = drawUtils.drawXZ = false;
865 drawUtils.drawXY = drawUtils.isDrawingGrid(); 865 drawUtils.drawXY = isDrawingGrid;
866 break; 866 break;
867 } 867 }
868 workingPlane = this.getPlaneForView( side ); 868 workingPlane = this.getPlaneForView( side );