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

* Fixes issue where of you force your avatar against a region corner, it gets stuck and NonFinite Avatar messages floods console 

Addresses Mantis #3380
0.6.5-rc1
Arthur Valadares 2009-04-03 19:20:23 +00:00
parent 5146cb7a72
commit 0c544a85dc
1 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -200,6 +200,10 @@ namespace OpenSim.Region.Framework.Scenes
DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG
} }
protected enum Cardinals
{
N=1,NE,E,SE,S,SW,W,NW
}
/// <summary> /// <summary>
/// Position at which a significant movement was made /// Position at which a significant movement was made
/// </summary> /// </summary>
@ -2260,7 +2264,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
m_scene.StatsReporter.AddAgentUpdates(avatars.Count); m_scene.StatsReporter.AddAgentUpdates(avatars.Count);
m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS);
@ -2517,6 +2521,8 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 pos2 = AbsolutePosition; Vector3 pos2 = AbsolutePosition;
Vector3 vel = Velocity; Vector3 vel = Velocity;
int neighbor = 0;
int[] fix = new int[2];
float timeStep = 0.1f; float timeStep = 0.1f;
pos2.X = pos2.X + (vel.X*timeStep); pos2.X = pos2.X + (vel.X*timeStep);
@ -2525,15 +2531,38 @@ namespace OpenSim.Region.Framework.Scenes
if (!IsInTransit) if (!IsInTransit)
{ {
if ((pos2.X < 0) || (pos2.X > Constants.RegionSize)) // Checks if where it's headed exists a region
if (pos2.X < 0)
{ {
CrossToNewRegion(); if (pos2.Y < 0)
neighbor = HaveNeighbor(Cardinals.SW, ref fix);
else if (pos2.Y > Constants.RegionSize)
neighbor = HaveNeighbor(Cardinals.NW, ref fix);
else
neighbor = HaveNeighbor(Cardinals.W, ref fix);
} }
else if (pos2.X > Constants.RegionSize)
{
if (pos2.Y < 0)
neighbor = HaveNeighbor(Cardinals.SE, ref fix);
else if (pos2.Y > Constants.RegionSize)
neighbor = HaveNeighbor(Cardinals.NE, ref fix);
else
neighbor = HaveNeighbor(Cardinals.E, ref fix);
}
else if (pos2.Y < 0)
neighbor = HaveNeighbor(Cardinals.S, ref fix);
else if (pos2.Y > Constants.RegionSize)
neighbor = HaveNeighbor(Cardinals.N, ref fix);
if ((pos2.Y < 0) || (pos2.Y > Constants.RegionSize)) // Makes sure avatar does not end up outside region
{ if (neighbor < 0)
AbsolutePosition = new Vector3(
AbsolutePosition.X + 3*fix[0],
AbsolutePosition.Y + 3*fix[1],
AbsolutePosition.Z);
else if (neighbor > 0)
CrossToNewRegion(); CrossToNewRegion();
}
} }
else else
{ {
@ -2547,7 +2576,36 @@ namespace OpenSim.Region.Framework.Scenes
pos2.Z = pos2.Z + (vel.Z * timeStep); pos2.Z = pos2.Z + (vel.Z * timeStep);
m_pos = pos2; m_pos = pos2;
} }
}
protected int HaveNeighbor(Cardinals car, ref int[] fix)
{
uint neighbourx = m_regionInfo.RegionLocX;
uint neighboury = m_regionInfo.RegionLocY;
int dir = (int)car;
if (dir > 1 && dir < 5) //Heading East
neighbourx++;
else if (dir > 5) // Heading West
neighbourx--;
if (dir < 3 || dir == 8) // Heading North
neighboury++;
else if (dir > 3 && dir < 7) // Heading Sout
neighboury--;
ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
SimpleRegionInfo neighbourRegion = m_scene.RequestNeighbouringRegionInfo(neighbourHandle);
if (neighbourRegion == null)
{
fix[0] = (int)(m_regionInfo.RegionLocX - neighbourx);
fix[1] = (int)(m_regionInfo.RegionLocY - neighboury);
return dir * (-1);
}
else
return dir;
} }
/// <summary> /// <summary>