aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
diff options
context:
space:
mode:
authorDr Scofield2008-09-15 13:44:58 +0000
committerDr Scofield2008-09-15 13:44:58 +0000
commit0e2edbb5d4ce62697b4a9625cdaba63d97fac059 (patch)
treedcc516c465a90b99b220138d1467e55a218f1a4c /OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
parent* Remove a hack I put into OGP so that I could test OGP over SSL with the See... (diff)
downloadopensim-SC_OLD-0e2edbb5d4ce62697b4a9625cdaba63d97fac059.zip
opensim-SC_OLD-0e2edbb5d4ce62697b4a9625cdaba63d97fac059.tar.gz
opensim-SC_OLD-0e2edbb5d4ce62697b4a9625cdaba63d97fac059.tar.bz2
opensim-SC_OLD-0e2edbb5d4ce62697b4a9625cdaba63d97fac059.tar.xz
From: mike pitman <pitman@us.ibm.com>
fixes the terrain spikes, and is the result of mostly a tuning operation on the smooth and flatten tools. I dug in and found that the spikes apparently result from smooth's overly aggressive iteration steps toward the average curvature, which leads to an instability that blows up the heights. I introduced a scaling factor to dampen the 'duration' parameter which tames progress and seems to keep things stable.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
index def28eb..797c6a0 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainUtil.cs
@@ -34,7 +34,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
34 { 34 {
35 public static double MetersToSphericalStrength(double size) 35 public static double MetersToSphericalStrength(double size)
36 { 36 {
37 return Math.Pow(2, size); 37 //return Math.Pow(2, size);
38 return (size + 1) * 2.0; // MCP: a more useful brush size range
38 } 39 }
39 40
40 public static double SphericalFactor(double x, double y, double rx, double ry, double size) 41 public static double SphericalFactor(double x, double y, double rx, double ry, double size)