diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/tools/RotateStage3DTool.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools/RotateStage3DTool.js')
-rwxr-xr-x | js/tools/RotateStage3DTool.js | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/js/tools/RotateStage3DTool.js b/js/tools/RotateStage3DTool.js index 2f655333..36bf285e 100755 --- a/js/tools/RotateStage3DTool.js +++ b/js/tools/RotateStage3DTool.js | |||
@@ -94,15 +94,15 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
94 | var eltCtr = viewUtils.getCenterOfProjection(); | 94 | var eltCtr = viewUtils.getCenterOfProjection(); |
95 | viewUtils.popViewportObj(); | 95 | viewUtils.popViewportObj(); |
96 | 96 | ||
97 | // cache the local to global and global to local matrices | 97 | // cache the local to global and global to local matrices |
98 | var l2gMat = viewUtils.getLocalToGlobalMatrix( elt ); | 98 | var l2gMat = viewUtils.getLocalToGlobalMatrix( elt ); |
99 | var g2lMat = glmat4.inverse( l2gMat, [] ); | 99 | var g2lMat = glmat4.inverse( l2gMat, [] ); |
100 | eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat ); | 100 | eltCtr = MathUtils.transformAndDivideHomogeneousPoint( eltCtr, l2gMat ); |
101 | 101 | ||
102 | elt.elementModel.setProperty("mat", curMat); | 102 | elt.elementModel.setProperty("mat", curMat); |
103 | elt.elementModel.setProperty("matInv", curMatInv); | 103 | elt.elementModel.setProperty("matInv", curMatInv); |
104 | elt.elementModel.setProperty("ctr", eltCtr); | 104 | elt.elementModel.setProperty("ctr", eltCtr); |
105 | elt.elementModel.setProperty("l2g", l2gMat); | 105 | elt.elementModel.setProperty("l2g", l2gMat); |
106 | elt.elementModel.setProperty("g2l", g2lMat); | 106 | elt.elementModel.setProperty("g2l", g2lMat); |
107 | 107 | ||
108 | ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool"); | 108 | ElementsMediator.setMatrix(elt, curMat, false, "rotateStage3DTool"); |
@@ -172,11 +172,11 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
172 | iMat, false, "rotateStage3DTool"); | 172 | iMat, false, "rotateStage3DTool"); |
173 | this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null; | 173 | this.application.ninja.currentDocument.model.documentRoot.elementModel.props3D.m_transformCtr = null; |
174 | 174 | ||
175 | // let the document and stage manager know about the zoom change | 175 | // let the document and stage manager know about the zoom change |
176 | stage._firstDraw = true; | 176 | stage._firstDraw = true; |
177 | this.application.ninja.documentBar.zoomFactor = 100; | 177 | this.application.ninja.documentBar.zoomFactor = 100; |
178 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; | 178 | this.application.ninja.currentDocument.model.views.design.iframe.style.zoom = 1.0; |
179 | stage._firstDraw = false; | 179 | stage._firstDraw = false; |
180 | 180 | ||
181 | viewUtils.clearStageTranslation(); | 181 | viewUtils.clearStageTranslation(); |
182 | stage.centerStage(); | 182 | stage.centerStage(); |
@@ -185,7 +185,7 @@ exports.RotateStage3DTool = Montage.create(Rotate3DToolBase, { | |||
185 | this.isDrawing = false; | 185 | this.isDrawing = false; |
186 | this.endDraw(event); | 186 | this.endDraw(event); |
187 | 187 | ||
188 | // this.UpdateSelection(true); | 188 | // this.UpdateSelection(true); |
189 | this.Configure(true); | 189 | this.Configure(true); |
190 | } | 190 | } |
191 | } | 191 | } |