diff options
author | Dr Scofield | 2008-09-16 07:19:22 +0000 |
---|---|---|
committer | Dr Scofield | 2008-09-16 07:19:22 +0000 |
commit | 03e3f88059908675652ec3da3b267bc04bab6c37 (patch) | |
tree | c46dac28d3f93b44cebff046bed8e1e18d17e9c5 /OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs | |
parent | Finish up OSSL enable/disable options in XEngine. (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs index fc0a579..89d9063 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs | |||
@@ -40,8 +40,10 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
40 | int x, y; | 40 | int x, y; |
41 | double[,] tweak = new double[map.Width,map.Height]; | 41 | double[,] tweak = new double[map.Width,map.Height]; |
42 | 42 | ||
43 | double area = strength; | 43 | double area = strength; |
44 | double step = strength / 4.0; | 44 | double step = strength / 4.0; |
45 | duration = 0.0045; //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++) |
@@ -91,4 +93,4 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
91 | 93 | ||
92 | #endregion | 94 | #endregion |
93 | } | 95 | } |
94 | } \ No newline at end of file | 96 | } |