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

* No more massive spires and massive pits when editing land using Select + tool + amount + apply;

ThreadPoolClientBranch
Teravus Ovares 2008-01-29 06:16:06 +00:00
parent da0fa4253b
commit 832243c6e8
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -165,7 +165,11 @@ namespace OpenSim.Region.Terrain
{ {
// Shiny. // Shiny.
double size = (double) (1 << brushsize); double size = (double) (1 << brushsize);
//System.Console.WriteLine("SIZE:" + size.ToString() + " Seconds:" + seconds.ToString());
if (seconds == 1)
{
seconds = 0.0315f;
}
/* Okay, so here's the deal /* Okay, so here's the deal
* This has to handle both when a user draws on the terrain *and* when a user selects * This has to handle both when a user draws on the terrain *and* when a user selects
* a selection of AABB on terrain and applies whatever routine the client requests * a selection of AABB on terrain and applies whatever routine the client requests
@ -202,6 +206,8 @@ namespace OpenSim.Region.Terrain
{ {
FlattenTerrain(y, x, size, (double) seconds/5.0); FlattenTerrain(y, x, size, (double) seconds/5.0);
lastEdit = DateTime.Now; lastEdit = DateTime.Now;
remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D());
} }
} }
break; break;
@ -213,6 +219,7 @@ namespace OpenSim.Region.Terrain
{ {
RaiseTerrain(y, x, size, (double) seconds/5.0); RaiseTerrain(y, x, size, (double) seconds/5.0);
lastEdit = DateTime.Now; lastEdit = DateTime.Now;
remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D());
} }
} }
break; break;
@ -224,6 +231,7 @@ namespace OpenSim.Region.Terrain
{ {
LowerTerrain(y, x, size, (double) seconds/5.0); LowerTerrain(y, x, size, (double) seconds/5.0);
lastEdit = DateTime.Now; lastEdit = DateTime.Now;
remoteUser.SendLayerData((int)(x / 16), (int)(x / 16), GetHeights1D());
} }
} }
break; break;
@ -297,6 +305,8 @@ namespace OpenSim.Region.Terrain
} }
/// <summary> /// <summary>
/// Checks to make sure the terrain is within baked values +/- maxRaise/minLower /// Checks to make sure the terrain is within baked values +/- maxRaise/minLower
/// </summary> /// </summary>