* Terrain modification more robust, uses area sizes matching those employed by the client display.

* Terrain tools now account for the duration the cursor was held for.
* Terrain tools now support new brushes (completing the common set)
** Smooth brush
** Flatten brush
** Revert brush
** Noise brush

1 files changed, 83 insertions, 0 deletions

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index 2d0fb30..d1d54ad 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
@@ -542,6 +542,89 @@ namespace OpenSim.Terrain
         }

 

         /// <summary>

+        /// Flattens the land under the brush of specified coordinates (spherical mask)

+        /// </summary>

+        /// <param name="rx">Center of sphere</param>

+        /// <param name="ry">Center of sphere</param>

+        /// <param name="size">Radius of the sphere</param>

+        /// <param name="amount">Thickness of the mask (0..2 recommended)</param>

+        public void flatten(double rx, double ry, double size, double amount)

+        {

+            lock (heightmap)

+            {

+                heightmap.flatten(rx, ry, size, amount);

+            }

+

+            tainted++;

+        }

+

+        /// <summary>

+        /// Creates noise within the specified bounds

+        /// </summary>

+        /// <param name="rx">Center of the bounding sphere</param>

+        /// <param name="ry">Center of the bounding sphere</param>

+        /// <param name="size">The radius of the sphere</param>

+        /// <param name="amount">Strength of the mask (0..2) recommended</param>

+        public void noise(double rx, double ry, double size, double amount)

+        {

+            lock (heightmap)

+            {

+                Channel smoothed = new Channel();

+                smoothed.noise();

+

+                Channel mask = new Channel();

+                mask.raise(rx, ry, size, amount);

+

+                heightmap.blend(smoothed, mask);

+            }

+

+            tainted++;

+        }

+

+        /// <summary>

+        /// Reverts land within the specified bounds

+        /// </summary>

+        /// <param name="rx">Center of the bounding sphere</param>

+        /// <param name="ry">Center of the bounding sphere</param>

+        /// <param name="size">The radius of the sphere</param>

+        /// <param name="amount">Strength of the mask (0..2) recommended</param>

+        public void revert(double rx, double ry, double size, double amount)

+        {

+            lock (heightmap)

+            {

+                Channel mask = new Channel();

+                mask.raise(rx, ry, size, amount);

+

+                heightmap.blend(revertmap, mask);

+            }

+

+            tainted++;

+        }

+

+        /// <summary>

+        /// Smooths land under the brush of specified coordinates (spherical mask)

+        /// </summary>

+        /// <param name="rx">Center of the sphere</param>

+        /// <param name="ry">Center of the sphere</param>

+        /// <param name="size">Radius of the sphere</param>

+        /// <param name="amount">Thickness of the mask (0..2 recommended)</param>

+        public void smooth(double rx, double ry, double size, double amount)

+        {

+            lock (heightmap)

+            {

+                Channel smoothed = heightmap.copy();

+                smoothed.smooth(amount);

+

+                Channel mask = new Channel();

+                mask.raise(rx,ry,size,amount);

+

+                heightmap.blend(smoothed, mask);

+            }

+

+            tainted++;

+        }

+

+        /// <summary>

         /// Generates a simple set of hills in the shape of an island

         /// </summary>

         public void hills()