diff options
author | Valerio Virgillito | 2012-04-24 15:38:05 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-24 15:38:05 -0700 |
commit | d0893407d35f4e05bbe2fd41c2b70151984fe481 (patch) | |
tree | 33643dfc1daabb0604b04b78a89003d562045c9d /js/tools/drawing-tool-base.js | |
parent | 4b5cc9cf1f01552f61c08b9299b6e99366432e03 (diff) | |
parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
download | ninja-d0893407d35f4e05bbe2fd41c2b70151984fe481.tar.gz |
Merge branch 'refs/heads/master' into stage-document-architecture
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-x | js/tools/drawing-tool-base.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 476dca66..2283dfab 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
@@ -158,6 +158,8 @@ exports.DrawingToolBase = Montage.create(Montage, { | |||
158 | // get the center of the circle in stage world space | 158 | // get the center of the circle in stage world space |
159 | var swPos = viewUtils.postViewToStageWorld(MathUtils.transformPoint(psPos, hitRec.getPlaneMatrix()), hitRec.getElt()); | 159 | var swPos = viewUtils.postViewToStageWorld(MathUtils.transformPoint(psPos, hitRec.getPlaneMatrix()), hitRec.getElt()); |
160 | 160 | ||
161 | //var swPos = hitRec.calculateStageWorldPoint(); todo figure out why we cannot just use this function instead of the above | ||
162 | |||
161 | // the stage world space point is now relative to the center of the 3D space. To | 163 | // the stage world space point is now relative to the center of the 3D space. To |
162 | // calculate the left and top offsets, this must be offset by the stage dimensions | 164 | // calculate the left and top offsets, this must be offset by the stage dimensions |
163 | swPos[0] += snapManager.getStageWidth() / 2.0; | 165 | swPos[0] += snapManager.getStageWidth() / 2.0; |