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

let regionCache really find a varregion by a position

avinationmerge
UbitUmarov 2015-09-12 15:27:36 +01:00
parent dfc142a50f
commit 280780d3bc
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs
View File

@ -82,13 +82,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return new List<GridRegion>(m_neighbours.Values); return new List<GridRegion>(m_neighbours.Values);
} }
// Get a region given its base coordinates (in meters).
// NOTE: this is NOT 'get a region by some point in the region'. The coordinate MUST
// be the base coordinate of the region.
// The snapping is technically unnecessary but is harmless because regions are always
// multiples of the legacy region size (256).
public GridRegion GetRegionByPosition(int x, int y) public GridRegion GetRegionByPosition(int x, int y)
{ {
/*
uint xsnap = (uint)(x / Constants.RegionSize) * Constants.RegionSize; uint xsnap = (uint)(x / Constants.RegionSize) * Constants.RegionSize;
uint ysnap = (uint)(y / Constants.RegionSize) * Constants.RegionSize; uint ysnap = (uint)(y / Constants.RegionSize) * Constants.RegionSize;
ulong handle = Util.RegionWorldLocToHandle(xsnap, ysnap); ulong handle = Util.RegionWorldLocToHandle(xsnap, ysnap);
@ -97,6 +94,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
return m_neighbours[handle]; return m_neighbours[handle];
return null; return null;
*/
// do actual search by position
// not the best, but this will not hold that many regions
GridRegion foundRegion = null;
foreach(GridRegion r in m_neighbours.Values)
{
if (x >= r.RegionLocX && x < r.RegionLocX + r.RegionSizeX
&& y >= r.RegionLocY && y < r.RegionLocY + r.RegionSizeY)
{
foundRegion = r;
break;
}
}
return foundRegion;
} }
} }
} }