diff options
| author | Jonathan Duran | 2012-04-13 09:51:09 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-04-13 09:51:09 -0700 |
| commit | a6ba1c1621779866b2702aea11b6aeab4bfb466a (patch) | |
| tree | cb50b3a7bc464edfe36c96dbd21367ca7ff9ecd7 /js/helper-classes/3D/snap-manager.js | |
| parent | b5f5ea6bc209ada7f41dd9ebbda807c5a14bd2d7 (diff) | |
| parent | 4b900ea5cd6bb77eb30cec8c03b9ec9fa662c1e9 (diff) | |
| download | ninja-a6ba1c1621779866b2702aea11b6aeab4bfb466a.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 61f5bc97..02e81a62 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
| @@ -1354,7 +1354,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1354 | var offset = viewUtils.getElementOffset( elt ); | 1354 | var offset = viewUtils.getElementOffset( elt ); |
| 1355 | MathUtils.makeDimension3( offset ); | 1355 | MathUtils.makeDimension3( offset ); |
| 1356 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1356 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
| 1357 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1357 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
| 1358 | 1358 | ||
| 1359 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1359 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
| 1360 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) | 1360 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) |
| @@ -1392,7 +1392,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1392 | var offset = viewUtils.getElementOffset( elt ); | 1392 | var offset = viewUtils.getElementOffset( elt ); |
| 1393 | MathUtils.makeDimension3( offset ); | 1393 | MathUtils.makeDimension3( offset ); |
| 1394 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1394 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
| 1395 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1395 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
| 1396 | 1396 | ||
| 1397 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1397 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
| 1398 | if (dist < this.ELEMENT_EDGE_HIT_RAD) | 1398 | if (dist < this.ELEMENT_EDGE_HIT_RAD) |
| @@ -1445,7 +1445,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1445 | var offset = viewUtils.getElementOffset( elt ); | 1445 | var offset = viewUtils.getElementOffset( elt ); |
| 1446 | MathUtils.makeDimension3( offset ); | 1446 | MathUtils.makeDimension3( offset ); |
| 1447 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1447 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
| 1448 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1448 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
| 1449 | 1449 | ||
| 1450 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1450 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
| 1451 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) | 1451 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) |
| @@ -1483,7 +1483,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1483 | var offset = viewUtils.getElementOffset( elt ); | 1483 | var offset = viewUtils.getElementOffset( elt ); |
| 1484 | MathUtils.makeDimension3( offset ); | 1484 | MathUtils.makeDimension3( offset ); |
| 1485 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1485 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
| 1486 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1486 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
| 1487 | 1487 | ||
| 1488 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1488 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
| 1489 | if (dist < this.ELEMENT_EDGE_HIT_RAD) | 1489 | if (dist < this.ELEMENT_EDGE_HIT_RAD) |