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

fix llEdgeOfWorld() for var regions (someone needs to test this better

LSLKeyTest
UbitUmarov 2016-07-29 00:55:40 +01:00
parent c692664f3d
commit 3d58198c55
1 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -6394,65 +6394,61 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
// edge will be used to pass the Region Coordinates offset if(dir.x == 0.0 && dir.y == 0.0)
// we want to check for a neighboring sim return 1; // SL wiki
LSL_Vector edge = new LSL_Vector(0, 0, 0);
float rsx = World.RegionInfo.RegionSizeX;
float rsy = World.RegionInfo.RegionSizeY;
// can understand what sl does if position is not in region, so do something :)
float px = (float)Util.Clamp(pos.x, 0.5, rsx - 0.5);
float py = (float)Util.Clamp(pos.y, 0.5, rsy - 0.5);
float ex, ey;
if (dir.x == 0) if (dir.x == 0)
{ {
if (dir.y == 0) ex = px;
{ ey = dir.y > 0.0 ? rsy + 1.0f : -1.0f;
// Direction vector is 0,0 so return }
// false since we're staying in the sim else if(dir.y == 0.0f)
// no SL says true {
return 1; ex = dir.x > 0 ? rsx + 1.0f : -1.0f;
} ey = py;
else
{
// Y is the only valid direction
edge.y = dir.y / Math.Abs(dir.y) * (World.RegionInfo.RegionSizeY / Constants.RegionSize);
}
} }
else else
{ {
LSL_Float mag; float dx = (float) dir.x;
if (dir.x > 0) float dy = (float) dir.y;
{
mag = (World.RegionInfo.RegionSizeX - pos.x) / dir.x; float t1 = dx * dx + dy * dy;
} dx /= t1;
dy /= t1;
if(dx > 0)
t1 = (rsx + 1f - px)/dx;
else else
{ t1 = -(px + 1f)/dx;
mag = (pos.x/dir.x);
}
mag = Math.Abs(mag);
edge.y = pos.y + (dir.y * mag); float t2;
if(dy > 0)
if (edge.y > World.RegionInfo.RegionSizeY || edge.y < 0) t2 = (rsy + 1f - py)/dy;
{
// Y goes out of bounds first
edge.y = dir.y / Math.Abs(dir.y) * (World.RegionInfo.RegionSizeY / Constants.RegionSize);
}
else else
{ t2 = -(py + 1f)/dy;
// X goes out of bounds first or its a corner exit
edge.y = 0; if(t1 > t2)
edge.x = dir.x / Math.Abs(dir.x) * (World.RegionInfo.RegionSizeY / Constants.RegionSize); t1 = t2;
}
ex = px + t1 * dx;
ey = py + t1 * dy;
} }
List<GridRegion> neighbors = World.GridService.GetNeighbours(World.RegionInfo.ScopeID, World.RegionInfo.RegionID); ex += World.RegionInfo.WorldLocX;
ey += World.RegionInfo.WorldLocY;
uint neighborX = World.RegionInfo.RegionLocX + (uint)edge.x;
uint neighborY = World.RegionInfo.RegionLocY + (uint)edge.y;
foreach (GridRegion sri in neighbors)
{
if (sri.RegionCoordX == neighborX && sri.RegionCoordY == neighborY)
return 0;
}
if(World.GridService.GetRegionByPosition(World.RegionInfo.ScopeID, (int)ex, (int)ey) != null)
return 0;
return 1; return 1;
} }