aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs3
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs3
2 files changed, 4 insertions, 2 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..e1d651b 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/FlattenSphere.cs
@@ -42,6 +42,7 @@ 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 double durationFactor = 0.15; //MCP: tuned, but would be nice to come from ini file
45 46
46 // compute delta map 47 // compute delta map
47 for (x = 0; x < map.Width; x++) 48 for (x = 0; x < map.Width; x++)
@@ -65,7 +66,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
65 { 66 {
66 for (y = 0; y < map.Height; y++) 67 for (y = 0; y < map.Height; y++)
67 { 68 {
68 double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration; 69 double z = TerrainUtil.SphericalFactor(x, y, rx, ry, strength) * duration * durationFactor;
69 70
70 if (z > 0) // add in non-zero amount 71 if (z > 0) // add in non-zero amount
71 { 72 {
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
index fc0a579..fa0389d 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/SmoothSphere.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
42 42
43 double area = strength; 43 double area = strength;
44 double step = strength / 4.0; 44 double step = strength / 4.0;
45 double durationFactor = 0.15; //MCP: tuned, but would be nice to come from ini file
45 46
46 // compute delta map 47 // compute delta map
47 for (x = 0; x < map.Width; x++) 48 for (x = 0; x < map.Width; x++)
@@ -80,7 +81,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes
80 { 81 {
81 double da = z; 82 double da = z;
82 double a = (map[x, y] - tweak[x, y]) * da; 83 double a = (map[x, y] - tweak[x, y]) * da;
83 double newz = map[x, y] - (a * duration); 84 double newz = map[x, y] - (a * duration * durationFactor);
84 85
85 if (newz > 0.0) 86 if (newz > 0.0)
86 map[x, y] = newz; 87 map[x, y] = newz;