aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
diff options
context:
space:
mode:
authorDr Scofield2008-09-16 07:19:22 +0000
committerDr Scofield2008-09-16 07:19:22 +0000
commit03e3f88059908675652ec3da3b267bc04bab6c37 (patch)
treec46dac28d3f93b44cebff046bed8e1e18d17e9c5 /OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
parentFinish up OSSL enable/disable options in XEngine. (diff)
downloadopensim-SC_OLD-03e3f88059908675652ec3da3b267bc04bab6c37.zip
opensim-SC_OLD-03e3f88059908675652ec3da3b267bc04bab6c37.tar.gz
opensim-SC_OLD-03e3f88059908675652ec3da3b267bc04bab6c37.tar.bz2
opensim-SC_OLD-03e3f88059908675652ec3da3b267bc04bab6c37.tar.xz
From: mike pitman <pitman@us.ibm.com>
New patch (terrainedit2.patch) is attached that passes unit tests ( and in fact supplies the new unit test to pass..:) The previous failure was due to the change of the brush size to be linear instead of exponential, and the fact that the test parameters were assuming the exponentional brush size. This patch also removes dependency on 'duration' argument for adjustment step size. This should address the widely differing reports of instability with terrain editing. Note: 'doing this right' implies ultimately reading the parameters from the ini file, which this patch does not do.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
index 7bf88f0..40fb01e 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
42 42
43 double sum = 0.0; 43 double sum = 0.0;
44 double step2 = 0.0; 44 double step2 = 0.0;
45 duration = 0.009; //MCP Should be read from ini file
46
45 47
46 // compute delta map 48 // compute delta map
47 for (x = 0; x < map.Width; x++) 49 for (x = 0; x < map.Width; x++)
@@ -80,4 +82,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
80 82
81 #endregion 83 #endregion
82 } 84 }
83} \ No newline at end of file 85}