From e28eb9158a50d7e6d97dbc68066e591ac600c241 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 5 Jun 2012 21:40:44 -0700 Subject: removing all model creators. The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito --- js/helper-classes/3D/snap-manager.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'js/helper-classes/3D/snap-manager.js') diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index e3756f32..a8b6e739 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js @@ -481,10 +481,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { { var snapRec = this._elementCache[i]; var elt = snapRec.getElement(); - if (elt.elementModel) - elt.elementModel.isIn2DSnapCache = false; - else - console.log( "element in the 2D cache does not have an elementModel" ); + elt.elementModel.isIn2DSnapCache = false; + } this._elementCache = null; @@ -541,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { snapRec.init( elt ); this._elementCache.push( snapRec ); - if (!elt.elementModel) - { - NJUtils.makeModelFromElement(elt); - } elt.elementModel.isIn2DSnapCache = true; } else if (elt.elementModel) @@ -613,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { snapRec.init( elt ); this._elementCache.push( snapRec ); - if (!elt.elementModel) - { - NJUtils.makeModelFromElement(elt); - } elt.elementModel.isIn2DSnapCache = true; } else if (elt.elementModel) -- cgit v1.2.3 From 806974142d44afdd23534bf2d18eff0a8e701e0c Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 8 Jun 2012 16:59:59 -0700 Subject: rewrite: currentSelectedContainer -> domContainer Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito --- js/helper-classes/3D/snap-manager.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/helper-classes/3D/snap-manager.js') diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js index a8b6e739..0157140f 100755 --- a/js/helper-classes/3D/snap-manager.js +++ b/js/helper-classes/3D/snap-manager.js @@ -496,7 +496,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { this._elementCache = new Array; // var stage = this.getStage(); - var stage = this.application.ninja.currentSelectedContainer || this.getStage(); + var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage(); this.hLoadElementCache( stage, plane, 0 ); this._isCacheInvalid = false; @@ -987,7 +987,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { value: function( screenPt, hitRecs ) { // start at the stage. // var stage = this.getStage(); - var stage = this.application.ninja.currentSelectedContainer || this.getStage(); + var stage = this.application.ninja.currentDocument.model.domContainer || this.getStage(); // the root should be the 'view' canvas, so the first matrix is the camera viewUtils.setViewportObj( stage ); @@ -1009,7 +1009,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, { } // hit test the current object var hit; - var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentSelectedContainer) && (elt.nodeName === 'CANVAS')); + var snapToStage = ((depth === 0) && (elt === this.application.ninja.currentDocument.model.domContainer) && (elt.nodeName === 'CANVAS')); if ((depth > 0) || snapToStage) // don't snap to the root unles we are working inside a canvas { // if the element is in the 2D cache snapping is done there -- cgit v1.2.3