diff options
author | hwc487 | 2012-03-06 16:03:26 -0800 |
---|---|---|
committer | hwc487 | 2012-03-06 16:03:26 -0800 |
commit | 855e8727b147771ff7b05e71bed481e65fe4b6b0 (patch) | |
tree | 60d7f091fcf0870495aeaa63748492dbd558619d /js/helper-classes/3D/snap-2d-record.js | |
parent | 1207735f05f202b5bdc5f70c73445f8e0934a227 (diff) | |
parent | 4f498b43264327f5886e0370bd3536453d47570a (diff) | |
download | ninja-855e8727b147771ff7b05e71bed481e65fe4b6b0.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Conflicts:
js/preloader/Preloader.js
Diffstat (limited to 'js/helper-classes/3D/snap-2d-record.js')
-rwxr-xr-x | js/helper-classes/3D/snap-2d-record.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/helper-classes/3D/snap-2d-record.js b/js/helper-classes/3D/snap-2d-record.js index c77b28b3..844bb3be 100755 --- a/js/helper-classes/3D/snap-2d-record.js +++ b/js/helper-classes/3D/snap-2d-record.js | |||
@@ -78,7 +78,7 @@ var Snap2DRecord = exports.Snap2DRecord = Object.create(Object.prototype, | |||
78 | 78 | ||
79 | // add the center point | 79 | // add the center point |
80 | var xCtr = 0.5*(bounds[0][0] + bounds[3][0]), yCtr = 0.5*(bounds[0][1] + bounds[1][1]); | 80 | var xCtr = 0.5*(bounds[0][0] + bounds[3][0]), yCtr = 0.5*(bounds[0][1] + bounds[1][1]); |
81 | var ctr = Vector.create( [xCtr, yCtr, 0] ); | 81 | var ctr = [xCtr, yCtr, 0]; |
82 | this._screenPtArray[4] = viewUtils.localToGlobal( ctr, elt ); | 82 | this._screenPtArray[4] = viewUtils.localToGlobal( ctr, elt ); |
83 | var worldPt = viewUtils.localToStageWorld( ctr, elt ); | 83 | var worldPt = viewUtils.localToStageWorld( ctr, elt ); |
84 | this._alignPtArray[4] = MathUtils.transformPoint( worldPt, snapManager.SnapManager._worldToDragPlane ); | 84 | this._alignPtArray[4] = MathUtils.transformPoint( worldPt, snapManager.SnapManager._worldToDragPlane ); |