!B (Sandbox) Fix inability to select entities by clicking on their ed…

…itor-only helper object

Copied from Perforce
 Change: 1540579

Code/Sandbox/Plugins/SmartObjectEditor/SmartObject.cpp

@@ -114,27 +114,20 @@ bool CSmartObject::HitTest(HitContext& hc)
 {
 	if (GetIStatObj())
 	{
-		float hitEpsilon = hc.view->GetScreenScaleFactor(GetWorldPos()) * 0.01f;
-		float hitDist;
+		Matrix34 invertedWorldTransform = GetWorldTM().GetInverted();
 
-		float fScale = GetScale().x;
-		AABB boxScaled;
-		GetLocalBounds(boxScaled);
-		boxScaled.min *= fScale;
-		boxScaled.max *= fScale;
+		Vec3 raySrc = invertedWorldTransform.TransformPoint(hc.raySrc);
+		Vec3 rayDir = invertedWorldTransform.TransformVector(hc.rayDir).GetNormalized();
 
-		Matrix34 invertWTM = GetWorldTM();
-		invertWTM.Invert();
+		SRayHitInfo hitInfo;
+		hitInfo.inReferencePoint = raySrc;
+		hitInfo.inRay = Ray(raySrc, rayDir);
 
-		Vec3 xformedRaySrc = invertWTM.TransformPoint(hc.raySrc);
-		Vec3 xformedRayDir = invertWTM.TransformVector(hc.rayDir);
-		xformedRayDir.Normalize();
-
-		Vec3 intPnt;
-		// Check intersection with bbox edges.
-		if (Intersect::Ray_AABBEdge(xformedRaySrc, xformedRayDir, boxScaled, hitEpsilon, hitDist, intPnt))
+		if (GetIStatObj()->RayIntersection(hitInfo))
 		{
-			hc.dist = xformedRaySrc.GetDistance(intPnt);
+			// World space distance.
+			Vec3 worldHitPos = GetWorldTM().TransformPoint(hitInfo.vHitPos);
+			hc.dist = hc.raySrc.GetDistance(worldHitPos);
 			hc.object = this;
 			return true;
 		}