diff options
author | hwc487 | 2012-02-06 15:50:07 -0800 |
---|---|---|
committer | hwc487 | 2012-02-06 15:50:07 -0800 |
commit | 9d122c5f1632b1225a543049913c36b9a030110c (patch) | |
tree | e13ca71c7129a32c4aaed072c2edf4a8de4dd52d /js/helper-classes/3D/snap-manager.js | |
parent | 1a8c017e37c5c0dec445ebafad634ef997fcd1bb (diff) | |
download | ninja-9d122c5f1632b1225a543049913c36b9a030110c.tar.gz |
Enhanced the overlap test for the selection tool marquee select.
Diffstat (limited to 'js/helper-classes/3D/snap-manager.js')
-rw-r--r-- | js/helper-classes/3D/snap-manager.js | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 7e1260bf..f3e8b823 100644 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -971,7 +971,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
971 | value: function( screenPt, hitRecs ) { | 971 | value: function( screenPt, hitRecs ) { |
972 | // start at the stage. | 972 | // start at the stage. |
973 | var stage = this.getStage(); | 973 | var stage = this.getStage(); |
974 | //var stagePt = viewUtils.parentToChild( screenPt, stage ); | ||
975 | 974 | ||
976 | // the root should be the 'view' canvas, so the first matrix is the camera | 975 | // the root should be the 'view' canvas, so the first matrix is the camera |
977 | viewUtils.setViewportObj( stage ); | 976 | viewUtils.setViewportObj( stage ); |
@@ -997,7 +996,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
997 | hit = this.snapToElement( elt, globalScrPt ); | 996 | hit = this.snapToElement( elt, globalScrPt ); |
998 | if (hit) | 997 | if (hit) |
999 | { | 998 | { |
1000 | //hitRecs.push( hit ); | ||
1001 | if (!hit.checkType()) | 999 | if (!hit.checkType()) |
1002 | { | 1000 | { |
1003 | console.log( "invalid hit record: " + hit.getTypeString() ); | 1001 | console.log( "invalid hit record: " + hit.getTypeString() ); |
@@ -1016,17 +1014,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1016 | } | 1014 | } |
1017 | // test the rest of the tree | 1015 | // test the rest of the tree |
1018 | var n = elt.childElementCount; | 1016 | var n = elt.childElementCount; |
1019 | //var eltPt = viewUtils.parentToChild( parentPt, elt, true ); | ||
1020 | if (n > 0) | 1017 | if (n > 0) |
1021 | { | 1018 | { |
1022 | for (var i=0; i<n; i++) | 1019 | for (var i=0; i<n; i++) |
1023 | { | 1020 | { |
1024 | var child = elt.children[i]; | 1021 | var child = elt.children[i]; |
1025 | //var childPt = viewUtils.parentToChild( scrPt, child ); | ||
1026 | hit = this.hSnapToElements( child, hitRecs, (depth+1), globalScrPt ); | 1022 | hit = this.hSnapToElements( child, hitRecs, (depth+1), globalScrPt ); |
1027 | if (hit) | 1023 | if (hit) |
1028 | { | 1024 | { |
1029 | //hitRecs.push( hit ); | ||
1030 | if (!hit.checkType()) | 1025 | if (!hit.checkType()) |
1031 | { | 1026 | { |
1032 | console.log( "invalid hit record: " + hit.getTypeString() ); | 1027 | console.log( "invalid hit record: " + hit.getTypeString() ); |
@@ -1034,7 +1029,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1034 | } | 1029 | } |
1035 | else | 1030 | else |
1036 | hitRecs.push( hit ); | 1031 | hitRecs.push( hit ); |
1037 | |||
1038 | } | 1032 | } |
1039 | } | 1033 | } |
1040 | } | 1034 | } |