2 files changed, 52 insertions, 49 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3113831..532d646 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1642,8 +1642,9 @@ namespace OpenSim.Region.Environment.Scenes
            bool frontFacesOnly = true;
           
            SceneObjectPart target = GetSceneObjectPart(localID);
+            SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
-            if (target != null)
+            if (target != null && target2 != null)
            {
                LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);
@@ -1651,67 +1652,69 @@ namespace OpenSim.Region.Environment.Scenes
                Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
                
-                if (target != null)
+                
+                if (target2.ParentGroup != null)
                {
-                    if (target.ParentGroup != null)
+                    pos = target2.AbsolutePosition;
-                    {
+                    //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
-                        pos = target.AbsolutePosition;
-                        //m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
-                        // TODO: Raytrace better here
+                    // TODO: Raytrace better here
-                        //EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));
+                    //EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));
-                        Ray NewRay = new Ray(AXOrigin, AXdirection);
+                    Ray NewRay = new Ray(AXOrigin, AXdirection);
-                        // Ray Trace against target here
+                    // Ray Trace against target here
-                        EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false);
+                    EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, CopyCenters);
-                        // Un-comment out the following line to Get Raytrace results printed to the console.
+                    // Un-comment out the following line to Get Raytrace results printed to the console.
-                        // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
+                   // m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
-                        float ScaleOffset = 0.5f;
+                    float ScaleOffset = 0.5f;
-                        // If we hit something
+                    // If we hit something
-                        if (ei.HitTF)
+                    if (ei.HitTF)
+                    {
+                        LLVector3 scale = target.Scale;
+                        LLVector3 scaleComponent = new LLVector3(ei.AAfaceNormal.x, ei.AAfaceNormal.y, ei.AAfaceNormal.z);
+                        if (scaleComponent.X != 0) ScaleOffset = scale.X;
+                        if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
+                        if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
+                        ScaleOffset = Math.Abs(ScaleOffset);
+                        LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);
+                        LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
+                        
+                        
+                        if (CopyCenters)
                        {
-                            LLVector3 scale = target.Scale;
+                            //  now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal.
-                            LLVector3 scaleComponent = new LLVector3(ei.AAfaceNormal.x, ei.AAfaceNormal.y, ei.AAfaceNormal.z);
+                            LLVector3 direction2 = LLVector3.Norm(intersectionpoint - target2.AbsolutePosition);
-                            if (scaleComponent.X != 0) ScaleOffset = scale.X;
+                            Vector3 AXOrigin2 = new Vector3(target2.AbsolutePosition.X, target2.AbsolutePosition.Y, target2.AbsolutePosition.Z);
-                            if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
+                            Vector3 AXdirection2 = ei.AAfaceNormal;
-                            if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
+                            Ray NewRay2 = new Ray(AXOrigin2, AXdirection2);
-                            ScaleOffset = Math.Abs(ScaleOffset);
+                            EntityIntersection ei2 = target.TestIntersectionOBB(NewRay2, new Quaternion(1, 0, 0, 0), true, CopyCenters);
-                            LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);
+                            if (ei2.HitTF)
-                           
-                            
-                            
-                            if (CopyCenters)
                            {
-                                //  now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal.
+                               //m_log.Info("[RAYTRACERESULTS]: Hit:" + ei2.HitTF.ToString() + " Point: " + ei2.ipoint.ToString() + " Normal: " + ei2.normal.ToString());
-                                LLVector3 direction2 = LLVector3.Norm(pos - target.AbsolutePosition);
+                               pos = new LLVector3(ei2.ipoint.x,ei2.ipoint.y,ei2.ipoint.z);
-                                Vector3 AXOrigin2 = new Vector3(target.AbsolutePosition.X, target.AbsolutePosition.Y, target.AbsolutePosition.Z);
+                                normal.X = ei2.normal.x;
-                                Vector3 AXdirection2 = ei.AAfaceNormal;
+                                normal.Y = ei2.normal.y;
-                                Ray NewRay2 = new Ray(AXOrigin2, AXdirection2);
+                                normal.Z = ei2.normal.z;
-                                EntityIntersection ei2 = target.TestIntersectionOBB(NewRay2, new Quaternion(1, 0, 0, 0), false, CopyCenters);
-                                if (ei2.HitTF)
-                                {
-                                    //m_log.Info("[RAYTRACERESULTS]: Hit:" + ei2.HitTF.ToString() + " Point: " + ei2.ipoint.ToString() + " Normal: " + ei2.normal.ToString());
-                                    pos = new LLVector3(ei2.ipoint.x,ei2.ipoint.y,ei2.ipoint.z);
-                                }
                            }
-                            LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
-                            // Set the position to the intersection point
-                            LLVector3 offset = (normal * (ScaleOffset / 2f));
-                            pos = (intersectionpoint + offset);
-                            // stick in offset format from the original prim
-                            pos = pos - target.ParentGroup.AbsolutePosition;
-                            m_innerScene.DuplicateObject(target.ParentGroup.LocalId, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
                        }
+                        
+                        // Set the position to the intersection point
+                        LLVector3 offset = (normal * (ScaleOffset / 2f));
+                        pos = (intersectionpoint + offset);
- 
+                        // stick in offset format from the original prim
-                        return;
+                        pos = pos - target2.ParentGroup.AbsolutePosition;
+                        m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
                    }
                    return;
                }
+                return;
+                
              
            }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 3dbd809..35eabbd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1344,7 +1344,7 @@ namespace OpenSim.Region.Environment.Scenes
                    if (faceCenters)
                    {
-                        q = AXpos + a * AAfacenormals[i]; //(FaceA[i] + FaceB[i] + FaceC[1] + FaceD[i]) / 4f;
+                        q = (FaceA[i] + FaceB[i] + FaceC[1] + FaceD[i]) / 4f; //iray.Origin + a * normals[i];
                    }
                    else
                    {

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 3113831..532d646 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1642,8 +1642,9 @@ namespace OpenSim.Region.Environment.Scenes
1642	bool frontFacesOnly = true;	1642	bool frontFacesOnly = true;
1643		1643
1644	SceneObjectPart target = GetSceneObjectPart(localID);	1644	SceneObjectPart target = GetSceneObjectPart(localID);
		1645	SceneObjectPart target2 = GetSceneObjectPart(RayTargetObj);
1645		1646
1646	if (target != null)	1647	if (target != null && target2 != null)
1647	{	1648	{
1648		1649
1649	LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);	1650	LLVector3 direction = LLVector3.Norm(RayEnd - RayStart);
@@ -1651,67 +1652,69 @@ namespace OpenSim.Region.Environment.Scenes
1651	Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);	1652	Vector3 AXdirection = new Vector3(direction.X, direction.Y, direction.Z);
1652		1653
1653		1654
1654	if (target != null)	1655
		1656	if (target2.ParentGroup != null)
1655	{	1657	{
1656	if (target.ParentGroup != null)	1658	pos = target2.AbsolutePosition;
1657	{	1659	//m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
1658	pos = target.AbsolutePosition;
1659	//m_log.Info("[OBJECT_REZ]: TargetPos: " + pos.ToString() + ", RayStart: " + RayStart.ToString() + ", RayEnd: " + RayEnd.ToString() + ", Volume: " + Util.GetDistanceTo(RayStart,RayEnd).ToString() + ", mag1: " + Util.GetMagnitude(RayStart).ToString() + ", mag2: " + Util.GetMagnitude(RayEnd).ToString());
1660		1660
1661	// TODO: Raytrace better here	1661	// TODO: Raytrace better here
1662		1662
1663	//EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));	1663	//EntityIntersection ei = m_innerScene.GetClosestIntersectingPrim(new Ray(AXOrigin, AXdirection));
1664	Ray NewRay = new Ray(AXOrigin, AXdirection);	1664	Ray NewRay = new Ray(AXOrigin, AXdirection);
1665		1665
1666	// Ray Trace against target here	1666	// Ray Trace against target here
1667	EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, false);	1667	EntityIntersection ei = target.TestIntersectionOBB(NewRay, new Quaternion(1, 0, 0, 0), frontFacesOnly, CopyCenters);
1668		1668
1669	// Un-comment out the following line to Get Raytrace results printed to the console.	1669	// Un-comment out the following line to Get Raytrace results printed to the console.
1670	// m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());	1670	// m_log.Info("[RAYTRACERESULTS]: Hit:" + ei.HitTF.ToString() + " Point: " + ei.ipoint.ToString() + " Normal: " + ei.normal.ToString());
1671	float ScaleOffset = 0.5f;	1671	float ScaleOffset = 0.5f;
1672		1672
1673	// If we hit something	1673	// If we hit something
1674	if (ei.HitTF)	1674	if (ei.HitTF)
		1675	{
		1676	LLVector3 scale = target.Scale;
		1677	LLVector3 scaleComponent = new LLVector3(ei.AAfaceNormal.x, ei.AAfaceNormal.y, ei.AAfaceNormal.z);
		1678	if (scaleComponent.X != 0) ScaleOffset = scale.X;
		1679	if (scaleComponent.Y != 0) ScaleOffset = scale.Y;
		1680	if (scaleComponent.Z != 0) ScaleOffset = scale.Z;
		1681	ScaleOffset = Math.Abs(ScaleOffset);
		1682	LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);
		1683	LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
		1684
		1685
		1686	if (CopyCenters)
1675	{	1687	{
1676	LLVector3 scale = target.Scale;	1688	// now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal.
1677	LLVector3 scaleComponent = new LLVector3(ei.AAfaceNormal.x, ei.AAfaceNormal.y, ei.AAfaceNormal.z);	1689	LLVector3 direction2 = LLVector3.Norm(intersectionpoint - target2.AbsolutePosition);
1678	if (scaleComponent.X != 0) ScaleOffset = scale.X;	1690	Vector3 AXOrigin2 = new Vector3(target2.AbsolutePosition.X, target2.AbsolutePosition.Y, target2.AbsolutePosition.Z);
1679	if (scaleComponent.Y != 0) ScaleOffset = scale.Y;	1691	Vector3 AXdirection2 = ei.AAfaceNormal;
1680	if (scaleComponent.Z != 0) ScaleOffset = scale.Z;	1692	Ray NewRay2 = new Ray(AXOrigin2, AXdirection2);
1681	ScaleOffset = Math.Abs(ScaleOffset);	1693	EntityIntersection ei2 = target.TestIntersectionOBB(NewRay2, new Quaternion(1, 0, 0, 0), true, CopyCenters);
1682	LLVector3 intersectionpoint = new LLVector3(ei.ipoint.x, ei.ipoint.y, ei.ipoint.z);	1694	if (ei2.HitTF)
1683
1684
1685
1686	if (CopyCenters)
1687	{	1695	{
1688	// now we cast a ray from inside the prim(absolute position) to one of it's faces along the face normal.	1696	//m_log.Info("[RAYTRACERESULTS]: Hit:" + ei2.HitTF.ToString() + " Point: " + ei2.ipoint.ToString() + " Normal: " + ei2.normal.ToString());
1689	LLVector3 direction2 = LLVector3.Norm(pos - target.AbsolutePosition);	1697	pos = new LLVector3(ei2.ipoint.x,ei2.ipoint.y,ei2.ipoint.z);
1690	Vector3 AXOrigin2 = new Vector3(target.AbsolutePosition.X, target.AbsolutePosition.Y, target.AbsolutePosition.Z);	1698	normal.X = ei2.normal.x;
1691	Vector3 AXdirection2 = ei.AAfaceNormal;	1699	normal.Y = ei2.normal.y;
1692	Ray NewRay2 = new Ray(AXOrigin2, AXdirection2);	1700	normal.Z = ei2.normal.z;
1693	EntityIntersection ei2 = target.TestIntersectionOBB(NewRay2, new Quaternion(1, 0, 0, 0), false, CopyCenters);
1694	if (ei2.HitTF)
1695	{
1696	//m_log.Info("[RAYTRACERESULTS]: Hit:" + ei2.HitTF.ToString() + " Point: " + ei2.ipoint.ToString() + " Normal: " + ei2.normal.ToString());
1697	pos = new LLVector3(ei2.ipoint.x,ei2.ipoint.y,ei2.ipoint.z);
1698	}
1699	}	1701	}
1700	LLVector3 normal = new LLVector3(ei.normal.x, ei.normal.y, ei.normal.z);
1701	// Set the position to the intersection point
1702	LLVector3 offset = (normal * (ScaleOffset / 2f));
1703	pos = (intersectionpoint + offset);
1704
1705	// stick in offset format from the original prim
1706	pos = pos - target.ParentGroup.AbsolutePosition;
1707	m_innerScene.DuplicateObject(target.ParentGroup.LocalId, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
1708	}	1702	}
		1703
		1704	// Set the position to the intersection point
		1705	LLVector3 offset = (normal * (ScaleOffset / 2f));
		1706	pos = (intersectionpoint + offset);
1709		1707
1710		1708	// stick in offset format from the original prim
1711	return;	1709	pos = pos - target2.ParentGroup.AbsolutePosition;
		1710	m_innerScene.DuplicateObject(localID, pos, target.GetEffectiveObjectFlags(), AgentID, GroupID);
1712	}	1711	}
		1712
		1713
1713	return;	1714	return;
1714	}	1715	}
		1716	return;
		1717
1715		1718
1716	}	1719	}
1717		1720


diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 3dbd809..35eabbd 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1344,7 +1344,7 @@ namespace OpenSim.Region.Environment.Scenes
1344		1344
1345	if (faceCenters)	1345	if (faceCenters)
1346	{	1346	{
1347	q = AXpos + a * AAfacenormals[i]; //(FaceA[i] + FaceB[i] + FaceC[1] + FaceD[i]) / 4f;	1347	q = (FaceA[i] + FaceB[i] + FaceC[1] + FaceD[i]) / 4f; //iray.Origin + a * normals[i];
1348	}	1348	}
1349	else	1349	else
1350	{	1350	{