diff options
Diffstat (limited to 'js/helper-classes')
-rwxr-xr-x | js/helper-classes/3D/draw-utils.js | 31 | ||||
-rwxr-xr-x | js/helper-classes/3D/hit-record.js | 10 | ||||
-rwxr-xr-x | js/helper-classes/3D/snap-manager.js | 32 | ||||
-rwxr-xr-x | js/helper-classes/3D/view-utils.js | 250 |
4 files changed, 207 insertions, 116 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js index a200268e..42e0cfa9 100755 --- a/js/helper-classes/3D/draw-utils.js +++ b/js/helper-classes/3D/draw-utils.js | |||
@@ -112,6 +112,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
112 | this.eventManager.addEventListener("elementsRemoved", this, false); | 112 | this.eventManager.addEventListener("elementsRemoved", this, false); |
113 | this.eventManager.addEventListener("elementChange", this, false); | 113 | this.eventManager.addEventListener("elementChange", this, false); |
114 | this.eventManager.addEventListener("closeDocument", this, false); | 114 | this.eventManager.addEventListener("closeDocument", this, false); |
115 | this.eventManager.addEventListener("elementReplaced", this, false); | ||
115 | } | 116 | } |
116 | }, | 117 | }, |
117 | 118 | ||
@@ -170,13 +171,41 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, { | |||
170 | this.removeElement(element); | 171 | this.removeElement(element); |
171 | }, this); | 172 | }, this); |
172 | } else { | 173 | } else { |
173 | this.removeElement(elements._element || elements); | 174 | this.removeElement(elements); |
174 | } | 175 | } |
175 | 176 | ||
176 | this.drawWorkingPlane(); | 177 | this.drawWorkingPlane(); |
177 | } | 178 | } |
178 | }, | 179 | }, |
179 | 180 | ||
181 | handleElementReplaced: { | ||
182 | value: function(event) { | ||
183 | var oldElement = event.detail.data.oldChild; | ||
184 | var newElement = event.detail.data.newChild; | ||
185 | |||
186 | // check if we already know about this object | ||
187 | var n = this._eltArray.length, | ||
188 | plane; | ||
189 | for (var i=0; i<n; i++) { | ||
190 | if (oldElement === this._eltArray[i]) { | ||
191 | this._eltArray[i] = newElement; | ||
192 | plane = this._planesArray[i]; | ||
193 | break; | ||
194 | } | ||
195 | } | ||
196 | |||
197 | if(!plane) { | ||
198 | this._eltArray.push( newElement ); | ||
199 | plane = Object.create(this.ElementPlanes, {}); | ||
200 | this._planesArray.push( plane ); | ||
201 | } | ||
202 | |||
203 | plane.setElement( newElement ); | ||
204 | plane.init(); | ||
205 | newElement.elementModel.props3D.elementPlane = plane; | ||
206 | } | ||
207 | }, | ||
208 | |||
180 | _shouldUpdatePlanes: { | 209 | _shouldUpdatePlanes: { |
181 | value: function(props) { | 210 | value: function(props) { |
182 | if(!props) { | 211 | if(!props) { |
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js index 6094dae1..d72e33bd 100755 --- a/js/helper-classes/3D/hit-record.js +++ b/js/helper-classes/3D/hit-record.js | |||
@@ -232,7 +232,15 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype, | |||
232 | var elt = this.getElt(); | 232 | var elt = this.getElt(); |
233 | viewUtils.pushViewportObj( elt ); | 233 | viewUtils.pushViewportObj( elt ); |
234 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); | 234 | var viewPt = viewUtils.screenToView( scrPt[0], scrPt[1], scrPt[2] ); |
235 | var eyePt = viewUtils.getEyePoint(); | 235 | var eyePt; |
236 | if(viewUtils.getPerspectiveDistFromElement(elt)) | ||
237 | { | ||
238 | eyePt = viewUtils.getEyePoint(); | ||
239 | } | ||
240 | else | ||
241 | { | ||
242 | eyePt = [viewPt[0], viewPt[1], 1400]; | ||
243 | } | ||
236 | var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane ); | 244 | var projPt = MathUtils.vecIntersectPlane( eyePt, MathUtils.vecSubtract(viewPt,eyePt), plane ); |
237 | 245 | ||
238 | return projPt; | 246 | return projPt; |
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index 8eafa7e9..5735a145 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js | |||
@@ -124,6 +124,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
124 | initialize: { | 124 | initialize: { |
125 | value: function() { | 125 | value: function() { |
126 | this.eventManager.addEventListener("elementsRemoved", this, false); | 126 | this.eventManager.addEventListener("elementsRemoved", this, false); |
127 | this.eventManager.addEventListener("elementReplaced", this, false); | ||
127 | } | 128 | } |
128 | }, | 129 | }, |
129 | 130 | ||
@@ -170,15 +171,19 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
170 | if(Array.isArray(elements)) { | 171 | if(Array.isArray(elements)) { |
171 | elements = Array.prototype.slice.call(elements, 0); | 172 | elements = Array.prototype.slice.call(elements, 0); |
172 | elements.forEach(function(element) { | 173 | elements.forEach(function(element) { |
173 | element = element._element || element; | ||
174 | self.removeElementFrom2DCache(element); | 174 | self.removeElementFrom2DCache(element); |
175 | }); | 175 | }); |
176 | } else { | 176 | } else { |
177 | this.removeElementFrom2DCache(elements._element || elements); | 177 | this.removeElementFrom2DCache(elements); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | }, | 180 | }, |
181 | 181 | ||
182 | handleElementReplaced: { | ||
183 | value: function(event) { | ||
184 | this._isCacheInvalid = true; | ||
185 | } | ||
186 | }, | ||
182 | 187 | ||
183 | setCurrentStage: { | 188 | setCurrentStage: { |
184 | value: function(stage) { | 189 | value: function(stage) { |
@@ -224,7 +229,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
224 | parentPt = [quadPt[0], quadPt[1], 0.0]; | 229 | parentPt = [quadPt[0], quadPt[1], 0.0]; |
225 | else | 230 | else |
226 | parentPt = [xScreen, yScreen, 0.0]; | 231 | parentPt = [xScreen, yScreen, 0.0]; |
227 | var vec = viewUtils.parentToChildVec(parentPt, stage); | 232 | |
233 | var eyePt = []; | ||
234 | var vec = viewUtils.parentToChildVec(parentPt, stage, eyePt); | ||
228 | if (vec) | 235 | if (vec) |
229 | { | 236 | { |
230 | // activate the drag working plane | 237 | // activate the drag working plane |
@@ -236,7 +243,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
236 | var wp = currentWorkingPlane.slice(0); | 243 | var wp = currentWorkingPlane.slice(0); |
237 | var mat = viewUtils.getMatrixFromElement(stage); | 244 | var mat = viewUtils.getMatrixFromElement(stage); |
238 | wp = MathUtils.transformPlane(wp, mat); | 245 | wp = MathUtils.transformPlane(wp, mat); |
239 | var eyePt = viewUtils.getEyePoint(); | ||
240 | var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp); | 246 | var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp); |
241 | if (projPt) | 247 | if (projPt) |
242 | { | 248 | { |
@@ -300,7 +306,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
300 | this.deactivateDragPlane(); | 306 | this.deactivateDragPlane(); |
301 | 307 | ||
302 | this.setLastHit( rtnHit ); | 308 | this.setLastHit( rtnHit ); |
303 | //rtnHit.test(); // DEBUG CODE. REMOVE THIS | 309 | |
310 | rtnHit.test(); // DEBUG CODE. REMOVE THIS | ||
304 | return rtnHit; | 311 | return rtnHit; |
305 | } | 312 | } |
306 | }, | 313 | }, |
@@ -705,8 +712,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
705 | var wp = currentWorkingPlane.slice(0); | 712 | var wp = currentWorkingPlane.slice(0); |
706 | var mat = viewUtils.getMatrixFromElement(stage); | 713 | var mat = viewUtils.getMatrixFromElement(stage); |
707 | wp = MathUtils.transformPlane(wp, mat); | 714 | wp = MathUtils.transformPlane(wp, mat); |
708 | var eyePt = viewUtils.getEyePoint(); | 715 | var eyePt = []; |
709 | var vec = viewUtils.parentToChildVec(gPt, stage); | 716 | var vec = viewUtils.parentToChildVec(gPt, stage, eyePt); |
710 | var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp); | 717 | var projPt = MathUtils.vecIntersectPlane(eyePt, vec, wp); |
711 | var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane)); | 718 | var wpMat = drawUtils.getPlaneToWorldMatrix(currentWorkingPlane, MathUtils.getPointOnPlane(currentWorkingPlane)); |
712 | projPt[3] = 1.0; | 719 | projPt[3] = 1.0; |
@@ -1063,8 +1070,9 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1063 | // Snapping is done in screen space, so convert the bounds from | 1070 | // Snapping is done in screen space, so convert the bounds from |
1064 | // local element space to global screen space | 1071 | // local element space to global screen space |
1065 | var bounds3D = new Array(); | 1072 | var bounds3D = new Array(); |
1073 | var eltMat = viewUtils.getLocalToGlobalMatrix( elt ); | ||
1066 | for (var i=0; i<4; i++) | 1074 | for (var i=0; i<4; i++) |
1067 | bounds3D[i] = viewUtils.localToGlobal( bounds[i], elt ); | 1075 | bounds3D[i] = viewUtils.localToGlobal2(bounds[i], eltMat); |
1068 | 1076 | ||
1069 | var hitRec = this.snapToScreenBounds( elt, globalScrPt, bounds, bounds3D ); | 1077 | var hitRec = this.snapToScreenBounds( elt, globalScrPt, bounds, bounds3D ); |
1070 | 1078 | ||
@@ -1348,7 +1356,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1348 | var offset = viewUtils.getElementOffset( elt ); | 1356 | var offset = viewUtils.getElementOffset( elt ); |
1349 | MathUtils.makeDimension3( offset ); | 1357 | MathUtils.makeDimension3( offset ); |
1350 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1358 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
1351 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1359 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
1352 | 1360 | ||
1353 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1361 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
1354 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) | 1362 | if (dist < this.ELEMENT_VERTEX_HIT_RAD) |
@@ -1386,7 +1394,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1386 | var offset = viewUtils.getElementOffset( elt ); | 1394 | var offset = viewUtils.getElementOffset( elt ); |
1387 | MathUtils.makeDimension3( offset ); | 1395 | MathUtils.makeDimension3( offset ); |
1388 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); | 1396 | var parentPt = vecUtils.vecAdd(3, scrPt, offset ); |
1389 | var globalPt = viewUtils.localToGlobal( parentPt, elt.parentElement ); | 1397 | var globalPt = viewUtils.localToGlobal( parentPt, elt.offsetParent ); |
1390 | 1398 | ||
1391 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); | 1399 | var dist = vecUtils.vecDist(2, globalPt, targetScrPt ); |
1392 | if (dist < this.ELEMENT_EDGE_HIT_RAD) | 1400 | if (dist < this.ELEMENT_EDGE_HIT_RAD) |
@@ -1439,7 +1447,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { | |||
1439 | var offset = viewUtils.getElementOffset( elt ); | 1447 | var offset = viewUtils.getElementOffset( elt ); |
1440 | MathUtils.makeDimension3( offset ); | 1448 |