diff options
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 4 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 80 | ||||
-rwxr-xr-x | js/tools/SelectionTool.js | 2 | ||||
-rwxr-xr-x | js/tools/TranslateObject3DTool.js | 9 | ||||
-rwxr-xr-x | js/tools/drawing-tool-base.js | 5 |
5 files changed, 75 insertions, 25 deletions
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 31e3e540..5a36e367 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -1949,6 +1949,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1949 | var localPt = hitRec.getLocalPoint(); | 1949 | var localPt = hitRec.getLocalPoint(); |
1950 | var planeMat = hitRec.getPlaneMatrix(); | 1950 | var planeMat = hitRec.getPlaneMatrix(); |
1951 | var stageWorldPt; | 1951 | var stageWorldPt; |
1952 | |||
1953 | /* | ||
1952 | if(inGlobalMode) | 1954 | if(inGlobalMode) |
1953 | { | 1955 | { |
1954 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); | 1956 | stageWorldPt = MathUtils.transformPoint(localPt,planeMat); |
@@ -1957,6 +1959,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1957 | { | 1959 | { |
1958 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | 1960 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); |
1959 | } | 1961 | } |
1962 | */ | ||
1963 | stageWorldPt = viewUtils.postViewToStageWorld( MathUtils.transformPoint(localPt,planeMat), elt ); | ||
1960 | 1964 | ||
1961 | /* | 1965 | /* |
1962 | // get a working plane parallel to the current working plane through the stage world point | 1966 | // get a working plane parallel to the current working plane through the stage world point |
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js index 36d6f8c4..5dc099ee 100755 --- a/js/helper-classes/3D/view-utils.js +++ b/js/helper-classes/3D/view-utils.js | |||
@@ -124,35 +124,81 @@ exports.ViewUtils = Montage.create(Component, { | |||
124 | } | 124 | } |
125 | }, | 125 | }, |
126 | 126 | ||
127 | getNormalToUnprojectedElementPlane: { | 127 | /* |
128 | value: function( elt ) { | 128 | * This method will return a normal to a plane containing the Z axis and either the |
129 | var mat = this.getMatrixFromElement(elt); | 129 | * x or y axis of the element. |
130 | */ | ||
131 | getNormalToUnprojectedElementPlane: | ||
132 | { | ||
133 | value: function( elt, axis, localMode ) | ||
134 | { | ||
135 | var objMat = this.getMatrixFromElement(elt); | ||
136 | var objMatInv = glmat4.inverse( objMat, [] ); | ||
130 | 137 | ||
131 | var xVec = [mat[0], mat[1], mat[2], mat[3]]; | 138 | var xVec = [1,0,0]; |
132 | var yVec = [mat[4], mat[5], mat[6], mat[7]]; | 139 | var yVec = [0,1,0]; |
140 | var zVec = [0,0,1]; | ||
133 | 141 | ||
134 | var stage = this.application.ninja.currentDocument.documentRoot; | 142 | var stage = this.application.ninja.currentDocument.documentRoot; |
135 | var stageMat = this.getMatrixFromElement(stage); | 143 | var stageMat = this.getMatrixFromElement(stage); |
136 | var stagePlane = [stageMat[8], stageMat[9], stageMat[10], stageMat[11]]; | ||
137 | 144 | ||
145 | var mat = glmat4.multiply( stageMat, objMat, [] ); | ||
146 | |||
147 | var viewDir; | ||
148 | if (localMode) | ||
149 | { | ||
150 | var matInv = glmat4.inverse( mat, [] ); | ||
151 | viewDir = MathUtils.transformVector( [0,0,1], matInv ); | ||
152 | } | ||
153 | else | ||
154 | { | ||
155 | var stageInv = glmat4.inverse( stageMat, [] ); | ||
156 | viewDir = MathUtils.transformVector( [0,0,1], stageInv ); | ||
157 | } | ||
158 | |||
159 | /* | ||
138 | if (elt === stage) | 160 | if (elt === stage) |
139 | { | 161 | { |
140 | xVec = [1,0,0]; | 162 | xVec = [1,0,0]; |
141 | yVec = [0,1,0]; | 163 | yVec = [0,1,0]; |
142 | } | 164 | } |
165 | */ | ||
143 | 166 | ||
144 | var xDot = Math.abs(vecUtils.vecDot(3, xVec, stagePlane)); | 167 | var plane; |
145 | var yDot = Math.abs(vecUtils.vecDot(3, yVec, stagePlane)); | 168 | var xDot, yDot, zDot; |
169 | switch (axis) | ||
170 | { | ||
171 | case 0: | ||
172 | yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir)); | ||
173 | zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir)); | ||
174 | if(yDot > zDot) | ||
175 | plane = vecUtils.vecCross( 3, zVec, xVec ); | ||
176 | else | ||
177 | plane = vecUtils.vecCross( 3, yVec, xVec ); | ||
178 | break; | ||
179 | |||
180 | case 1: | ||
181 | xDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir)); | ||
182 | zDot = Math.abs(vecUtils.vecDot(3, zVec, viewDir)); | ||
183 | if(xDot > zDot) | ||
184 | plane = vecUtils.vecCross( 3, zVec, yVec ); | ||
185 | else | ||
186 | plane = vecUtils.vecCross( 3, xVec, yVec ); | ||
187 | break; | ||
188 | break; | ||
189 | |||
190 | case 2: | ||
191 | xDot = Math.abs(vecUtils.vecDot(3, xVec, viewDir)); | ||
192 | yDot = Math.abs(vecUtils.vecDot(3, yVec, viewDir)); | ||
193 | |||
194 | if(xDot > yDot) | ||
195 | plane = vecUtils.vecCross( 3, yVec, zVec ); | ||
196 | else | ||
197 | plane = vecUtils.vecCross( 3, xVec, zVec ); | ||
198 | break; | ||
199 | } | ||
146 | 200 | ||
147 | var plane; | 201 | if (localMode) plane = MathUtils.transformVector( plane, objMat ); |
148 | if(xDot > yDot) | ||
149 | { | ||
150 | plane = xVec; | ||
151 | } | ||
152 | else | ||
153 | { | ||
154 | plane = yVec; | ||
155 | } | ||
156 | 202 | ||
157 | // The translation value is a point on the plane | 203 | // The translation value is a point on the plane |
158 | this.pushViewportObj( elt ); | 204 | this.pushViewportObj( elt ); |
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js index d3e4ebf9..5c8b15ae 100755 --- a/js/tools/SelectionTool.js +++ b/js/tools/SelectionTool.js | |||
@@ -505,7 +505,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, { | |||
505 | delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); | 505 | delta = vecUtils.vecSubtract( 3, data.pt1, data.pt0 ); |
506 | delta[0] = ~~delta[0]; | 506 | delta[0] = ~~delta[0]; |
507 | delta[1] = ~~delta[1]; | 507 | delta[1] = ~~delta[1]; |
508 | delta[2] = 0; | 508 | //delta[2] = 0; |
509 | var transMat = Matrix.Translation( delta ); | 509 | var transMat = Matrix.Translation( delta ); |
510 | this._moveElements(transMat); | 510 | this._moveElements(transMat); |
511 | } | 511 | } |
diff --git a/js/tools/TranslateObject3DTool.js b/js/tools/TranslateObject3DTool.js index b4f55bd9..f8b32d23 100755 --- a/js/tools/TranslateObject3DTool.js +++ b/js/tools/TranslateObject3DTool.js | |||
@@ -54,10 +54,10 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
54 | else | 54 | else |
55 | { | 55 | { |
56 | this._delta = null; | 56 | this._delta = null; |
57 | // special case for z-translation | 57 | //if(this._handleMode === 2) |
58 | if(this._handleMode === 2) | ||
59 | { | 58 | { |
60 | this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target); | 59 | this._dragPlane = viewUtils.getNormalToUnprojectedElementPlane(this._target, this._handleMode, this._inLocalMode); |
60 | //console.log( "dragPlane: " + this._dragPlane ); | ||
61 | snapManager.setupDragPlaneFromPlane(this._dragPlane); | 61 | snapManager.setupDragPlaneFromPlane(this._dragPlane); |
62 | do3DSnap = false; | 62 | do3DSnap = false; |
63 | 63 | ||
@@ -86,7 +86,8 @@ exports.TranslateObject3DTool = Montage.create(Translate3DToolBase, { | |||
86 | var elt = this.application.ninja.stage.getElement(event, true); | 86 | var elt = this.application.ninja.stage.getElement(event, true); |
87 | if(elt && (elt !== hitRec.getElement())) | 87 | if(elt && (elt !== hitRec.getElement())) |
88 | { | 88 | { |
89 | hitRec = snapManager.findHitRecordForElement(elt); | 89 | var otherSnap = snapManager.findHitRecordForElement(elt); |
90 | if (otherSnap) hitRec = otherSnap; | ||
90 | } | 91 | } |
91 | if(elt === this.application.ninja.currentSelectedContainer) | 92 | if(elt === this.application.ninja.currentSelectedContainer) |
92 | { | 93 | { |
diff --git a/js/tools/drawing-tool-base.js b/js/tools/drawing-tool-base.js index 376b3a27..84641754 100755 --- a/js/tools/drawing-tool-base.js +++ b/js/tools/drawing-tool-base.js | |||
@@ -36,9 +36,8 @@ exports.DrawingToolBase = Montage.create(Montage, { | |||
36 | * 2 - Y value converted to screen point | 36 | * 2 - Y value converted to screen point |
37 | */ | 37 | */ |
38 | getInitialSnapPoint: { | 38 | getInitialSnapPoint: { |
39 | value: function(x, y, shapeCanvas) { | 39 | value: function(x, y, shapeCanvas) |
40 | snapManager.clearDragPlane(); | 40 | { |
41 | |||
42 | // update the snap settings | 41 | // update the snap settings |
43 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); | 42 | snapManager.enableSnapAlign( snapManager.snapAlignEnabledAppLevel() ); |
44 | snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() ); | 43 | snapManager.enableElementSnap( snapManager.elementSnapEnabledAppLevel() ); |