From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/tools/Translate3DToolBase.js | 426 ++++++++++++++++++++-------------------- 1 file changed, 213 insertions(+), 213 deletions(-) (limited to 'js/tools/Translate3DToolBase.js') diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 00408b6e..46e0b49c 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js @@ -41,16 +41,16 @@ var Montage = require("montage/core/core").Montage, exports.Translate3DToolBase = Montage.create(ModifierToolBase, { - _inLocalMode: { value: true, enumerable: true }, - _clickedOnStage: { value: false }, + _inLocalMode: { value: true, enumerable: true }, + _clickedOnStage: { value: false }, - HandleDoubleClick : { - value : function() { - } - }, + HandleDoubleClick : { + value : function() { + } + }, modifyElements : { - value : function(data, event) + value : function(data, event) { //console.log( "modifyElements, data: " + data.pt0 + " => " + data.pt1 ); @@ -94,7 +94,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, this._delta = delta.slice(0); } - //console.log( "modifyElements delta: " + delta ); + //console.log( "modifyElements delta: " + delta ); var transMat = Matrix.Translation( delta ); //console.log( "Translate: " + delta ); @@ -107,11 +107,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, this._translateGlobally(transMat); } } - }, + }, - Reset: { - value: function() { + Reset: { + value: function() { var mat, iMat, dist, mod3dObject = [], self = this; this.application.ninja.selectedElements.forEach(function(element) { @@ -133,60 +133,60 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, ElementsMediator.set3DProperties(mod3dObject, "Change", "rotateTool"); - this.isDrawing = false; + this.isDrawing = false; this.endDraw(event); // Need to force stage to draw immediately so the new selection center is calculated this.application.ninja.stage.draw(); // And captureSelectionDrawn to draw the transform handles this.captureSelectionDrawn(null); - } - }, + } + }, - // We will only translate single elements locally - _translateLocally: { - value: function (transMat) { + // We will only translate single elements locally + _translateLocally: { + value: function (transMat) { //console.log( "_translateLocally, startMat: " + this._startMat ); //console.log( "_translateLocally, transMat: " + transMat ); //console.log( "_translateLocally, startMat: " + this._startMat + ", transMat: " + transMat ); - var mat = glmat4.multiply(this._startMat, transMat, []); - viewUtils.setMatrixForElement( this._target, mat, true ); - if(this._mode !== 1) - { - this._startMat = mat; - } - } - }, - - _translateGlobally: { - value: function (transMat) { + var mat = glmat4.multiply(this._startMat, transMat, []); + viewUtils.setMatrixForElement( this._target, mat, true ); + if(this._mode !== 1) + { + this._startMat = mat; + } + } + }, + + _translateGlobally: { + value: function (transMat) { //console.log( "_translateGlobally, transMat: " + transMat ); - var selectedElements = this.application.ninja.selectedElements; + var selectedElements = this.application.ninja.selectedElements; var len = selectedElements.length, self = this, - target = selectedElements[0], - curMat = viewUtils.getMatrixFromElement( target ), + target = selectedElements[0], + curMat = viewUtils.getMatrixFromElement( target ), matInv = glmat4.inverse(this._startMat, []), nMat = glmat4.multiply(transMat, this._startMat, [] ); -// qMat = glmat4.multiply(matInv, nMat, []); +// qMat = glmat4.multiply(matInv, nMat, []); if(this._mode === 1) { - if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); + if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); var curInv = glmat4.inverse( curMat, [] ); transMat = glmat4.multiply( nMat, curInv, [] ); } - var shouldUpdateStartMat = true; + var shouldUpdateStartMat = true; - if(this._clickedOnStage || ((this._handleMode === 2) && (len > 1))) - { - shouldUpdateStartMat = false; - } - else if(this._mode !== 1) - { - this._startMat = nMat; - } + if(this._clickedOnStage || ((this._handleMode === 2) && (len > 1))) + { + shouldUpdateStartMat = false; + } + else if(this._mode !== 1) + { + this._startMat = nMat; + } selectedElements.forEach(function(element) { curMat = element.elementModel.getProperty("mat").slice(0); @@ -205,11 +205,11 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } }); - } - }, + } + }, _updateTargets: { - value: function(addToUndo) { + value: function(addToUndo) { var mod3dObject = [], self = this; this.application.ninja.selectedElements.forEach(function(element) { @@ -223,7 +223,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } }); - if(addToUndo) { + if(addToUndo) { ElementsMediator.set3DProperties(mod3dObject, "Change", "translateTool"); if(this._origin && this._delta) { @@ -243,54 +243,54 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, element.elementModel.setProperty("dist", viewUtils.getPerspectiveDistFromElement(element)); }); - } - }, - - HandleAltKeyDown: { - value: function(event) { - this._inLocalMode = !this._inLocalMode; - this.DrawHandles(); - } - }, - - HandleAltKeyUp: { - value: function(event) { - this._inLocalMode = !this._inLocalMode; - this.DrawHandles(); - } - }, - - handleScroll: { - value: function(event) { - this.captureSelectionDrawn(null); - } - }, - - _updateHandlesOrigin: { - value: function () { - var ctr; - - var len = this.application.ninja.selectedElements.length; - if(len > 0) - { - if(len === 1) - { - var item = this._target; - viewUtils.pushViewportObj( item ); - ctr = viewUtils.getCenterOfProjection(); - viewUtils.popViewportObj(); - ctr[2] = 0; - - this._origin = viewUtils.localToGlobal(ctr, item); - } - else - { - this._origin = undefined; - this._origin = this.calculateMultiSelOrigin(); - } - } - } - }, + } + }, + + HandleAltKeyDown: { + value: function(event) { + this._inLocalMode = !this._inLocalMode; + this.DrawHandles(); + } + }, + + HandleAltKeyUp: { + value: function(event) { + this._inLocalMode = !this._inLocalMode; + this.DrawHandles(); + } + }, + + handleScroll: { + value: function(event) { + this.captureSelectionDrawn(null); + } + }, + + _updateHandlesOrigin: { + value: function () { + var ctr; + + var len = this.application.ninja.selectedElements.length; + if(len > 0) + { + if(len === 1) + { + var item = this._target; + viewUtils.pushViewportObj( item ); + ctr = viewUtils.getCenterOfProjection(); + viewUtils.popViewportObj(); + ctr[2] = 0; + + this._origin = viewUtils.localToGlobal(ctr, item); + } + else + { + this._origin = undefined; + this._origin = this.calculateMultiSelOrigin(); + } + } + } + }, captureSelectionDrawn: { value: function(event){ @@ -305,7 +305,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, viewUtils.pushViewportObj( this.target ); var eltCtr = viewUtils.getCenterOfProjection(); - eltCtr[2] = 0; + eltCtr[2] = 0; viewUtils.popViewportObj(); var ctrOffset = this.target.elementModel.props3D.m_transformCtr; @@ -315,7 +315,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } this._origin = viewUtils.localToGlobal(eltCtr, this.target); -// console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); +// console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); this._updateTargets(); //this._setTransformOrigin(false); } @@ -325,9 +325,9 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, //this._origin[0] += this.application.ninja.stage.userContentLeft; //this._origin[1] += this.application.ninja.stage.userContentTop; this._updateTargets(); - this._origin = this.calculateMultiSelOrigin(); - //this._setTransformOrigin(true); - } + this._origin = this.calculateMultiSelOrigin(); + //this._setTransformOrigin(true); + } } else { this.target = null; @@ -340,137 +340,137 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } } }, - - calculateMultiSelOrigin: - { - value: function() - { - var minPt, maxPt, i,j; - this._startOriginArray = []; - var len = this.application.ninja.selectedElements.length; - for (i = 0; i < len; i++) - { - // get the next element and localToGlobal matrix - var elt = this.application.ninja.selectedElements[i]; - var l2g = elt.elementModel.getProperty("l2g"); - - // get the element bounds in 'plane' space - var bounds = viewUtils.getElementViewBounds3D( elt ); - for (j=0; j<4; j++) - { - var localPt = bounds[j]; - //var pt = MathUtils.transformAndDivideHomogeneousPoint( localPt, l2g ); - var pt = viewUtils.localToStageWorld( localPt, elt ); - if (!minPt) - { - minPt = pt.slice(); - maxPt = pt.slice(); - } + + calculateMultiSelOrigin: + { + value: function() + { + var minPt, maxPt, i,j; + this._startOriginArray = []; + var len = this.application.ninja.selectedElements.length; + for (i = 0; i < len; i++) + { + // get the next element and localToGlobal matrix + var elt = this.application.ninja.selectedElements[i]; + var l2g = elt.elementModel.getProperty("l2g"); + + // get the element bounds in 'plane' space + var bounds = viewUtils.getElementViewBounds3D( elt ); + for (j=0; j<4; j++) + { + var localPt = bounds[j]; + //var pt = MathUtils.transformAndDivideHomogeneousPoint( localPt, l2g ); + var pt = viewUtils.localToStageWorld( localPt, elt ); + if (!minPt) + { + minPt = pt.slice(); + maxPt = pt.slice(); + } else { - minPt[0] = Math.min(minPt[0],pt[0]); minPt[1] = Math.min(minPt[1],pt[1]); minPt[2] = Math.min(minPt[2],pt[2]); - maxPt[0] = Math.max(maxPt[0],pt[0]); maxPt[1] = Math.max(maxPt[1],pt[1]); maxPt[2] = Math.max(maxPt[2],pt[2]); + minPt[0] = Math.min(minPt[0],pt[0]); minPt[1] = Math.min(minPt[1],pt[1]); minPt[2] = Math.min(minPt[2],pt[2]); + maxPt[0] = Math.max(maxPt[0],pt[0]); maxPt[1] = Math.max(maxPt[1],pt[1]); maxPt[2] = Math.max(maxPt[2],pt[2]); } - } - } - var stageWorldCtr = [ 0.5*(minPt[0] + maxPt[0]), 0.5*(minPt[1] + maxPt[1]), 0.5*(minPt[2] + maxPt[2]) ]; - var globalCtr = MathUtils.transformAndDivideHomogeneousPoint( stageWorldCtr, viewUtils.getStageWorldToGlobalMatrix() ); -// console.log( "resetting _origin to: " + this._origin ); + } + } + var stageWorldCtr = [ 0.5*(minPt[0] + maxPt[0]), 0.5*(minPt[1] + maxPt[1]), 0.5*(minPt[2] + maxPt[2]) ]; + var globalCtr = MathUtils.transformAndDivideHomogeneousPoint( stageWorldCtr, viewUtils.getStageWorldToGlobalMatrix() ); +// console.log( "resetting _origin to: " + this._origin ); - return globalCtr; - } - }, + return globalCtr; + } + }, - DrawHandles: { - value: function (delta) { - this.application.ninja.stage.clearDrawingCanvas(); + DrawHandles: { + value: function (delta) { + this.application.ninja.stage.clearDrawingCanvas(); - if(!this._handles) - { - this._handles = []; + if(!this._handles) + { + this._handles = []; - // TODO - Using dummy cursors for now + // TODO - Using dummy cursors for now - // translateX - var rX = toolHandleModule.TranslateHandle.create(); - rX.init("url('images/cursors/Translate_X.png') 0 0, default", 'rgba(255,0,0,1)', "x"); - this._handles.push(rX); + // translateX + var rX = toolHandleModule.TranslateHandle.create(); + rX.init("url('images/cursors/Translate_X.png') 0 0, default", 'rgba(255,0,0,1)', "x"); + this._handles.push(rX); - // translateY - var rY = toolHandleModule.TranslateHandle.create(); - rY.init("url('images/cursors/Translate_Y.png') 0 0, default", 'rgba(0,255,0,1)', "y"); - this._handles.push(rY); + // translateY + var rY = toolHandleModule.TranslateHandle.create(); + rY.init("url('images/cursors/Translate_Y.png') 0 0, default", 'rgba(0,255,0,1)', "y"); + this._handles.push(rY); - // translateZ - var rZ = toolHandleModule.TranslateHandle.create(); - rZ.init("url('images/cursors/Translate_Z.png') 0 0, default", 'rgba(0,0,255,1)', "z"); - this._handles.push(rZ); - } + // translateZ + var rZ = toolHandleModule.TranslateHandle.create(); + rZ.init("url('images/cursors/Translate_Z.png') 0 0, default", 'rgba(0,0,255,1)', "z"); + this._handles.push(rZ); + } - var item = this._target; - if(!item) - { - return; - } + var item = this._target; + if(!item) + { + return; + } - // Draw tool handles + // Draw tool handles this._updateHandlesOrigin(); - var base = this._origin.slice(0); - -// if (this.isDrawing) -// console.log( "handle origin: " + base ); - - var len = this.application.ninja.selectedElements.length; - var lMode = this._inLocalMode; - if(len === 1) - { - viewUtils.pushViewportObj( item ); - } - else - { - lMode = false; - viewUtils.pushViewportObj( this.application.ninja.currentDocument.model.documentRoot ); - } - - if(this._handleMode !== null) - { - switch(this._handleMode) - { - case 0: - this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 0.2)'; - this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 0.2)'; - break; - case 1: - this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 0.2)'; - this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 0.2)'; - break; - case 2: - this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 0.2)'; - this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 0.2)'; - break; - } + var base = this._origin.slice(0); + +// if (this.isDrawing) +// console.log( "handle origin: " + base ); + + var len = this.application.ninja.selectedElements.length; + var lMode = this._inLocalMode; + if(len === 1) + { + viewUtils.pushViewportObj( item ); + } + else + { + lMode = false; + viewUtils.pushViewportObj( this.application.ninja.currentDocument.model.documentRoot ); + } + + if(this._handleMode !== null) + { + switch(this._handleMode) + { + case 0: + this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 0.2)'; + this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 0.2)'; + break; + case 1: + this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 0.2)'; + this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 0.2)'; + break; + case 2: + this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 0.2)'; + this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 0.2)'; + break; + } if( delta && (len > 1) ) { base[this._handleMode] += ~~delta; } - } - this._handles[0].draw(base, item, lMode); - this._handles[1].draw(base, item, lMode); - this._handles[2].draw(base, item, lMode); - - if(delta && (this._handleMode !== null)) - { - this._handles[this._handleMode].drawDelta(~~delta); - } - - this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 1)'; - this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 1)'; - this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 1)'; - - viewUtils.popViewportObj(); - } - } - + } + this._handles[0].draw(base, item, lMode); + this._handles[1].draw(base, item, lMode); + this._handles[2].draw(base, item, lMode); + + if(delta && (this._handleMode !== null)) + { + this._handles[this._handleMode].drawDelta(~~delta); + } + + this._handles[0]._strokeStyle = 'rgba(255, 0, 0, 1)'; + this._handles[1]._strokeStyle = 'rgba(0, 255, 0, 1)'; + this._handles[2]._strokeStyle = 'rgba(0, 0, 255, 1)'; + + viewUtils.popViewportObj(); + } + } + }); -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/tools/Translate3DToolBase.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'js/tools/Translate3DToolBase.js') diff --git a/js/tools/Translate3DToolBase.js b/js/tools/Translate3DToolBase.js index 46e0b49c..3e6f2ac6 100755 --- a/js/tools/Translate3DToolBase.js +++ b/js/tools/Translate3DToolBase.js @@ -170,7 +170,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, matInv = glmat4.inverse(this._startMat, []), nMat = glmat4.multiply(transMat, this._startMat, [] ); // qMat = glmat4.multiply(matInv, nMat, []); - + if(this._mode === 1) { if (len > 1) curMat = target.elementModel.getProperty("mat").slice(); var curInv = glmat4.inverse( curMat, [] ); @@ -313,7 +313,7 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, eltCtr[2] = 0; eltCtr = vecUtils.vecAdd(3, eltCtr, ctrOffset); } - + this._origin = viewUtils.localToGlobal(eltCtr, this.target); // console.log( "Rotate3DToolBase.captureSelectionDrawn _origin: " + this._origin ); this._updateTargets(); @@ -340,8 +340,8 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, } } }, - - calculateMultiSelOrigin: + + calculateMultiSelOrigin: { value: function() { @@ -472,5 +472,5 @@ exports.Translate3DToolBase = Montage.create(ModifierToolBase, viewUtils.popViewportObj(); } } - + }); -- cgit v1.2.3