aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-24 14:06:19 -0700
committerValerio Virgillito2012-05-24 14:06:19 -0700
commit9c8d724dd1605ee2e5257591e0bfaad575cbc906 (patch)
tree868197f79862e98b9c7f5a1f296d64832c68d48f /js/tools
parent70ff8dd670bc37c14caf850e06791d1e293b1e4b (diff)
parentde25d2b7d05476d4f0d385b5e910db189f682d21 (diff)
downloadninja-9c8d724dd1605ee2e5257591e0bfaad575cbc906.tar.gz
Merge pull request #256 from mqg734/Dom-Architecture
IKNinja-1621 - 3D stage does not reset correctly when the rotation point is set elsewhere on stage.
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/RotateStage3DTool.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js
index 92ed40d2..12b21a64 100755
--- a/js/tools/RotateStage3DTool.js
+++ b/js/tools/RotateStage3DTool.js
@@ -130,20 +130,22 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, {
130 value : function() 130 value : function()
131 { 131 {
132 // Reset stage to identity matrix 132 // Reset stage to identity matrix
133 var iMat = Matrix.I(4); 133 var iMat = Matrix.I(4),
134 stage = this.application.ninja.stage;
134 135
135 ElementsMediator.setMatrix(this.application.ninja.currentDocument.model.documentRoot, 136 ElementsMediator.setMatrix(this.application.ninja.currentDocument.model.documentRoot,
136 iMat, false, "rotateStage3DTool"); 137 iMat, false, "rotateStage3DTool");
137 this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null; 138 this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null;
138 139
139 // let the document and stage manager know about the zoom change 140 // let the document and stage manager know about the zoom change
140 this.application.ninja.stage._firstDraw = true; 141 stage._firstDraw = true;
141 this.application.ninja.documentBar.zoomFactor = 100; 142 this.application.ninja.documentBar.zoomFactor = 100;
142 this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; 143 this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0;
143 this.application.ninja.stage._firstDraw = false; 144 stage._firstDraw = false;
144 145
145 // TODO - Any updates to the stage should redraw stage's children. Move this to mediator? 146 viewUtils.clearStageTranslation();
146 this.application.ninja.stage.updatedStage = true; 147 stage.centerStage();
148 stage.draw();
147 149
148 this.isDrawing = false; 150 this.isDrawing = false;
149 this.endDraw(event); 151 this.endDraw(event);