diff options
author | Eric Guzman | 2012-04-26 03:16:50 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-26 03:16:50 -0700 |
commit | 110aa15b48ec24063815aa3b86c7f8f041543a02 (patch) | |
tree | d0debb235807dd73f48e0793a73d37cc41ecf59c /js/tools/drawing-tool-base.js | |
parent | 143105a0b9c7765898b22d53489b4bd8df3dff2e (diff) | |
parent | bcc8f8616f5ad4bf310928da6cbc01da12f6e468 (diff) | |
download | ninja-110aa15b48ec24063815aa3b86c7f8f041543a02.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
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; |