diff options
author | Adam Frisby | 2008-03-03 08:35:59 +0000 |
---|---|---|
committer | Adam Frisby | 2008-03-03 08:35:59 +0000 |
commit | c5d1f87cd202663f2f26ca90a973d9763070dda3 (patch) | |
tree | b1941867d13d1d3b29b46483e6b58cba536c72ca /OpenSim/Region/Environment/Modules/Terrain/FloodBrushes | |
parent | * Applying Ahzz's profile patch. Thanks Ahzz! (diff) | |
download | opensim-SC_OLD-c5d1f87cd202663f2f26ca90a973d9763070dda3.zip opensim-SC_OLD-c5d1f87cd202663f2f26ca90a973d9763070dda3.tar.gz opensim-SC_OLD-c5d1f87cd202663f2f26ca90a973d9763070dda3.tar.bz2 opensim-SC_OLD-c5d1f87cd202663f2f26ca90a973d9763070dda3.tar.xz |
* Removed and sorted using clauses in a number of files.
* Cleaned up ITerrainChannel
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Paint Brushes
* Implemented Raise, Lower, Smooth, Flatten, Noise Terrain Fill Brushes
* Implemented Export functionality for RAW32 terrain loader
* Implemented Import/Export for SLRAW terrain loader
* Implemented Export for JPEG terrain loader
Diffstat (limited to '')
5 files changed, 317 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/FlattenArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/FlattenArea.cs new file mode 100644 index 0000000..d022fbe --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/FlattenArea.cs | |||
@@ -0,0 +1,73 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Text; | ||
31 | using OpenSim.Region.Environment.Modules.Terrain; | ||
32 | using OpenSim.Region.Environment.Interfaces; | ||
33 | |||
34 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes | ||
35 | { | ||
36 | public class FlattenArea : ITerrainFloodEffect | ||
37 | { | ||
38 | #region ITerrainFloodEffect Members | ||
39 | |||
40 | public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength) | ||
41 | { | ||
42 | double sum = 0.0; | ||
43 | double steps = 0.0; | ||
44 | double avg = 0.0; | ||
45 | |||
46 | int x, y; | ||
47 | for (x = 0; x < map.Width; x++) | ||
48 | { | ||
49 | for (y = 0; y < map.Height; y++) | ||
50 | { | ||
51 | if (fillArea[x, y] == true) | ||
52 | { | ||
53 | sum += map[x, y]; | ||
54 | steps += 1.0; | ||
55 | } | ||
56 | } | ||
57 | } | ||
58 | |||
59 | avg = sum / steps; | ||
60 | |||
61 | for (x = 0; x < map.Width; x++) | ||
62 | { | ||
63 | for (y = 0; y < map.Height; y++) | ||
64 | { | ||
65 | if (fillArea[x, y] == true) | ||
66 | map[x, y] = avg; | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | |||
71 | #endregion | ||
72 | } | ||
73 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/LowerArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/LowerArea.cs new file mode 100644 index 0000000..1706575 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/LowerArea.cs | |||
@@ -0,0 +1,53 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using OpenSim.Region.Environment.Interfaces; | ||
29 | |||
30 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes | ||
31 | { | ||
32 | public class LowerArea : ITerrainFloodEffect | ||
33 | { | ||
34 | #region ITerrainFloodEffect Members | ||
35 | |||
36 | public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength) | ||
37 | { | ||
38 | int x, y; | ||
39 | for (x = 0; x < map.Width; x++) | ||
40 | { | ||
41 | for (y = 0; y < map.Height; y++) | ||
42 | { | ||
43 | if (fillArea[x, y] == true) | ||
44 | { | ||
45 | map[x, y] -= strength; | ||
46 | } | ||
47 | } | ||
48 | } | ||
49 | } | ||
50 | |||
51 | #endregion | ||
52 | } | ||
53 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/NoiseArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/NoiseArea.cs new file mode 100644 index 0000000..690ca53 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/NoiseArea.cs | |||
@@ -0,0 +1,57 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using OpenSim.Region.Environment.Interfaces; | ||
29 | |||
30 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes | ||
31 | { | ||
32 | public class NoiseArea : ITerrainFloodEffect | ||
33 | { | ||
34 | #region ITerrainFloodEffect Members | ||
35 | |||
36 | public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength) | ||
37 | { | ||
38 | int x, y; | ||
39 | for (x = 0; x < map.Width; x++) | ||
40 | { | ||
41 | for (y = 0; y < map.Height; y++) | ||
42 | { | ||
43 | if (fillArea[x, y] == true) | ||
44 | { | ||
45 | lock (OpenSim.Framework.Util.RandomClass) | ||
46 | { | ||
47 | double noise = OpenSim.Framework.Util.RandomClass.NextDouble(); | ||
48 | map[x, y] += (noise - 0.5) * strength; | ||
49 | } | ||
50 | } | ||
51 | } | ||
52 | } | ||
53 | } | ||
54 | |||
55 | #endregion | ||
56 | } | ||
57 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/RaiseArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/RaiseArea.cs index 258b363..aad7aa4 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/RaiseArea.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/RaiseArea.cs | |||
@@ -1,7 +1,30 @@ | |||
1 | using System; | 1 | /* |
2 | using System.Collections.Generic; | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
3 | using System.Text; | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
4 | using OpenSim.Region.Environment.Modules.Terrain; | 4 | * |
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
5 | using OpenSim.Region.Environment.Interfaces; | 28 | using OpenSim.Region.Environment.Interfaces; |
6 | 29 | ||
7 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes | 30 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs new file mode 100644 index 0000000..aa685e4 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FloodBrushes/SmoothArea.cs | |||
@@ -0,0 +1,107 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
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 | ||
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 | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | using OpenSim.Region.Environment.Interfaces; | ||
29 | |||
30 | namespace OpenSim.Region.Environment.Modules.Terrain.FloodBrushes | ||
31 | { | ||
32 | public class SmoothArea : ITerrainFloodEffect | ||
33 | { | ||
34 | private double GetBilinearInterpolate(double x, double y, ITerrainChannel map) | ||
35 | { | ||
36 | int w = map.Width; | ||
37 | int h = map.Height; | ||
38 | |||
39 | if (x > w - 2.0) | ||
40 | x = w - 2.0; | ||
41 | if (y > h - 2.0) | ||
42 | y = h - 2.0; | ||
43 | if (x < 0.0) | ||
44 | x = 0.0; | ||
45 | if (y < 0.0) | ||
46 | y = 0.0; | ||
47 | |||
48 | int stepSize = 1; | ||
49 | double h00 = map[(int)x, (int)y]; | ||
50 | double h10 = map[(int)x + stepSize, (int)y]; | ||
51 | double h01 = map[(int)x, (int)y + stepSize]; | ||
52 | double h11 = map[(int)x + stepSize, (int)y + stepSize]; | ||
53 | double h1 = h00; | ||
54 | double h2 = h10; | ||
55 | double h3 = h01; | ||
56 | double h4 = h11; | ||
57 | double a00 = h1; | ||
58 | double a10 = h2 - h1; | ||
59 | double a01 = h3 - h1; | ||
60 | double a11 = h1 - h2 - h3 + h4; | ||
61 | double partialx = x - (int)x; | ||
62 | double partialz = y - (int)y; | ||
63 | double hi = a00 + (a10 * partialx) + (a01 * partialz) + (a11 * partialx * partialz); | ||
64 | return hi; | ||
65 | } | ||
66 | |||
67 | #region ITerrainFloodEffect Members | ||
68 | |||
69 | public void FloodEffect(ITerrainChannel map, bool[,] fillArea, double strength) | ||
70 | { | ||
71 | double area = strength; | ||
72 | double step = strength / 4.0; | ||
73 | |||
74 | double[,] manipulate = new double[map.Width, map.Height]; | ||
75 | int x, y; | ||
76 | double n, l; | ||
77 | for (x = 0; x < map.Width; x++) | ||
78 | { | ||
79 | for (y = 0; y < map.Height; y++) | ||
80 | { | ||
81 | double average = 0.0; | ||
82 | int avgsteps = 0; | ||
83 | |||
84 | for (n = 0.0 - area; n < area; n += step) | ||
85 | { | ||
86 | for (l = 0.0 - area; l < area; l += step) | ||
87 | { | ||
88 | avgsteps++; | ||
89 | average += GetBilinearInterpolate(x + n, y + l, map); | ||
90 | } | ||
91 | } | ||
92 | |||
93 | manipulate[x, y] = average / avgsteps; | ||
94 | } | ||
95 | } | ||
96 | for (x = 0; x < map.Width; x++) | ||
97 | { | ||
98 | for (y = 0; y < map.Height; y++) | ||
99 | { | ||
100 | map[x, y] = manipulate[x, y]; | ||
101 | } | ||
102 | } | ||
103 | } | ||
104 | |||
105 | #endregion | ||
106 | } | ||
107 | } \ No newline at end of file | ||