aboutsummaryrefslogtreecommitdiff
path: root/js/helper-classes/3D
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-11 11:04:29 -0700
committerArmen Kesablyan2012-06-11 11:04:29 -0700
commit0f040acabfb7a4bf3138debec5aff869487ceb11 (patch)
tree53eaa8ba54cf23a1c3ea0c8b39377773198c3e19 /js/helper-classes/3D
parent7d3bdf39e6d1534de1848ca2744aed66dfeb5d2a (diff)
parent756cbfad2b98b300af8db3793aa21718b88dd950 (diff)
downloadninja-0f040acabfb7a4bf3138debec5aff869487ceb11.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal
Diffstat (limited to 'js/helper-classes/3D')
-rwxr-xr-xjs/helper-classes/3D/draw-utils.js6
-rwxr-xr-xjs/helper-classes/3D/math-utils.js11
-rwxr-xr-xjs/helper-classes/3D/snap-manager.js14
3 files changed, 11 insertions, 20 deletions
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index a793b643..bef1e435 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -1206,7 +1206,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1206 // set the element to be the viewport object - temporarily 1206 // set the element to be the viewport object - temporarily
1207 var tmpCanvas = this.application.ninja.stage.canvas; 1207 var tmpCanvas = this.application.ninja.stage.canvas;
1208 var tmpStage = this.application.ninja.currentDocument.model.documentRoot; 1208 var tmpStage = this.application.ninja.currentDocument.model.documentRoot;
1209 this.viewUtils.pushViewportObj( tmpCanvas ); 1209// this.viewUtils.pushViewportObj( tmpCanvas );
1210 1210
1211 // save the source space object and set to the target object 1211 // save the source space object and set to the target object
1212 var saveSource = this._sourceSpaceElt; 1212 var saveSource = this._sourceSpaceElt;
@@ -1217,7 +1217,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1217 var saveLineWidth = this._lineWidth; 1217 var saveLineWidth = this._lineWidth;
1218 1218
1219 var origLeft = 60; 1219 var origLeft = 60;
1220 var origTop = this.snapManager.getStageHeight() - 60; 1220 var origTop = tmpCanvas.height - 60;
1221 1221
1222 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt ); 1222 var mat = this.viewUtils.getMatrixFromElement( this._sourceSpaceElt );
1223 var tMat = Matrix.Translation([origLeft,origTop,0]); 1223 var tMat = Matrix.Translation([origLeft,origTop,0]);
@@ -1279,7 +1279,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
1279 this.drawArrowHead(rO, zO); 1279 this.drawArrowHead(rO, zO);
1280 1280
1281 // restore the state 1281 // restore the state
1282 this.viewUtils.popViewportObj(); 1282// this.viewUtils.popViewportObj();
1283 this._drawingContext.restore(); 1283 this._drawingContext.restore();
1284 this.setDrawingSurfaceElement(saveContext); 1284 this.setDrawingSurfaceElement(saveContext);
1285 this._lineColor = saveColor; 1285 this._lineColor = saveColor;
diff --git a/js/helper-classes/3D/math-utils.js b/js/helper-classes/3D/math-utils.js
index 2f0283a9..35ee8112 100755
--- a/js/helper-classes/3D/math-utils.js
+++ b/js/helper-classes/3D/math-utils.js
@@ -928,17 +928,18 @@ var MathUtilsClass = exports.MathUtilsClass = Object.create(Object.prototype, {
928 return 0; 928 return 0;
929 } 929 }
930 //TODO testing...remove this block 930 //TODO testing...remove this block
931 console.log("getAxisAngleBetween3DVectors Angle: "+angle);
932 if (isNaN(angle)){ 931 if (isNaN(angle)){
933 console.log("getAxisAngleBetween3DVectors Angle is NaN"); 932 console.log("Warning! getAxisAngleBetween3DVectors Angle is NaN");
934 } 933 }
935 //TODO end testing block 934 //TODO end testing block
936 //optionally, if axis is provided, create the axis of rotation as well 935 //optionally, if axis is provided, create the axis of rotation as well
937 var rotAxis = VecUtils.vecCross(3, v1n, v2n); 936 var rotAxis = VecUtils.vecCross(3, v1n, v2n);
938 rotAxis = VecUtils.vecNormalize(3, rotAxis, 1); 937 rotAxis = VecUtils.vecNormalize(3, rotAxis, 1);
939 axis[0] = rotAxis[0]; 938 if (axis){
940 axis[1] = rotAxis[1]; 939 axis[0] = rotAxis[0];
941 axis[2] = rotAxis[2]; 940 axis[1] = rotAxis[1];
941 axis[2] = rotAxis[2];
942 }
942 return angle; 943 return angle;
943 } 944 }
944 }, 945 },
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, {
481 { 481 {
482 var snapRec = this._elementCache[i]; 482 var snapRec = this._elementCache[i];
483 var elt = snapRec.getElement(); 483 var elt = snapRec.getElement();
484 if (elt.elementModel) 484 elt.elementModel.isIn2DSnapCache = false;
485 elt.elementModel.isIn2DSnapCache = false; 485
486 else
487 console.log( "element in the 2D cache does not have an elementModel" );
488 } 486 }
489 487
490 this._elementCache = null; 488 this._elementCache = null;
@@ -541,10 +539,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
541 snapRec.init( elt ); 539 snapRec.init( elt );
542 this._elementCache.push( snapRec ); 540 this._elementCache.push( snapRec );
543 541
544 if (!elt.elementModel)
545 {
546 NJUtils.makeModelFromElement(elt);
547 }
548 elt.elementModel.isIn2DSnapCache = true; 542 elt.elementModel.isIn2DSnapCache = true;
549 } 543 }
550 else if (elt.elementModel) 544 else if (elt.elementModel)
@@ -613,10 +607,6 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
613 snapRec.init( elt ); 607 snapRec.init( elt );
614 this._elementCache.push( snapRec ); 608 this._elementCache.push( snapRec );
615 609
616 if (!elt.elementModel)
617 {
618 NJUtils.makeModelFromElement(elt);
619 }
620 elt.elementModel.isIn2DSnapCache = true; 610 elt.elementModel.isIn2DSnapCache = true;
621 } 611 }
622 else if (elt.elementModel) 612 else if (elt.elementModel)