From 96bfeee2e6b735b87e8482d6e2cf24d5224c6417 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Thu, 5 Apr 2012 17:03:14 -0700
Subject: translate3DObject tool fixes.

---
 js/helper-classes/3D/hit-record.js   | 46 +++++++++++++++++++++++++++++++++++-
 js/helper-classes/3D/snap-manager.js |  1 +
 js/helper-classes/3D/view-utils.js   | 45 ++++++++++++++++++-----------------
 3 files changed, 69 insertions(+), 23 deletions(-)

(limited to 'js/helper-classes/3D')

diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 2c60adc6..96f87c24 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -284,6 +284,50 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
 
             return str;
         }
-    }
+    },
+
+	test:
+	{
+		value: function()
+		{
+			var elt = this.getElement();
+			var stage = viewUtils.getStage();
+			if (elt === stage)  return;
+
+			var localPt = this.calculateElementPreTransformScreenPoint();
+			var stageWorldPt = this.calculateStageWorldPoint();
+			var globalPt = this.getScreenPoint();
+			var err = false;
+
+			var test1 = viewUtils.localToGlobal( localPt, elt );
+			var dist = vecUtils.vecDist(3, test1, globalPt);
+			if (MathUtils.fpSign(dist) != 0)
+			{
+				err = true;
+				console.log( "**** transform error 1 ***** " + dist + ", localPt: " + localPt );
+			}
+
+			var stageWorldToGlobal = viewUtils.getStageWorldToGlobalMatrix();
+			var test2 = MathUtils.transformAndDivideHomogeneousPoint( stageWorldPt, stageWorldToGlobal );
+			dist = vecUtils.vecDist(3, test2, globalPt);
+			if (MathUtils.fpSign(dist) != 0)
+			{
+				err = true;
+				console.log( "**** transform error 2 ***** " + dist + ", localPt: " + localPt );
+			}
+
+			var localToGlobal = viewUtils.getLocalToGlobalMatrix( elt );
+			var globalToLocal = glmat4.inverse( localToGlobal, [] );
+			var test3 = MathUtils.transformAndDivideHomogeneousPoint( globalPt, globalToLocal );
+			dist = vecUtils.vecDist(3, test3, localPt);
+			if (MathUtils.fpSign( vecUtils.vecDist(3, test3, localPt)) != 0)
+			{
+				err = true;
+				console.log( "**** transform error 3 ***** " + dist + ", localPt: " + localPt );
+			}
+
+			if (!err)  console.log( "no hitRecord error" );
+		}
+	}
 });
 
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 9f6b9ed1..8eafa7e9 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -300,6 +300,7 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
 			this.deactivateDragPlane();
 
 			this.setLastHit( rtnHit );
+			//rtnHit.test();		// DEBUG CODE.  REMOVE THIS
 			return rtnHit;
 		}
 	},
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index a72b7906..392de0be 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -112,6 +112,13 @@ exports.ViewUtils = Montage.create(Component, {
             var mat = this.getMatrixFromElement(elt);
             var plane = [mat[8],  mat[9],  mat[10],  mat[11]];
 
+            var stage = this.application.ninja.currentDocument.documentRoot;
+			if (elt === stage)
+			{
+				xVec = [1,0,0];
+				yVec = [0,1,0];
+			}
+
             // The translation value is a point on the plane
             this.pushViewportObj( elt );
             var ptOnPlane = this.getCenterOfProjection();
@@ -137,6 +144,12 @@ exports.ViewUtils = Montage.create(Component, {
             var stageMat = this.getMatrixFromElement(stage);
             var stagePlane = [stageMat[8],  stageMat[9],  stageMat[10],  stageMat[11]];
 
+			if (elt === stage)
+			{
+				xVec = [1,0,0];
+				yVec = [0,1,0];
+			}
+
             var xDot = Math.abs(vecUtils.vecDot(3, xVec, stagePlane));
             var yDot = Math.abs(vecUtils.vecDot(3, yVec, stagePlane));
 
@@ -788,35 +801,23 @@ exports.ViewUtils = Montage.create(Component, {
         }
     },
 
-    getStageWorldToGlobalMatrix: {
-        value: function() {
+    getStageWorldToGlobalMatrix:
+	{
+        value: function()
+		{
             var stage = this.application.ninja.currentDocument.documentRoot;
             this.pushViewportObj( stage );
-
-                // get the matrix to the parent
-                var mat = Matrix.I(4);
-                //var projMat = Matrix.I(4).multiply( this.getPerspectiveDistFromElement(stage) );
-                var p = this.getPerspectiveDistFromElement(stage);
-                var projMat = glmat4.scale( Matrix.I(4), [p,p,p], [] );
-                projMat[11] = -1;
+				
+				// put the point into screen space of the stage - requires
+				// a translation to the top/left only
                 var cop = this.getCenterOfProjection();
                 var v2s = Matrix.Translation([cop[0], cop[1], 0]);
 
-                //mat = v2s.multiply( projMat );
-                mat = glmat4.multiply( v2s, projMat, [] );
-
-                // offset to the parent
-                var offset = this.getElementOffset( stage );
-                var offMat = Matrix.Translation([offset[0], offset[1], 0]);
-                //mat = offMat.multiply( mat );
-                glmat4.multiply( offMat, mat, mat );
-
             this.popViewportObj();
 
-    //        var mat2 = this.getLocalToGlobalMatrix( stage.parentElement );
-            var mat2 = this.getLocalToGlobalMatrix( this._rootElement );
-            //var mat = mat2.multiply( mat );
-            glmat4.multiply( mat2, mat, mat );
+			// append the localToGlobal matrix of the stage.
+            var mat = this.getLocalToGlobalMatrix( stage );
+			glmat4.multiply( mat, v2s );
 
             return mat;
         }
-- 
cgit v1.2.3