aboutsummaryrefslogtreecommitdiff
path: root/js/tools/drawing-tool-base.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 23:08:31 -0700
committerValerio Virgillito2012-05-03 23:08:31 -0700
commit3542dab96689a54f97fff6fc654838c07c724517 (patch)
tree1c8a8a53985bb72a34ad302e402ffe24aec2f242 /js/tools/drawing-tool-base.js
parent24b483db367291b72170f969de78efcb1a9b95bd (diff)
parent60388a7d01d9e34b5cd15bd5cb190a610e4f9a0e (diff)
downloadninja-3542dab96689a54f97fff6fc654838c07c724517.tar.gz
Merge branch 'tag-2.0' of github.com:mencio/ninja-internal into data-id
Conflicts: js/components/tools-properties/tag-properties.reel/tag-properties.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools/drawing-tool-base.js')
-rwxr-xr-xjs/tools/drawing-tool-base.js24
1 files changed, 0 insertions, 24 deletions
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js
index 7d97f105..376b3a27 100755
--- a/js/tools/drawing-tool-base.js
+++ b/js/tools/drawing-tool-base.js
@@ -446,30 +446,6 @@ exports.DrawingToolBase = Montage.create(Montage, {
446 }, 446 },
447 447
448 /** 448 /**
449 * Get the matrix for the actual element being added to the user document.
450 */
451 getElementMatrix: {
452 value: function(planeMat, midPt) {
453 var divMat, flatMat, flatMatSafe;
454 // calculate the matrix for the element.
455 // we should not need to worry about divide by zero below since we snapped to the point
456 divMat = planeMat.slice(0);
457 divMat[12] = 0.0;
458 divMat[13] = 0.0;
459 //divMat[14] = 0.0;
460 divMat[14] = midPt[2];
461
462 // set the left and top of the element such that the center of the rectangle is at the mid point
463 viewUtils.setViewportObj(this.stage);
464
465 flatMat = divMat;
466 flatMatSafe = MathUtils.scientificToDecimal(flatMat, 10);
467
468 return "matrix3d(" + flatMatSafe + ")";
469 }
470 },
471
472 /**
473 * Draw Helper Functions 449 * Draw Helper Functions
474 */ 450 */
475 451