diff options
author | Jeff Ames | 2008-04-06 14:11:44 +0000 |
---|---|---|
committer | Jeff Ames | 2008-04-06 14:11:44 +0000 |
commit | 7149c8b0c61e99041f5d6865c3b3a2ee6490f0ad (patch) | |
tree | 58c59003e6a0ab2b8c8d2927da39a82831604da8 /OpenSim/Region/Environment/Modules | |
parent | * Whoops, forgot to include all the new terrain file loaders and things. (diff) | |
download | opensim-SC_OLD-7149c8b0c61e99041f5d6865c3b3a2ee6490f0ad.zip opensim-SC_OLD-7149c8b0c61e99041f5d6865c3b3a2ee6490f0ad.tar.gz opensim-SC_OLD-7149c8b0c61e99041f5d6865c3b3a2ee6490f0ad.tar.bz2 opensim-SC_OLD-7149c8b0c61e99041f5d6865c3b3a2ee6490f0ad.tar.xz |
Update svn properties.
Diffstat (limited to '')
8 files changed, 593 insertions, 593 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/Effects/CookieCutter.cs b/OpenSim/Region/Environment/Modules/Terrain/Effects/CookieCutter.cs index 29a9003..8e51d40 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/Effects/CookieCutter.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/Effects/CookieCutter.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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | using OpenSim.Region.Environment.Modules.Terrain; | 30 | using OpenSim.Region.Environment.Modules.Terrain; |
31 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.Terrain.Effects | 34 | namespace OpenSim.Region.Environment.Modules.Terrain.Effects |
35 | { | 35 | { |
36 | class CookieCutter : ITerrainEffect | 36 | class CookieCutter : ITerrainEffect |
37 | { | 37 | { |
38 | #region ITerrainEffect Members | 38 | #region ITerrainEffect Members |
39 | 39 | ||
40 | public void RunEffect(ITerrainChannel map) | 40 | public void RunEffect(ITerrainChannel map) |
41 | { | 41 | { |
42 | FloodBrushes.SmoothArea smooth = new FloodBrushes.SmoothArea(); | 42 | FloodBrushes.SmoothArea smooth = new FloodBrushes.SmoothArea(); |
43 | ITerrainPaintableEffect eroder = new PaintBrushes.WeatherSphere(); | 43 | ITerrainPaintableEffect eroder = new PaintBrushes.WeatherSphere(); |
44 | 44 | ||
45 | bool[,] cliffMask = new bool[map.Width, map.Height]; | 45 | bool[,] cliffMask = new bool[map.Width, map.Height]; |
46 | bool[,] channelMask = new bool[map.Width, map.Height]; | 46 | bool[,] channelMask = new bool[map.Width, map.Height]; |
47 | bool[,] smoothMask = new bool[map.Width, map.Height]; | 47 | bool[,] smoothMask = new bool[map.Width, map.Height]; |
48 | 48 | ||
49 | Console.WriteLine("S1"); | 49 | Console.WriteLine("S1"); |
50 | 50 | ||
51 | // Step one, generate rough mask | 51 | // Step one, generate rough mask |
52 | int x, y; | 52 | int x, y; |
53 | for (x = 0; x < map.Width; x++) | 53 | for (x = 0; x < map.Width; x++) |
54 | { | 54 | { |
55 | for (y = 0; y < map.Height; y++) | 55 | for (y = 0; y < map.Height; y++) |
56 | { | 56 | { |
57 | Console.Write("."); | 57 | Console.Write("."); |
58 | smoothMask[x, y] = true; | 58 | smoothMask[x, y] = true; |
59 | 59 | ||
60 | // Start underwater | 60 | // Start underwater |
61 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; | 61 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 5; |
62 | // Add a little height. (terrain should now be above water, mostly.) | 62 | // Add a little height. (terrain should now be above water, mostly.) |
63 | map[x, y] += 20; | 63 | map[x, y] += 20; |
64 | 64 | ||
65 | int channelsX = 4; | 65 | int channelsX = 4; |
66 | int channelWidth = (map.Width / channelsX / 4); | 66 | int channelWidth = (map.Width / channelsX / 4); |
67 | int channelsY = 4; | 67 | int channelsY = 4; |
68 | int channelHeight = (map.Height / channelsY / 4); | 68 | int channelHeight = (map.Height / channelsY / 4); |
69 | 69 | ||
70 | SetLowerChannel(map, cliffMask, channelMask, x, y, channelsX, channelWidth, map.Width, x); | 70 | SetLowerChannel(map, cliffMask, channelMask, x, y, channelsX, channelWidth, map.Width, x); |
71 | SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y); | 71 | SetLowerChannel(map, cliffMask, channelMask, x, y, channelsY, channelHeight, map.Height, y); |
72 | } | 72 | } |
73 | } | 73 | } |
74 | 74 | ||
75 | Console.WriteLine("S2"); | 75 | Console.WriteLine("S2"); |
76 | //smooth.FloodEffect(map, smoothMask, 4.0); | 76 | //smooth.FloodEffect(map, smoothMask, 4.0); |
77 | 77 | ||
78 | Console.WriteLine("S3"); | 78 | Console.WriteLine("S3"); |
79 | for (x = 0; x < map.Width; x++) | 79 | for (x = 0; x < map.Width; x++) |
80 | { | 80 | { |
81 | for (y = 0; y < map.Height; y++) | 81 | for (y = 0; y < map.Height; y++) |
82 | { | 82 | { |
83 | if (cliffMask[x, y] == true) | 83 | if (cliffMask[x, y] == true) |
84 | eroder.PaintEffect(map, x, y, 4, 0.1); | 84 | eroder.PaintEffect(map, x, y, 4, 0.1); |
85 | } | 85 | } |
86 | } | 86 | } |
87 | 87 | ||
88 | for (x = 0; x < map.Width; x += 2) | 88 | for (x = 0; x < map.Width; x += 2) |
89 | { | 89 | { |
90 | for (y = 0; y < map.Height; y += 2) | 90 | for (y = 0; y < map.Height; y += 2) |
91 | { | 91 | { |
92 | if (map[x, y] < 0.1) | 92 | if (map[x, y] < 0.1) |
93 | map[x, y] = 0.1; | 93 | map[x, y] = 0.1; |
94 | if (map[x, y] > 256) | 94 | if (map[x, y] > 256) |
95 | map[x, y] = 256; | 95 | map[x, y] = 256; |
96 | } | 96 | } |
97 | } | 97 | } |
98 | //smooth.FloodEffect(map, smoothMask, 4.0); | 98 | //smooth.FloodEffect(map, smoothMask, 4.0); |
99 | } | 99 | } |
100 | 100 | ||
101 | private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth, int mapSize, int rp) | 101 | private static void SetLowerChannel(ITerrainChannel map, bool[,] cliffMask, bool[,] channelMask, int x, int y, int numChannels, int channelWidth, int mapSize, int rp) |
102 | { | 102 | { |
103 | for (int i = 0; i < numChannels; i++) | 103 | for (int i = 0; i < numChannels; i++) |
104 | { | 104 | { |
105 | double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i)); | 105 | double distanceToLine = Math.Abs(rp - ((mapSize / numChannels) * i)); |
106 | 106 | ||
107 | if (distanceToLine < channelWidth) | 107 | if (distanceToLine < channelWidth) |
108 | { | 108 | { |
109 | if (channelMask[x, y]) | 109 | if (channelMask[x, y]) |
110 | return; | 110 | return; |
111 | 111 | ||
112 | // Remove channels | 112 | // Remove channels |
113 | map[x, y] -= 10; | 113 | map[x, y] -= 10; |
114 | channelMask[x, y] = true; | 114 | channelMask[x, y] = true; |
115 | } | 115 | } |
116 | if (distanceToLine < 1) | 116 | if (distanceToLine < 1) |
117 | { | 117 | { |
118 | cliffMask[x, y] = true; | 118 | cliffMask[x, y] = true; |
119 | } | 119 | } |
120 | } | 120 | } |
121 | } | 121 | } |
122 | 122 | ||
123 | #endregion | 123 | #endregion |
124 | } | 124 | } |
125 | } | 125 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/Effects/DefaultTerrainGenerator.cs b/OpenSim/Region/Environment/Modules/Terrain/Effects/DefaultTerrainGenerator.cs index 429fa19..4f91ee5 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/Effects/DefaultTerrainGenerator.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/Effects/DefaultTerrainGenerator.cs | |||
@@ -1,59 +1,59 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using System.Text; | 29 | using System.Text; |
30 | using OpenSim.Region.Environment.Modules.Terrain; | 30 | using OpenSim.Region.Environment.Modules.Terrain; |
31 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
32 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Modules.Terrain.Effects | 34 | namespace OpenSim.Region.Environment.Modules.Terrain.Effects |
35 | { | 35 | { |
36 | class DefaultTerrainGenerator : ITerrainEffect | 36 | class DefaultTerrainGenerator : ITerrainEffect |
37 | { | 37 | { |
38 | #region ITerrainEffect Members | 38 | #region ITerrainEffect Members |
39 | 39 | ||
40 | public void RunEffect(ITerrainChannel map) | 40 | public void RunEffect(ITerrainChannel map) |
41 | { | 41 | { |
42 | int x, y; | 42 | int x, y; |
43 | for (x = 0; x < map.Width; x++) | 43 | for (x = 0; x < map.Width; x++) |
44 | { | 44 | { |
45 | for (y = 0; y < map.Height; y++) | 45 | for (y = 0; y < map.Height; y++) |
46 | { | 46 | { |
47 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10; | 47 | map[x, y] = TerrainUtil.PerlinNoise2D(x, y, 3, 0.25) * 10; |
48 | double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01; | 48 | double spherFac = TerrainUtil.SphericalFactor(x, y, Constants.RegionSize / 2, Constants.RegionSize / 2, 50) * 0.01; |
49 | if (map[x, y] < spherFac) | 49 | if (map[x, y] < spherFac) |
50 | { | 50 | { |
51 | map[x, y] = spherFac; | 51 | map[x, y] = spherFac; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | } | 54 | } |
55 | } | 55 | } |
56 | 56 | ||
57 | #endregion | 57 | #endregion |
58 | } | 58 | } |
59 | } | 59 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs index 3ee707e..56c511e 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/BMP.cs | |||
@@ -1,47 +1,47 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Drawing; | 28 | using System.Drawing; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
32 | { | 32 | { |
33 | class BMP : GenericSystemDrawing | 33 | class BMP : GenericSystemDrawing |
34 | { | 34 | { |
35 | public override void SaveFile(string filename, ITerrainChannel map) | 35 | public override void SaveFile(string filename, ITerrainChannel map) |
36 | { | 36 | { |
37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); | 37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); |
38 | 38 | ||
39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Bmp); | 39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Bmp); |
40 | } | 40 | } |
41 | 41 | ||
42 | public override string ToString() | 42 | public override string ToString() |
43 | { | 43 | { |
44 | return "BMP"; | 44 | return "BMP"; |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs index 377bc53..7f07fd9 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GIF.cs | |||
@@ -1,47 +1,47 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Drawing; | 28 | using System.Drawing; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
32 | { | 32 | { |
33 | class GIF : GenericSystemDrawing | 33 | class GIF : GenericSystemDrawing |
34 | { | 34 | { |
35 | public override void SaveFile(string filename, ITerrainChannel map) | 35 | public override void SaveFile(string filename, ITerrainChannel map) |
36 | { | 36 | { |
37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); | 37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); |
38 | 38 | ||
39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Gif); | 39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Gif); |
40 | } | 40 | } |
41 | 41 | ||
42 | public override string ToString() | 42 | public override string ToString() |
43 | { | 43 | { |
44 | return "GIF"; | 44 | return "GIF"; |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs index 1b607c7..e24d3e5 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/GenericSystemDrawing.cs | |||
@@ -1,127 +1,127 @@ | |||
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Drawing; | 29 | using System.Drawing; |
30 | using OpenSim.Region.Environment.Interfaces; | 30 | using OpenSim.Region.Environment.Interfaces; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 32 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
33 | { | 33 | { |
34 | public class GenericSystemDrawing : ITerrainLoader | 34 | public class GenericSystemDrawing : ITerrainLoader |
35 | { | 35 | { |
36 | #region ITerrainLoader Members | 36 | #region ITerrainLoader Members |
37 | 37 | ||
38 | public virtual ITerrainChannel LoadFile(string filename) | 38 | public virtual ITerrainChannel LoadFile(string filename) |
39 | { | 39 | { |
40 | Bitmap file = new Bitmap(filename); | 40 | Bitmap file = new Bitmap(filename); |
41 | 41 | ||
42 | ITerrainChannel retval = new TerrainChannel(file.Width, file.Height); | 42 | ITerrainChannel retval = new TerrainChannel(file.Width, file.Height); |
43 | 43 | ||
44 | int x, y; | 44 | int x, y; |
45 | for (x = 0; x < file.Width; x++) | 45 | for (x = 0; x < file.Width; x++) |
46 | { | 46 | { |
47 | for (y = 0; y < file.Height; y++) | 47 | for (y = 0; y < file.Height; y++) |
48 | { | 48 | { |
49 | retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128; | 49 | retval[x, y] = file.GetPixel(x, y).GetBrightness() * 128; |
50 | } | 50 | } |
51 | } | 51 | } |
52 | 52 | ||
53 | return retval; | 53 | return retval; |
54 | } | 54 | } |
55 | 55 | ||
56 | public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h) | 56 | public ITerrainChannel LoadFile(string filename, int x, int y, int fileWidth, int fileHeight, int w, int h) |
57 | { | 57 | { |
58 | throw new NotImplementedException(); | 58 | throw new NotImplementedException(); |
59 | } | 59 | } |
60 | 60 | ||
61 | public override string ToString() | 61 | public override string ToString() |
62 | { | 62 | { |
63 | return "SYS.DRAWING"; | 63 | return "SYS.DRAWING"; |
64 | } | 64 | } |
65 | 65 | ||
66 | protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map) | 66 | protected Bitmap CreateGrayscaleBitmapFromMap(ITerrainChannel map) |
67 | { | 67 | { |
68 | Bitmap bmp = new Bitmap(map.Width, map.Height); | 68 | Bitmap bmp = new Bitmap(map.Width, map.Height); |
69 | 69 | ||
70 | int pallete = 256; | 70 | int pallete = 256; |
71 | 71 | ||
72 | Color[] grays = new Color[pallete]; | 72 | Color[] grays = new Color[pallete]; |
73 | for (int i = 0; i < grays.Length; i++) | 73 | for (int i = 0; i < grays.Length; i++) |
74 | { | 74 | { |
75 | grays[i] = Color.FromArgb(i, i, i); | 75 | grays[i] = Color.FromArgb(i, i, i); |
76 | } | 76 | } |
77 | 77 | ||
78 | for (int y = 0; y < map.Height; y++) | 78 | for (int y = 0; y < map.Height; y++) |
79 | { | 79 | { |
80 | for (int x = 0; x < map.Width; x++) | 80 | for (int x = 0; x < map.Width; x++) |
81 | { | 81 | { |
82 | // 512 is the largest possible height before colours clamp | 82 | // 512 is the largest possible height before colours clamp |
83 | int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1)); | 83 | int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 128.0), 0.0) * (pallete - 1)); |
84 | 84 | ||
85 | bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]); | 85 | bmp.SetPixel(x, map.Height - y - 1, grays[colorindex]); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | return bmp; | 88 | return bmp; |
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | protected Bitmap CreateBitmapFromMap(ITerrainChannel map) | 92 | protected Bitmap CreateBitmapFromMap(ITerrainChannel map) |
93 | { | 93 | { |
94 | Bitmap gradientmapLd = new Bitmap("defaultstripe.png"); | 94 | Bitmap gradientmapLd = new Bitmap("defaultstripe.png"); |
95 | 95 | ||
96 | int pallete = gradientmapLd.Height; | 96 | int pallete = gradientmapLd.Height; |
97 | 97 | ||
98 | Bitmap bmp = new Bitmap(map.Width, map.Height); | 98 | Bitmap bmp = new Bitmap(map.Width, map.Height); |
99 | Color[] colours = new Color[pallete]; | 99 | Color[] colours = new Color[pallete]; |
100 | 100 | ||
101 | for (int i = 0; i < pallete; i++) | 101 | for (int i = 0; i < pallete; i++) |
102 | { | 102 | { |
103 | colours[i] = gradientmapLd.GetPixel(0, i); | 103 | colours[i] = gradientmapLd.GetPixel(0, i); |
104 | } | 104 | } |
105 | 105 | ||
106 | for (int y = 0; y < map.Height; y++) | 106 | for (int y = 0; y < map.Height; y++) |
107 | { | 107 | { |
108 | for (int x = 0; x < map.Width; x++) | 108 | for (int x = 0; x < map.Width; x++) |
109 | { | 109 | { |
110 | // 512 is the largest possible height before colours clamp | 110 | // 512 is the largest possible height before colours clamp |
111 | int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1)); | 111 | int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1)); |
112 | bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]); | 112 | bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]); |
113 | } | 113 | } |
114 | } | 114 | } |
115 | return bmp; | 115 | return bmp; |
116 | } | 116 | } |
117 | 117 | ||
118 | public virtual void SaveFile(string filename, ITerrainChannel map) | 118 | public virtual void SaveFile(string filename, ITerrainChannel map) |
119 | { | 119 | { |
120 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); | 120 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); |
121 | 121 | ||
122 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png); | 122 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png); |
123 | } | 123 | } |
124 | 124 | ||
125 | #endregion | 125 | #endregion |
126 | } | 126 | } |
127 | } | 127 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs index 7106e6f..d7f34ee 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/PNG.cs | |||
@@ -1,47 +1,47 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Drawing; | 28 | using System.Drawing; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
32 | { | 32 | { |
33 | class PNG : GenericSystemDrawing | 33 | class PNG : GenericSystemDrawing |
34 | { | 34 | { |
35 | public override void SaveFile(string filename, ITerrainChannel map) | 35 | public override void SaveFile(string filename, ITerrainChannel map) |
36 | { | 36 | { |
37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); | 37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); |
38 | 38 | ||
39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png); | 39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Png); |
40 | } | 40 | } |
41 | 41 | ||
42 | public override string ToString() | 42 | public override string ToString() |
43 | { | 43 | { |
44 | return "PNG"; | 44 | return "PNG"; |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs index 9ca6e2a..8eb53fc 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/TIFF.cs | |||
@@ -1,47 +1,47 @@ | |||
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 | using System; | 27 | using System; |
28 | using System.Drawing; | 28 | using System.Drawing; |
29 | using OpenSim.Region.Environment.Interfaces; | 29 | using OpenSim.Region.Environment.Interfaces; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 31 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
32 | { | 32 | { |
33 | class TIFF : GenericSystemDrawing | 33 | class TIFF : GenericSystemDrawing |
34 | { | 34 | { |
35 | public override void SaveFile(string filename, ITerrainChannel map) | 35 | public override void SaveFile(string filename, ITerrainChannel map) |
36 | { | 36 | { |
37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); | 37 | Bitmap colours = CreateGrayscaleBitmapFromMap(map); |
38 | 38 | ||
39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Tiff); | 39 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Tiff); |
40 | } | 40 | } |
41 | 41 | ||
42 | public override string ToString() | 42 | public override string ToString() |
43 | { | 43 | { |
44 | return "TIFF"; | 44 | return "TIFF"; |
45 | } | 45 | } |
46 | } | 46 | } |
47 | } | 47 | } |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/MapImageModule.cs b/OpenSim/Region/Environment/Modules/Terrain/MapImageModule.cs index 01695de..c4334e0 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/MapImageModule.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/MapImageModule.cs | |||
@@ -1,94 +1,94 @@ | |||
1 | using System; | 1 | using System; |
2 | using System.Collections.Generic; | 2 | using System.Collections.Generic; |
3 | using System.Drawing; | 3 | using System.Drawing; |
4 | using libsecondlife; | 4 | using libsecondlife; |
5 | using Nini.Config; | 5 | using Nini.Config; |
6 | using OpenSim.Framework; | 6 | using OpenSim.Framework; |
7 | using OpenSim.Region.Environment.Interfaces; | 7 | using OpenSim.Region.Environment.Interfaces; |
8 | using OpenSim.Region.Environment.Scenes; | 8 | using OpenSim.Region.Environment.Scenes; |
9 | using OpenSim.Region.Environment.Modules.ModuleFramework; | 9 | using OpenSim.Region.Environment.Modules.ModuleFramework; |
10 | 10 | ||
11 | namespace OpenSim.Region.Environment.Modules.Terrain | 11 | namespace OpenSim.Region.Environment.Modules.Terrain |
12 | { | 12 | { |
13 | class MapImageModule : ITerrainTemp, IRegionModule | 13 | class MapImageModule : ITerrainTemp, IRegionModule |
14 | { | 14 | { |
15 | private Scene m_scene; | 15 | private Scene m_scene; |
16 | #region IRegionModule Members | 16 | #region IRegionModule Members |
17 | 17 | ||
18 | public void Initialise(Scene scene, IConfigSource source) | 18 | public void Initialise(Scene scene, IConfigSource source) |
19 | { | 19 | { |
20 | m_scene = scene; | 20 | m_scene = scene; |
21 | m_scene.RegisterModuleInterface<ITerrainTemp>(this); | 21 | m_scene.RegisterModuleInterface<ITerrainTemp>(this); |
22 | } | 22 | } |
23 | 23 | ||
24 | public void PostInitialise() | 24 | public void PostInitialise() |
25 | { | 25 | { |
26 | } | 26 | } |
27 | 27 | ||
28 | public void Close() | 28 | public void Close() |
29 | { | 29 | { |
30 | } | 30 | } |
31 | 31 | ||
32 | public string Name | 32 | public string Name |
33 | { | 33 | { |
34 | get { return "MapImageModule"; } | 34 | get { return "MapImageModule"; } |
35 | } | 35 | } |
36 | 36 | ||
37 | public bool IsSharedModule | 37 | public bool IsSharedModule |
38 | { | 38 | { |
39 | get { return false; } | 39 | get { return false; } |
40 | } | 40 | } |
41 | 41 | ||
42 | 42 | ||
43 | public byte[] WriteJpegImage(string gradientmap) | 43 | public byte[] WriteJpegImage(string gradientmap) |
44 | { | 44 | { |
45 | byte[] imageData = null; | 45 | byte[] imageData = null; |
46 | try | 46 | try |
47 | { | 47 | { |
48 | Bitmap bmp = TerrainToBitmap(gradientmap); | 48 | Bitmap bmp = TerrainToBitmap(gradientmap); |
49 | 49 | ||
50 | imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, true); | 50 | imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, true); |
51 | 51 | ||
52 | } | 52 | } |
53 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke | 53 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke |
54 | { | 54 | { |
55 | Console.WriteLine("Failed generating terrain map: " + e.ToString()); | 55 | Console.WriteLine("Failed generating terrain map: " + e.ToString()); |
56 | } | 56 | } |
57 | 57 | ||
58 | return imageData; | 58 | return imageData; |
59 | } | 59 | } |
60 | 60 | ||
61 | private Bitmap TerrainToBitmap(string gradientmap) | 61 | private Bitmap TerrainToBitmap(string gradientmap) |
62 | { | 62 | { |
63 | Bitmap gradientmapLd = new Bitmap(gradientmap); | 63 | Bitmap gradientmapLd = new Bitmap(gradientmap); |
64 | 64 | ||
65 | int pallete = gradientmapLd.Height; | 65 | int pallete = gradientmapLd.Height; |
66 | 66 | ||
67 | Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height); | 67 | Bitmap bmp = new Bitmap(m_scene.Heightmap.Width, m_scene.Heightmap.Height); |
68 | Color[] colours = new Color[pallete]; | 68 | Color[] colours = new Color[pallete]; |
69 | 69 | ||
70 | for (int i = 0; i < pallete; i++) | 70 | for (int i = 0; i < pallete; i++) |
71 | { | 71 | { |
72 | colours[i] = gradientmapLd.GetPixel(0, i); | 72 | colours[i] = gradientmapLd.GetPixel(0, i); |
73 | } | 73 | } |
74 | 74 | ||
75 | lock (m_scene.Heightmap) | 75 | lock (m_scene.Heightmap) |
76 | { | 76 | { |
77 | ITerrainChannel copy = m_scene.Heightmap; | 77 | ITerrainChannel copy = m_scene.Heightmap; |
78 | for (int y = 0; y < copy.Height; y++) | 78 | for (int y = 0; y < copy.Height; y++) |
79 | { | 79 | { |
80 | for (int x = 0; x < copy.Width; x++) | 80 | for (int x = 0; x < copy.Width; x++) |
81 | { | 81 | { |
82 | // 512 is the largest possible height before colours clamp | 82 | // 512 is the largest possible height before colours clamp |
83 | int colorindex = (int)(Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1)); | 83 | int colorindex = (int)(Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1)); |
84 | bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]); | 84 | bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]); |
85 | } | 85 | } |
86 | } | 86 | } |
87 | } | 87 | } |
88 | return bmp; | 88 | return bmp; |
89 | } | 89 | } |
90 | 90 | ||
91 | 91 | ||
92 | #endregion | 92 | #endregion |
93 | } | 93 | } |
94 | } | 94 | } |