aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes
diff options
context:
space:
mode:
authorJeff Ames2008-03-03 09:29:21 +0000
committerJeff Ames2008-03-03 09:29:21 +0000
commitd50eb9d2b3f210da32440746451e98b57388c9cd (patch)
tree01f8a47dccac35f82e59ae78dcd61c9f65e7a16d /OpenSim/Region/Environment/Modules/Terrain/PaintBrushes
parentFixed typo. (diff)
downloadopensim-SC-d50eb9d2b3f210da32440746451e98b57388c9cd.zip
opensim-SC-d50eb9d2b3f210da32440746451e98b57388c9cd.tar.gz
opensim-SC-d50eb9d2b3f210da32440746451e98b57388c9cd.tar.bz2
opensim-SC-d50eb9d2b3f210da32440746451e98b57388c9cd.tar.xz
Updated svn properties.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Terrain/PaintBrushes')
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs248
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs130
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs146
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs258
4 files changed, 391 insertions, 391 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
index d2cf1bc..f02a8dd 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/FlattenSphere.cs
@@ -1,125 +1,125 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Environment.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes 30namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
31{ 31{
32 public class FlattenSphere : ITerrainPaintableEffect 32 public class FlattenSphere : ITerrainPaintableEffect
33 { 33 {
34 private double SphericalFactor(double x, double y, double rx, double ry, double size) 34 private double SphericalFactor(double x, double y, double rx, double ry, double size)
35 { 35 {
36 double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry)); 36 double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
37 return z; 37 return z;
38 } 38 }
39 39
40 private double GetBilinearInterpolate(double x, double y, ITerrainChannel map) 40 private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
41 { 41 {
42 int w = map.Width; 42 int w = map.Width;
43 int h = map.Height; 43 int h = map.Height;
44 44
45 if (x > w - 2.0) 45 if (x > w - 2.0)
46 x = w - 2.0; 46 x = w - 2.0;
47 if (y > h - 2.0) 47 if (y > h - 2.0)
48 y = h - 2.0; 48 y = h - 2.0;
49 if (x < 0.0) 49 if (x < 0.0)
50 x = 0.0; 50 x = 0.0;
51 if (y < 0.0) 51 if (y < 0.0)
52 y = 0.0; 52 y = 0.0;
53 53
54 int stepSize = 1; 54 int stepSize = 1;
55 double h00 = map[(int)x, (int)y]; 55 double h00 = map[(int)x, (int)y];
56 double h10 = map[(int)x + stepSize, (int)y]; 56 double h10 = map[(int)x + stepSize, (int)y];
57 double h01 = map[(int)x, (int)y + stepSize]; 57 double h01 = map[(int)x, (int)y + stepSize];
58 double h11 = map[(int)x + stepSize, (int)y + stepSize]; 58 double h11 = map[(int)x + stepSize, (int)y + stepSize];
59 double h1 = h00; 59 double h1 = h00;
60 double h2 = h10; 60 double h2 = h10;
61 double h3 = h01; 61 double h3 = h01;
62 double h4 = h11; 62 double h4 = h11;
63 double a00 = h1; 63 double a00 = h1;
64 double a10 = h2 - h1; 64 double a10 = h2 - h1;
65 double a01 = h3 - h1; 65 double a01 = h3 - h1;
66 double a11 = h1 - h2 - h3 + h4; 66 double a11 = h1 - h2 - h3 + h4;
67 double partialx = x - (int)x; 67 double partialx = x - (int)x;
68 double partialz = y - (int)y; 68 double partialz = y - (int)y;
69 double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz); 69 double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
70 return hi; 70 return hi;
71 } 71 }
72 72
73 #region ITerrainPaintableEffect Members 73 #region ITerrainPaintableEffect Members
74 74
75 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) 75 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength)
76 { 76 {
77 int x, y; 77 int x, y;
78 double[,] tweak = new double[map.Width, map.Height]; 78 double[,] tweak = new double[map.Width, map.Height];
79 79
80 double n, l; 80 double n, l;
81 double area = strength; 81 double area = strength;
82 double step = strength / 4.0; 82 double step = strength / 4.0;
83 83
84 double sum = 0.0; 84 double sum = 0.0;
85 double step2 = 0.0; 85 double step2 = 0.0;
86 double avg = 0.0; 86 double avg = 0.0;
87 87
88 // compute delta map 88 // compute delta map
89 for (x = 0; x < map.Width; x++) 89 for (x = 0; x < map.Width; x++)
90 { 90 {
91 for (y = 0; y < map.Height; y++) 91 for (y = 0; y < map.Height; y++)
92 { 92 {
93 double z = SphericalFactor(x, y, rx, ry, strength); 93 double z = SphericalFactor(x, y, rx, ry, strength);
94 94
95 if (z > 0) // add in non-zero amount 95 if (z > 0) // add in non-zero amount
96 { 96 {
97 sum += map[x, y] * z; 97 sum += map[x, y] * z;
98 step2 += z; 98 step2 += z;
99 } 99 }
100 } 100 }
101 } 101 }
102 102
103 avg = sum / step2; 103 avg = sum / step2;
104 104
105 // blend in map 105 // blend in map
106 for (x = 0; x < map.Width; x++) 106 for (x = 0; x < map.Width; x++)
107 { 107 {
108 for (y = 0; y < map.Height; y++) 108 for (y = 0; y < map.Height; y++)
109 { 109 {
110 double z = SphericalFactor(x, y, rx, ry, strength); 110 double z = SphericalFactor(x, y, rx, ry, strength);
111 111
112 if (z > 0) // add in non-zero amount 112 if (z > 0) // add in non-zero amount
113 { 113 {
114 if (z > 1.0) 114 if (z > 1.0)
115 z = 1.0; 115 z = 1.0;
116 116
117 map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z); 117 map[x, y] = (map[x, y] * (1.0 - z)) + (avg * z);
118 } 118 }
119 } 119 }
120 } 120 }
121 } 121 }
122 122
123 #endregion 123 #endregion
124 } 124 }
125} \ No newline at end of file 125} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
index 4a05e76..2902b9a 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/LowerSphere.cs
@@ -1,65 +1,65 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using System;
29using OpenSim.Region.Environment.Interfaces; 29using OpenSim.Region.Environment.Interfaces;
30 30
31namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes 31namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
32{ 32{
33 public class LowerSphere : ITerrainPaintableEffect 33 public class LowerSphere : ITerrainPaintableEffect
34 { 34 {
35 #region ITerrainPaintableEffect Members 35 #region ITerrainPaintableEffect Members
36 36
37 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) 37 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength)
38 { 38 {
39 int x, y; 39 int x, y;
40 for (x = 0; x < map.Width; x++) 40 for (x = 0; x < map.Width; x++)
41 { 41 {
42 // Skip everything unlikely to be affected 42 // Skip everything unlikely to be affected
43 if (Math.Abs(x - rx) > strength * 1.1) 43 if (Math.Abs(x - rx) > strength * 1.1)
44 continue; 44 continue;
45 45
46 for (y = 0; y < map.Height; y++) 46 for (y = 0; y < map.Height; y++)
47 { 47 {
48 // Skip everything unlikely to be affected 48 // Skip everything unlikely to be affected
49 if (Math.Abs(y - ry) > strength * 1.1) 49 if (Math.Abs(y - ry) > strength * 1.1)
50 continue; 50 continue;
51 51
52 // Calculate a sphere and add it to the heighmap 52 // Calculate a sphere and add it to the heighmap
53 double z = strength; 53 double z = strength;
54 z *= z; 54 z *= z;
55 z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry)); 55 z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
56 56
57 if (z > 0.0) 57 if (z > 0.0)
58 map[x, y] -= z; 58 map[x, y] -= z;
59 } 59 }
60 } 60 }
61 } 61 }
62 62
63 #endregion 63 #endregion
64 } 64 }
65} 65}
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
index 226bd3e..6f1d283 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/NoiseSphere.cs
@@ -1,73 +1,73 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System; 28using System;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Region.Environment.Interfaces; 30using OpenSim.Region.Environment.Interfaces;
31 31
32namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes 32namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
33{ 33{
34 public class NoiseSphere : ITerrainPaintableEffect 34 public class NoiseSphere : ITerrainPaintableEffect
35 { 35 {
36 #region ITerrainPaintableEffect Members 36 #region ITerrainPaintableEffect Members
37 37
38 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) 38 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength)
39 { 39 {
40 int x, y; 40 int x, y;
41 for (x = 0; x < map.Width; x++) 41 for (x = 0; x < map.Width; x++)
42 { 42 {
43 // Skip everything unlikely to be affected 43 // Skip everything unlikely to be affected
44 if (Math.Abs(x - rx) > strength * 1.1) 44 if (Math.Abs(x - rx) > strength * 1.1)
45 continue; 45 continue;
46 46
47 for (y = 0; y < map.Height; y++) 47 for (y = 0; y < map.Height; y++)
48 { 48 {
49 // Skip everything unlikely to be affected 49 // Skip everything unlikely to be affected
50 if (Math.Abs(y - ry) > strength * 1.1) 50 if (Math.Abs(y - ry) > strength * 1.1)
51 continue; 51 continue;
52 52
53 // Calculate a sphere and add it to the heighmap 53 // Calculate a sphere and add it to the heighmap
54 double z = strength; 54 double z = strength;
55 z *= z; 55 z *= z;
56 z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry)); 56 z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry));
57 57
58 double noise; 58 double noise;
59 59
60 lock (Util.RandomClass) 60 lock (Util.RandomClass)
61 { 61 {
62 noise = Util.RandomClass.NextDouble(); 62 noise = Util.RandomClass.NextDouble();
63 } 63 }
64 64
65 if (z > 0.0) 65 if (z > 0.0)
66 map[x, y] += (noise - 0.5) * z; 66 map[x, y] += (noise - 0.5) * z;
67 } 67 }
68 } 68 }
69 } 69 }
70 70
71 #endregion 71 #endregion
72 } 72 }
73} 73}
diff --git a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
index 076b3cc..dfe3dfc 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/PaintBrushes/SmoothSphere.cs
@@ -1,130 +1,130 @@
1/* 1/*
2* Copyright (c) Contributors, http://opensimulator.org/ 2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders. 3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4* 4*
5* Redistribution and use in source and binary forms, with or without 5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met: 6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright 7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer. 8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright 9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the 10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution. 11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSim Project nor the 12* * Neither the name of the OpenSim Project nor the
13* names of its contributors may be used to endorse or promote products 13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission. 14* derived from this software without specific prior written permission.
15* 15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY 16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY 19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using OpenSim.Region.Environment.Interfaces; 28using OpenSim.Region.Environment.Interfaces;
29 29
30namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes 30namespace OpenSim.Region.Environment.Modules.Terrain.PaintBrushes
31{ 31{
32 public class SmoothSphere : ITerrainPaintableEffect 32 public class SmoothSphere : ITerrainPaintableEffect
33 { 33 {
34 private double SphericalFactor(double x, double y, double rx, double ry, double size) 34 private double SphericalFactor(double x, double y, double rx, double ry, double size)
35 { 35 {
36 double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry)); 36 double z = size * size - ((x - rx) * (x - rx) + (y - ry) * (y - ry));
37 return z; 37 return z;
38 } 38 }
39 39
40 private double GetBilinearInterpolate(double x, double y, ITerrainChannel map) 40 private double GetBilinearInterpolate(double x, double y, ITerrainChannel map)
41 { 41 {
42 int w = map.Width; 42 int w = map.Width;
43 int h = map.Height; 43 int h = map.Height;
44 44
45 if (x > w - 2.0) 45 if (x > w - 2.0)
46 x = w - 2.0; 46 x = w - 2.0;
47 if (y > h - 2.0) 47 if (y > h - 2.0)
48 y = h - 2.0; 48 y = h - 2.0;
49 if (x < 0.0) 49 if (x < 0.0)
50 x = 0.0; 50 x = 0.0;
51 if (y < 0.0) 51 if (y < 0.0)
52 y = 0.0; 52 y = 0.0;
53 53
54 int stepSize = 1; 54 int stepSize = 1;
55 double h00 = map[(int)x, (int)y]; 55 double h00 = map[(int)x, (int)y];
56 double h10 = map[(int)x + stepSize, (int)y]; 56 double h10 = map[(int)x + stepSize, (int)y];
57 double h01 = map[(int)x, (int)y + stepSize]; 57 double h01 = map[(int)x, (int)y + stepSize];
58 double h11 = map[(int)x + stepSize, (int)y + stepSize]; 58 double h11 = map[(int)x + stepSize, (int)y + stepSize];
59 double h1 = h00; 59 double h1 = h00;
60 double h2 = h10; 60 double h2 = h10;
61 double h3 = h01; 61 double h3 = h01;
62 double h4 = h11; 62 double h4 = h11;
63 double a00 = h1; 63 double a00 = h1;
64 double a10 = h2 - h1; 64 double a10 = h2 - h1;
65 double a01 = h3 - h1; 65 double a01 = h3 - h1;
66 double a11 = h1 - h2 - h3 + h4; 66 double a11 = h1 - h2 - h3 + h4;
67 double partialx = x - (int)x; 67 double partialx = x - (int)x;
68 double partialz = y - (int)y; 68 double partialz = y - (int)y;
69 double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz); 69 double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz);
70 return hi; 70 return hi;
71 } 71 }
72 72
73 #region ITerrainPaintableEffect Members 73 #region ITerrainPaintableEffect Members
74 74
75 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength) 75 public void PaintEffect(ITerrainChannel map, double rx, double ry, double strength)
76 { 76 {
77 int x, y; 77 int x, y;
78 double[,] tweak = new double[map.Width, map.Height]; 78 double[,] tweak = new double[map.Width, map.Height];
79 79
80 double n, l; 80 double n, l;
81 double area = strength; 81 double area = strength;
82 double step = strength / 4.0; 82 double step = strength / 4.0;
83 83
84 // compute delta map 84 // compute delta map
85 for (x = 0; x < map.Width; x++) 85 for (x = 0; x < map.Width; x++)
86 { 86 {
87 for (y = 0; y < map.Height; y++) 87 for (y = 0; y < map.Height; y++)
88 { 88 {
89 double z = SphericalFactor(x, y, rx, ry, strength); 89 double z = SphericalFactor(x, y, rx, ry, strength);
90 90
91 if (z > 0) // add in non-zero amount 91 if (z > 0) // add in non-zero amount
92 { 92 {
93 double average = 0.0; 93 double average = 0.0;
94 int avgsteps = 0; 94 int avgsteps = 0;
95 95
96 for (n = 0.0 - area; n < area; n += step) 96 for (n = 0.0 - area; n < area; n += step)
97 { 97 {
98 for (l = 0.0 - area; l < area; l += step) 98 for (l = 0.0 - area; l < area; l += step)
99 { 99 {
100 avgsteps++; 100 avgsteps++;
101 average += GetBilinearInterpolate(x + n, y + l, map); 101 average += GetBilinearInterpolate(x + n, y + l, map);
102 } 102 }
103 } 103 }
104 tweak[x, y] = average / avgsteps; 104 tweak[x, y] = average / avgsteps;
105 } 105 }
106 } 106 }
107 } 107 }
108 // blend in map 108 // blend in map
109 for (x = 0; x < map.Width; x++) 109 for (x = 0; x < map.Width; x++)
110 { 110 {
111 for (y = 0; y < map.Height; y++) 111 for (y = 0; y < map.Height; y++)
112 { 112 {
113 double z = SphericalFactor(x, y, rx, ry, strength); 113 double z = SphericalFactor(x, y, rx, ry, strength);
114 114
115 if (z > 0) // add in non-zero amount 115 if (z > 0) // add in non-zero amount
116 { 116 {
117 double da = z; 117 double da = z;
118 double a = (map[x, y] - tweak[x, y]) * da; 118 double a = (map[x, y] - tweak[x, y]) * da;
119 double newz = map[x, y] - a; 119 double newz = map[x, y] - a;
120 120
121 if (newz > 0.0) 121 if (newz > 0.0)
122 map[x, y] = newz; 122 map[x, y] = newz;
123 } 123 }
124 } 124 }
125 } 125 }
126 } 126 }
127 127
128 #endregion 128 #endregion
129 } 129 }
130} \ No newline at end of file 130} \ No newline at end of file