aboutsummaryrefslogtreecommitdiff
path: root/js/tools/drawing-tool-base.js
diff options
context:
space:
mode:
authorJonathan Duran2012-04-25 08:15:26 -0700
committerJonathan Duran2012-04-25 08:15:26 -0700
commit4a717f3abdad8f65cf8e61f7308f1f89aa825884 (patch)
treeab3a892eda4853636556ac4e67fa1ecca2f46d1d /js/tools/drawing-tool-base.js
parentef704fcb6b1bb290eb45b6685b073e2932237a68 (diff)
parentd3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff)
downloadninja-4a717f3abdad8f65cf8e61f7308f1f89aa825884.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-xjs/tools/drawing-tool-base.js2
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;