diff options
Diffstat (limited to 'js/helper-classes/3D/view-utils.js')
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index 1973d254..b7070840 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -158,7 +158,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
158 | var stageMat = this.getMatrixFromElement(stage); | 158 | var stageMat = this.getMatrixFromElement(stage); |
159 | 159 | ||
160 | var mat = glmat4.multiply( stageMat, objMat, [] ); | 160 | var mat = glmat4.multiply( stageMat, objMat, [] ); |
161 | 161 | ||
162 | var viewDir; | 162 | var viewDir; |
163 | if (localMode) | 163 | if (localMode) |
164 | { | 164 | { |
@@ -183,7 +183,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
183 | else | 183 | else |
184 | plane = vecUtils.vecCross( 3, yVec, xVec ); | 184 | plane = vecUtils.vecCross( 3, yVec, xVec ); |
185 | break; | 185 | break; |
186 | 186 | ||
187 | case 1: | 187 | case 1: |
188 | xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir)); | 188 | xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir)); |
189 | zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir)); | 189 | zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir)); |
@@ -571,7 +571,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
571 | return localPlane; | 571 | return localPlane; |
572 | } | 572 | } |
573 | }, | 573 | }, |
574 | 574 | ||
575 | parentToChild: { | 575 | parentToChild: { |
576 | value: function( parentPt, child, passthrough ) { | 576 | value: function( parentPt, child, passthrough ) { |
577 | var pt = parentPt.slice(0); | 577 | var pt = parentPt.slice(0); |
@@ -620,7 +620,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
620 | return childPt; | 620 | return childPt; |
621 | } | 621 | } |
622 | }, | 622 | }, |
623 | 623 | ||
624 | parentToChildWorld: { | 624 | parentToChildWorld: { |
625 | value: function( parentPt, child ) { | 625 | value: function( parentPt, child ) { |
626 | var pt = parentPt.slice(0); | 626 | var pt = parentPt.slice(0); |
@@ -694,7 +694,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
694 | return vec; | 694 | return vec; |
695 | } | 695 | } |
696 | }, | 696 | }, |
697 | 697 | ||
698 | getElementBounds: { | 698 | getElementBounds: { |
699 | value: function( elt, localSpace ) { | 699 | value: function( elt, localSpace ) { |
700 | // optional argument localSpace, if true, puts the top left at (0,0). | 700 | // optional argument localSpace, if true, puts the top left at (0,0). |
@@ -876,7 +876,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
876 | } | 876 | } |
877 | }, | 877 | }, |
878 | 878 | ||
879 | 879 | ||
880 | unproject: { | 880 | unproject: { |
881 | value: function( pt ) { | 881 | value: function( pt ) { |
882 | if(!this._perspectiveDist) | 882 | if(!this._perspectiveDist) |
@@ -968,7 +968,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
968 | return viewPt; | 968 | return viewPt; |
969 | } | 969 | } |
970 | }, | 970 | }, |
971 | 971 | ||
972 | globalScreenToLocalWorld: { | 972 | globalScreenToLocalWorld: { |
973 | value: function( globalPt, elt ) { | 973 | value: function( globalPt, elt ) { |
974 | var objPt = this.globalToLocal( globalPt, elt ); | 974 | var objPt = this.globalToLocal( globalPt, elt ); |
@@ -1341,7 +1341,7 @@ exports.ViewUtils = Montage.create(Component, { | |||
1341 | // drawLayoutModule | 1341 | // drawLayoutModule |
1342 | // | 1342 | // |
1343 | // STAGE ACCESSORS: | 1343 | // STAGE ACCESSORS: |
1344 | // activeDocument: this.application.ninja.currentDocument | 1344 | // activeDocument: this.application.ninja.currentDocument |
1345 | // userContent (stage): this.application.ninja.currentDocument.model.documentRoot | 1345 | // userContent (stage): this.application.ninja.currentDocument.model.documentRoot |
1346 | // stageManager: this.application.ninja.stage // MainApp\js\stage\stage.reel\stage.js | 1346 | // stageManager: this.application.ninja.stage // MainApp\js\stage\stage.reel\stage.js |
1347 | // stageManager._canvas: this.application.ninja.stage.canvas | 1347 | // stageManager._canvas: this.application.ninja.stage.canvas |
@@ -1490,6 +1490,6 @@ exports.ViewUtils = Montage.create(Component, { | |||
1490 | } | 1490 | } |
1491 | 1491 | ||
1492 | /////////////////////////////////////////////////////////////////////////////////// | 1492 | /////////////////////////////////////////////////////////////////////////////////// |
1493 | 1493 | ||
1494 | }); | 1494 | }); |
1495 | 1495 | ||