OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove a auxiliar vector no longer needed

avinationmerge
UbitUmarov 2015-09-28 18:10:27 +01:00
parent ad58f9b17e
commit 028cbb7cbe
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2284,14 +2284,16 @@ namespace OpenSim.Region.Framework.Scenes
public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter) public Vector3 GetNewRezLocation(Vector3 RayStart, Vector3 RayEnd, UUID RayTargetID, Quaternion rot, byte bypassRayCast, byte RayEndIsIntersection, bool frontFacesOnly, Vector3 scale, bool FaceCenter)
{ {
Vector3 dir = RayEnd - RayStart;
float wheight = (float)RegionInfo.RegionSettings.WaterHeight; float wheight = (float)RegionInfo.RegionSettings.WaterHeight;
Vector3 wpos = Vector3.Zero; Vector3 wpos = Vector3.Zero;
// Check for water surface intersection from above // Check for water surface intersection from above
if ((RayStart.Z > wheight) && (RayEnd.Z < wheight)) if ((RayStart.Z > wheight) && (RayEnd.Z < wheight))
{ {
float ratio = (RayStart.Z - wheight) / (RayStart.Z - RayEnd.Z); float ratio = (wheight - RayStart.Z) / dir.Z;
wpos.X = RayStart.X - (ratio * (RayStart.X - RayEnd.X)); wpos.X = RayStart.X + (ratio * dir.X);
wpos.Y = RayStart.Y - (ratio * (RayStart.Y - RayEnd.Y)); wpos.Y = RayStart.Y + (ratio * dir.Y);
wpos.Z = wheight; wpos.Z = wheight;
} }
@ -2299,9 +2301,6 @@ namespace OpenSim.Region.Framework.Scenes
if (RayEndIsIntersection != (byte)1) if (RayEndIsIntersection != (byte)1)
{ {
Vector3 rayEnd = RayEnd;
Vector3 dir = rayEnd - RayStart;
float dist = dir.Length(); float dist = dir.Length();
if (dist != 0) if (dist != 0)
{ {
@ -2415,7 +2414,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
} }
// fall back to our stupid functionality // fall back to our stupid functionality