ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

change some loops/math

Browse Source
This commit is contained in:
UbitUmarov
2020-09-08 23:49:15 +01:00
parent 150ad80f6f
commit 8b885a4c7f
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@@ -140,6 +140,19 @@ namespace OpenSim.Region.CoreModules.World.Terrain
return updated[patchX + xsize * patchY];
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public bool GetByPatchAndClear(int patchX, int patchY)
{
int indx = patchX + xsize * patchY;
bool ret = updated[indx];
if(ret)
{
updated[indx] = false;
--updateCount;
}
return ret;
}
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public void SetByPatch(int patchX, int patchY, bool state)
{
@@ -1195,9 +1208,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{
for (; x < limitX; x++)
{
if (pups.GetByPatch(x, y))
if (pups.GetByPatchAndClear(x, y))
{
pups.SetByPatch(x, y, false);
patchs.Add(new PatchesToSend(x, y, 0));
if (++npatchs >= 128)
{
@@ -1301,25 +1313,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
else if (endY > limitY)
endY = limitY;
int distx;
int disty;
int distsq;
float distxsq;
float distysq = 0;
float distlimitsq;
DrawDistance *= DrawDistance;
for (int x = startX; x < endX; x++)
for (int y = startY; y < endY; y++)
{
for (int y = startY; y < endY; y++)
distysq = y - testposY;
distysq *= distysq;
distlimitsq = DrawDistance - distysq;
for (int x = startX; x < endX; x++)
{
if (pups.GetByPatch(x, y))
{
distx = x - testposX;
disty = y - testposY;
distsq = distx * distx + disty * disty;
if (distsq < DrawDistance)
distxsq = x - testposX;
distxsq *= distxsq;
if (distxsq < distlimitsq)
{
pups.SetByPatch(x, y, false);
ret.Add(new PatchesToSend(x, y, (float)distsq));
ret.Add(new PatchesToSend(x, y, distxsq + distysq));
if (npatchs++ > 1024)
{
y = endY;