diff options
author | Nivesh Rajbhandari | 2012-05-24 13:34:12 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-24 13:34:12 -0700 |
commit | de25d2b7d05476d4f0d385b5e910db189f682d21 (patch) | |
tree | 9d651194d2d5edcd8e7e874a5b408774e948b20d | |
parent | f801708f83aadfc688e69a244eb7cbaeca5d5e8d (diff) | |
download | ninja-de25d2b7d05476d4f0d385b5e910db189f682d21.tar.gz |
IKNinja-1621 - 3D stage does not reset correctly when the rotation point is set elsewhere on stage.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index c8818021..a9346c8e 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.documentRoot, | 136 | ElementsMediator.setMatrix(this.application.ninja.currentDocument.documentRoot, |
136 | iMat, false, "rotateStage3DTool"); | 137 | iMat, false, "rotateStage3DTool"); |
137 | this.application.ninja.currentDocument.documentRoot.elementModel.props3D.m_transformCtr = null; | 138 | this.application.ninja.currentDocument.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); |