diff options
| author | hwc487 | 2012-05-11 11:28:15 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 11:28:15 -0700 |
| commit | 634194bf87744dd6f693380ec878cc5dd42207a1 (patch) | |
| tree | 9652bf677abb71b56582deb9c46fb2dcb7d9a687 /js/helper-classes | |
| parent | d1bcb47ba34f2f2b8db5fa310a9e9a9bd7973988 (diff) | |
| parent | e2ef92008a39a67d4f7db0627c7352bdc06ed476 (diff) | |
| download | ninja-634194bf87744dd6f693380ec878cc5dd42207a1.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Conflicts:
js/lib/geom/circle.js
js/lib/geom/rectangle.js
Diffstat (limited to 'js/helper-classes')
| -rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 27a95941..346ad014 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
| @@ -1810,8 +1810,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1810 | hSnap.setScreenPoint( scrPt ); | 1810 | hSnap.setScreenPoint( scrPt ); |
| 1811 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); | 1811 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); |
| 1812 | hSnap.setElement( stage ); | 1812 | hSnap.setElement( stage ); |
| 1813 | hSnap.setPlane( [0,0,1,0] ); | 1813 | //hSnap.setPlane( [0,0,1,0] ); |
| 1814 | hSnap.setPlaneMatrix( Matrix.I(4) ); | 1814 | //hSnap.setPlaneMatrix( Matrix.I(4) ); |
| 1815 | if (vSnap.hasAssociatedScreenPoint() ) | 1815 | if (vSnap.hasAssociatedScreenPoint() ) |
| 1816 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); | 1816 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); |
| 1817 | if (vSnap.hasAssociatedScreenPoint2() ) | 1817 | if (vSnap.hasAssociatedScreenPoint2() ) |
| @@ -1859,8 +1859,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1859 | hSnap.setScreenPoint( scrPt ); | 1859 | hSnap.setScreenPoint( scrPt ); |
| 1860 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); | 1860 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); |
| 1861 | hSnap.setElement( stage ); | 1861 | hSnap.setElement( stage ); |
| 1862 | hSnap.setPlane( [0,0,1,0] ); | 1862 | //hSnap.setPlane( [0,0,1,0] ); |
| 1863 | hSnap.setPlaneMatrix( Matrix.I(4) ); | 1863 | //hSnap.setPlaneMatrix( Matrix.I(4) ); |
| 1864 | if (vSnap.hasAssociatedScreenPoint() ) | 1864 | if (vSnap.hasAssociatedScreenPoint() ) |
| 1865 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); | 1865 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); |
| 1866 | if (vSnap.hasAssociatedScreenPoint2() ) | 1866 | if (vSnap.hasAssociatedScreenPoint2() ) |
| @@ -1914,8 +1914,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
| 1914 | hSnap.setScreenPoint( scrPt ); | 1914 | hSnap.setScreenPoint( scrPt ); |
| 1915 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); | 1915 | hSnap.setType( hSnap.SNAP_TYPE_ALIGN_MERGED ); |
| 1916 | hSnap.setElement( stage ); | 1916 | hSnap.setElement( stage ); |
| 1917 | hSnap.setPlane( [0,0,1,0] ); | 1917 | //hSnap.setPlane( [0,0,1,0] ); |
| 1918 | hSnap.setPlaneMatrix( Matrix.I(4) ); | 1918 | //hSnap.setPlaneMatrix( Matrix.I(4) ); |
| 1919 | if (vSnap.hasAssociatedScreenPoint() ) | 1919 | if (vSnap.hasAssociatedScreenPoint() ) |
| 1920 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); | 1920 | hSnap.setAssociatedScreenPoint( vSnap.getAssociatedScreenPoint() ); |
| 1921 | if (vSnap.hasAssociatedScreenPoint2() ) | 1921 | if (vSnap.hasAssociatedScreenPoint2() ) |