diff options
author | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-23 14:34:58 -0700 |
commit | c21db7f1e4a0582777bdb5366df5d023a915b779 (patch) | |
tree | c4d29cb4686101d4a480ae836d20187879cf5400 /js/helper-classes/3D | |
parent | 3ed95247e9ea4b0a7833401ed6809647b7c4acbf (diff) | |
parent | 1a7e347810401e6262d9d7bad1c3583e6773993b (diff) | |
download | ninja-c21db7f1e4a0582777bdb5366df5d023a915b779.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/data/panels-data.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 4 | ||||
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 166 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 75 |
3 files changed, 118 insertions, 127 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index a6d2d899..bf48a723 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -124,7 +124,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
124 | this._eltArray = []; | 124 | this._eltArray = []; |
125 | this._planesArray = []; | 125 | this._planesArray = []; |
126 | this.setDrawingSurfaceElement(stage.canvas); | 126 | this.setDrawingSurfaceElement(stage.canvas); |
127 | this.setSourceSpaceElement( stage.stageDeps.currentStage ); | 127 | this.setSourceSpaceElement( this.application.ninja.currentDocument.documentRoot); |
128 | this.setWorkingPlane( [0,0,1,0] ); | 128 | this.setWorkingPlane( [0,0,1,0] ); |
129 | 129 | ||
130 | //Loop through all the top-level children of the current document and call drawUtils.addElement on them | 130 | //Loop through all the top-level children of the current document and call drawUtils.addElement on them |
@@ -138,7 +138,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
138 | l, | 138 | l, |
139 | t, | 139 | t, |
140 | plane, | 140 | plane, |
141 | elt | 141 | elt; |
142 | for(i=0; i<len; i++) { | 142 | for(i=0; i<len; i++) { |
143 | elt = documentRootChildren[i]; | 143 | elt = documentRootChildren[i]; |
144 | plane = this.addElement(elt); | 144 | plane = this.addElement(elt); |
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 2e8020d3..0f456e1e 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -21,7 +21,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
21 | /////////////////////////////////////////////////////////////////////// | 21 | /////////////////////////////////////////////////////////////////////// |
22 | // Instance variables | 22 | // Instance variables |
23 | /////////////////////////////////////////////////////////////////////// | 23 | /////////////////////////////////////////////////////////////////////// |
24 | currentStage: { value: null, writable: true }, | ||
25 | drawingCanvas: { value: null, writable: true}, | 24 | drawingCanvas: { value: null, writable: true}, |
26 | 25 | ||
27 | // we keep a stack of working planes to facilitate working on other planes temporarily | 26 | // we keep a stack of working planes to facilitate working on other planes temporarily |
@@ -84,14 +83,14 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
84 | popWorkingPlane : { value: function () { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }}, | 83 | popWorkingPlane : { value: function () { workingPlane = this._workingPlaneStack.pop(); return workingPlane; }}, |
85 | 84 | ||
86 | getStageWidth : { value: function () { | 85 | getStageWidth : { value: function () { |
87 | return parseInt(this.currentStage.offsetWidth); | 86 | return parseInt(this.application.ninja.currentDocument.documentRoot.offsetWidth); |
88 | }}, | 87 | }}, |
89 | 88 | ||
90 | getStageHeight : { value: function () { | 89 | getStageHeight : { value: function () { |
91 | return parseInt(this.currentStage.offsetHeight); | 90 | return parseInt(this.application.ninja.currentDocument.documentRoot.offsetHeight); |
92 | }}, | 91 | }}, |
93 | 92 | ||
94 | getStage : { value: function() { return this.currentStage; }}, | 93 | getStage : { value: function() { return this.application.ninja.currentDocument.documentRoot; }}, |
95 | 94 | ||
96 | getGridVertexHitRad : { value: function() { return this._gridVertexHitRad; }}, | 95 | getGridVertexHitRad : { value: function() { return this._gridVertexHitRad; }}, |
97 | getGridEdgeHitRad : { value: function() { return this._gridEdgeHitRad; }}, | 96 | getGridEdgeHitRad : { value: function() { return this._gridEdgeHitRad; }}, |
@@ -185,12 +184,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
185 | } | 184 | } |
186 | }, | 185 | }, |
187 | 186 | ||
188 | setCurrentStage: { | ||
189 | value: function(stage) { | ||
190 | this.currentStage = stage; | ||
191 | } | ||
192 | }, | ||
193 | |||
194 | snap : { | 187 | snap : { |
195 | value: function (xScreen, yScreen, snap3D, quadPt) | 188 | value: function (xScreen, yScreen, snap3D, quadPt) |
196 | { | 189 | { |
@@ -230,64 +223,22 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
230 | else | 223 | else |
231 | parentPt = [xScreen, yScreen, 0.0]; | 224 | parentPt = [xScreen, yScreen, 0.0]; |
232 | 225 | ||
233 | var eyePt = []; | 226 | if (!snap3D && this._hasDragPlane) |
234 | var vec = viewUtils.parentToChildVec(parentPt, stage, eyePt); | 227 | this.activateDragPlane(); |
235 | if (vec) | 228 | |
236 | { | 229 | var hitRec = this.snapToStage( parentPt, quadPt ); |
237 | // activate the drag working plane | 230 | |
238 | if (!snap3D && this.hasDragPlane()) | 231 | // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed |
239 | this.activateDragPlane(); | 232 | if (this.gridSnapEnabled()) |
240 | 233 | this.snapToGrid( hitRec ); | |
241 | // project to the working plane | 234 | |
242 | var currentWorkingPlane = workingPlane.slice(0); | 235 | // save the hit record |
243 | var wp = currentWorkingPlane.slice(0); | 236 | hitRecArray.push( hitRec ); |
244 | var mat = viewUtils.getMatrixFromElement(stage); | 237 | |
245 | wp = MathUtils.transformPlane(wp, mat); | 238 | // restore the original working plane |
246 | var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp); | 239 | if (!snap3D && this.hasDragPlane()) |
247 | if (projPt) | 240 | this.deactivateDragPlane(); |
248 | { | 241 | |
249 | // the local point gets stored in the coordinate space of the plane | ||
250 | var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane)); | ||
251 | projPt[3] = 1.0; | ||
252 | //var planeToViewMat = mat.multiply(wpMat); | ||
253 | var planeToViewMat = glmat4.multiply(mat, wpMat, []); | ||
254 | //var viewToPlaneMat = planeToViewMat.inverse(); | ||
255 | var viewToPlaneMat = glmat4.inverse( planeToViewMat, [] ); | ||
256 | var planePt = projPt.slice(0); | ||
257 | planePt[3] = 1.0; | ||
258 | //planePt = viewToPlaneMat.multiply(planePt); | ||
259 | planePt = glmat4.multiplyVec3( viewToPlaneMat, planePt ); | ||
260 | |||
261 | // get the screen position of the projected point | ||
262 | viewUtils.setViewportObj(stage); | ||
263 | var offset = viewUtils.getElementOffset(stage); | ||
264 | offset[2] = 0; | ||
265 | var scrPt = viewUtils.viewToScreen(projPt); | ||
266 | //scrPt = scrPt.add(offset); | ||
267 | scrPt = vecUtils.vecAdd(3, scrPt, offset); | ||
268 | |||
269 | // create the hit record | ||
270 | var hitRec = Object.create(HitRecord);//new HitRecord(); | ||
271 | hitRec.setLocalPoint(planePt); | ||
272 | hitRec.setPlaneMatrix( wpMat ); | ||
273 | hitRec.setScreenPoint(scrPt); | ||
274 | hitRec.setPlane(currentWorkingPlane); | ||
275 | hitRec.setType( hitRec.SNAP_TYPE_STAGE ); | ||
276 | hitRec.setElt( stage ); | ||
277 | if (quadPt) hitRec.setUseQuadPoint( true ); | ||
278 | |||
279 | // try snapping to the 3D grid, or to the stage boundaries if the grid is not displayed | ||
280 | if (this.gridSnapEnabled()) | ||
281 | this.snapToGrid( hitRec ); | ||
282 | |||
283 | // save the hit record | ||
284 | hitRecArray.push( hitRec ); | ||
285 | |||
286 | // restore the original working plane | ||
287 | if (!snap3D && this.hasDragPlane()) | ||
288 | this.deactivateDragPlane(); | ||
289 | } | ||
290 | } | ||
291 | } //if (hitRecArray.length == 0) | 242 | } //if (hitRecArray.length == 0) |
292 | 243 | ||
293 | var rtnHit; | 244 | var rtnHit; |
@@ -312,6 +263,62 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
312 | } | 263 | } |
313 | }, | 264 | }, |
314 | 265 | ||
266 | snapToStage: | ||
267 | { | ||
268 | value: function( scrPt, quadPt ) | ||
269 | { | ||
270 | var stage = this.getStage(); | ||
271 | var l2g = viewUtils.getLocalToGlobalMatrix( stage ); | ||
272 | var g2l = glmat4.inverse( l2g, [] ); | ||
273 | |||
274 | var pt0 = scrPt.slice(), pt1 = scrPt.slice(); | ||
275 | pt0[2] = 0.0; pt1[2] = 10; | ||
276 | |||
277 | var localPt0 = MathUtils.transformAndDivideHomogeneousPoint( pt0, g2l ), | ||
278 | localPt1 = MathUtils.transformAndDivideHomogeneousPoint( pt1, g2l ); | ||
279 | |||
280 | var stageWorldPt0 = viewUtils.localToStageWorld( localPt0, stage ), | ||
281 | stageWorldPt1 = viewUtils.localToStageWorld( localPt1, stage ); | ||
282 | var vec = vecUtils.vecSubtract( 3, stageWorldPt1, stageWorldPt0 ); | ||
283 | |||
284 | var ptOnWorkingPlane = MathUtils.vecIntersectPlane(stageWorldPt0, vec, workingPlane); | ||
285 | |||
286 | var wpMat = drawUtils.getPlaneToWorldMatrix(workingPlane, MathUtils.getPointOnPlane(workingPlane)), | ||
287 | wpMatInv = glmat4.inverse( wpMat, [] ); | ||
288 | var localPt = MathUtils.transformPoint( ptOnWorkingPlane, wpMatInv ); | ||
289 | |||
290 | // create the hit record | ||
291 | var hitRec = Object.create(HitRecord); | ||
292 | hitRec.setLocalPoint( localPt ); | ||
293 | hitRec.setPlaneMatrix( wpMat ); | ||
294 | hitRec.setScreenPoint(scrPt); | ||
295 | hitRec.setPlane(workingPlane); | ||
296 | hitRec.setType( hitRec.SNAP_TYPE_STAGE ); | ||
297 | hitRec.setElt( stage ); | ||
298 | if (quadPt) hitRec.setUseQuadPoint( true ); | ||
299 | |||
300 | // DEBUG CODE | ||
301 | // check that the point is on the working plane | ||
302 | var tmpStageWorldPt = hitRec.calculateStageWorldPoint(); | ||
303 | var err = vecUtils.vecDot(3, tmpStageWorldPt, workingPlane) + workingPlane[3]; | ||
304 | if (MathUtils.fpSign(err) !== 0) | ||
305 | console.log( "snapToStage (function) not on working plane: " + err ); | ||
306 | ////////////////////////////////////////////////////////////////////// | ||
307 | |||
308 | var calculatedScreenPt = hitRec.calculateScreenPoint(); | ||
309 | hitRec.setScreenPoint(calculatedScreenPt); | ||