diff options
author | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-20 11:14:44 -0800 |
commit | abf78e2d7a97d295ce5a1c425fd359d47379137e (patch) | |
tree | d08c91bd2aef31e6325e0b499b2ffc390018bec6 /js/helper-classes | |
parent | e80a79bff57fecf3aa9b869d8ed2de5fd815287c (diff) | |
parent | e23708721a71ca4c71365f5f8e8ac7d6113926db (diff) | |
download | ninja-abf78e2d7a97d295ce5a1c425fd359d47379137e.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/helper-classes')
73 files changed, 15 insertions, 27 deletions
diff --git a/js/helper-classes/3D/GLMatrix/gl-matrix.js b/js/helper-classes/3D/GLMatrix/gl-matrix.js index 811ed5cd..811ed5cd 100644..100755 --- a/js/helper-classes/3D/GLMatrix/gl-matrix.js +++ b/js/helper-classes/3D/GLMatrix/gl-matrix.js | |||
diff --git a/js/helper-classes/3D/GLMatrix/notice.txt b/js/helper-classes/3D/GLMatrix/notice.txt index 8903aa97..8903aa97 100644..100755 --- a/js/helper-classes/3D/GLMatrix/notice.txt +++ b/js/helper-classes/3D/GLMatrix/notice.txt | |||
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js index e075dd3d..e075dd3d 100644..100755 --- a/js/helper-classes/3D/LinePlaneIntersectRec.js +++ b/js/helper-classes/3D/LinePlaneIntersectRec.js | |||
diff --git a/js/helper-classes/3D/ParseUtils.js b/js/helper-classes/3D/ParseUtils.js index 556253e9..556253e9 100644..100755 --- a/js/helper-classes/3D/ParseUtils.js +++ b/js/helper-classes/3D/ParseUtils.js | |||
diff --git a/js/helper-classes/3D/Rectangle.js b/js/helper-classes/3D/Rectangle.js index e797eedf..e797eedf 100644..100755 --- a/js/helper-classes/3D/Rectangle.js +++ b/js/helper-classes/3D/Rectangle.js | |||
diff --git a/js/helper-classes/3D/StageLine.js b/js/helper-classes/3D/StageLine.js index e0e7a8e3..e0e7a8e3 100644..100755 --- a/js/helper-classes/3D/StageLine.js +++ b/js/helper-classes/3D/StageLine.js | |||
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index c07391db..c07391db 100644..100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
diff --git a/js/helper-classes/3D/element-planes.js b/js/helper-classes/3D/element-planes.js index 7ccf311e..7ccf311e 100644..100755 --- a/js/helper-classes/3D/element-planes.js +++ b/js/helper-classes/3D/element-planes.js | |||
diff --git a/js/helper-classes/3D/glUtils.js b/js/helper-classes/3D/glUtils.js index f6d075f8..f6d075f8 100644..100755 --- a/js/helper-classes/3D/glUtils.js +++ b/js/helper-classes/3D/glUtils.js | |||
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js index 5546cc5a..5546cc5a 100644..100755 --- a/js/helper-classes/3D/hit-record.js +++ b/js/helper-classes/3D/hit-record.js | |||
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js index 37044763..37044763 100644..100755 --- a/js/helper-classes/3D/math-utils.js +++ b/js/helper-classes/3D/math-utils.js | |||
diff --git a/js/helper-classes/3D/snap-2d-record.js b/js/helper-classes/3D/snap-2d-record.js index c77b28b3..c77b28b3 100644..100755 --- a/js/helper-classes/3D/snap-2d-record.js +++ b/js/helper-classes/3D/snap-2d-record.js | |||
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 0a950658..0a950658 100644..100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js index ceff4f64..ceff4f64 100644..100755 --- a/js/helper-classes/3D/vec-utils.js +++ b/js/helper-classes/3D/vec-utils.js | |||
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index c8e20def..a2fac34f 100644..100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -4,16 +4,16 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, | 7 | var Montage = require("montage/core/core").Montage, |
8 | snapManagerModule = require("js/helper-classes/3D/snap-manager"), | 8 | Component = require("montage/ui/component").Component, |
9 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils, | ||
9 | Rectangle = require("js/helper-classes/3D/rectangle").Rectangle, | 10 | Rectangle = require("js/helper-classes/3D/rectangle").Rectangle, |
10 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | 11 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; |
11 | /////////////////////////////////////////////////////////////////////// | 12 | /////////////////////////////////////////////////////////////////////// |
12 | // Class ViewUtils | 13 | // Class ViewUtils |
13 | // Viewing Utility functions | 14 | // Viewing Utility functions |
14 | /////////////////////////////////////////////////////////////////////// | 15 | /////////////////////////////////////////////////////////////////////// |
15 | var ViewUtils = exports.ViewUtils = Object.create(Object.prototype, | 16 | exports.ViewUtils = Montage.create(Component, { |
16 | { | ||
17 | /////////////////////////////////////////////////////////////////////// | 17 | /////////////////////////////////////////////////////////////////////// |
18 | // Instance variables | 18 | // Instance variables |
19 | /////////////////////////////////////////////////////////////////////// | 19 | /////////////////////////////////////////////////////////////////////// |
@@ -133,7 +133,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype, | |||
133 | var xVec = [mat[0], mat[1], mat[2], mat[3]]; | 133 | var xVec = [mat[0], mat[1], mat[2], mat[3]]; |
134 | var yVec = [mat[4], mat[5], mat[6], mat[7]]; | 134 | var yVec = [mat[4], mat[5], mat[6], mat[7]]; |
135 | 135 | ||
136 | var stage = snapManagerModule.SnapManager.getStage(); | 136 | var stage = this.application.ninja.currentDocument.documentRoot; |
137 | var stageMat = this.getMatrixFromElement(stage); | 137 | var stageMat = this.getMatrixFromElement(stage); |
138 | var stagePlane = [stageMat[8], stageMat[9], stageMat[10], stageMat[11]]; | 138 | var stagePlane = [stageMat[8], stageMat[9], stageMat[10], stageMat[11]]; |
139 | 139 | ||
@@ -412,7 +412,7 @@ var ViewUtils = exports.ViewUtils = Object.create(Object.prototype, | |||
412 | // get the four corners of the element in global space | 412 | // get the four corners of the element in global space |
413 | var bounds = this.getElementViewBounds3D( elt ); | 413 | var bounds = this.getElementViewBounds3D( elt ); |
414 | var bounds3D = new Array(); | 414 | var bounds3D = new Array(); |
415 | var stage = snapManagerModule.SnapManager.getStage(); | 415 | var stage = this.application.ninja.currentDocument.documentRoot; |
416 | for (var i=0; i<3; i++) | 416 | for (var i=0; i<3; i++) |
417 | { | 417 | { |
418 | var gPt = this.localToGlobal( bounds[i], elt ); |