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 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 45 insertions(+), 1 deletion(-)

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

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" );
+		}
+	}
 });
 
-- 
cgit v1.2.3


From f522ce09d98bbb2812ed25bb942597d854d71a1c Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 11 Apr 2012 16:01:33 -0700
Subject: Rotate3D tool changes

---
 js/helper-classes/3D/hit-record.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 96f87c24..6094dae1 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -320,13 +320,22 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
 			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)
+			if (MathUtils.fpSign(dist) != 0)
 			{
 				err = true;
 				console.log( "**** transform error 3 ***** " + dist + ", localPt: " + localPt );
 			}
 
-			if (!err)  console.log( "no hitRecord error" );
+			var objToStageWorld = viewUtils.getObjToStageWorldMatrix( elt, true );
+			var test4 = MathUtils.transformAndDivideHomogeneousPoint( localPt, objToStageWorld );
+			dist = vecUtils.vecDist(3, test4, stageWorldPt);
+			if (MathUtils.fpSign(dist) != 0)
+			{
+				err = true;
+				console.log( "**** transform error 4 ***** " + dist + ", localPt: " + localPt );
+			}
+
+			//if (!err)  console.log( "no hitRecord error" );
 		}
 	}
 });
-- 
cgit v1.2.3