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/FileLoaders | |
parent | * Applying Ahzz's profile patch. Thanks Ahzz! (diff) | |
download | opensim-SC-c5d1f87cd202663f2f26ca90a973d9763070dda3.zip opensim-SC-c5d1f87cd202663f2f26ca90a973d9763070dda3.tar.gz opensim-SC-c5d1f87cd202663f2f26ca90a973d9763070dda3.tar.bz2 opensim-SC-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 'OpenSim/Region/Environment/Modules/Terrain/FileLoaders')
4 files changed, 286 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs new file mode 100644 index 0000000..57e6cd8 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/JPEG.cs | |||
@@ -0,0 +1,79 @@ | |||
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.IO; | ||
30 | using System.Drawing; | ||
31 | using OpenSim.Region.Environment.Interfaces; | ||
32 | |||
33 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | ||
34 | { | ||
35 | public class JPEG : ITerrainLoader | ||
36 | { | ||
37 | #region ITerrainLoader Members | ||
38 | |||
39 | public ITerrainChannel LoadFile(string filename) | ||
40 | { | ||
41 | throw new NotImplementedException(); | ||
42 | } | ||
43 | |||
44 | private Bitmap CreateBitmapFromMap(ITerrainChannel map) | ||
45 | { | ||
46 | Bitmap gradientmapLd = new Bitmap("defaultstripe.png"); | ||
47 | |||
48 | int pallete = gradientmapLd.Height; | ||
49 | |||
50 | Bitmap bmp = new Bitmap(heightmap.w, heightmap.h); | ||
51 | Color[] colours = new Color[pallete]; | ||
52 | |||
53 | for (int i = 0; i < pallete; i++) | ||
54 | { | ||
55 | colours[i] = gradientmapLd.GetPixel(0, i); | ||
56 | } | ||
57 | |||
58 | for (int y = 0; y < copy.h; y++) | ||
59 | { | ||
60 | for (int x = 0; x < copy.w; x++) | ||
61 | { | ||
62 | // 512 is the largest possible height before colours clamp | ||
63 | int colorindex = (int)(Math.Max(Math.Min(1.0, map[x, y] / 512.0), 0.0) * (pallete - 1)); | ||
64 | bmp.SetPixel(x, map.Height - y - 1, colours[colorindex]); | ||
65 | } | ||
66 | } | ||
67 | return bmp; | ||
68 | } | ||
69 | |||
70 | public void SaveFile(string filename, ITerrainChannel map) | ||
71 | { | ||
72 | Bitmap colours = CreateBitmapFromMap(map); | ||
73 | |||
74 | colours.Save(filename, System.Drawing.Imaging.ImageFormat.Jpeg); | ||
75 | } | ||
76 | |||
77 | #endregion | ||
78 | } | ||
79 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs new file mode 100644 index 0000000..58dc6c7 --- /dev/null +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/LLRAW.cs | |||
@@ -0,0 +1,132 @@ | |||
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.IO; | ||
30 | using OpenSim.Region.Environment.Interfaces; | ||
31 | |||
32 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | ||
33 | { | ||
34 | public class LLRAW : ITerrainLoader | ||
35 | { | ||
36 | #region ITerrainLoader Members | ||
37 | |||
38 | public ITerrainChannel LoadFile(string filename) | ||
39 | { | ||
40 | TerrainChannel retval = new TerrainChannel(); | ||
41 | |||
42 | FileInfo file = new FileInfo(filename); | ||
43 | FileStream s = file.Open(FileMode.Open, FileAccess.Read); | ||
44 | BinaryReader bs = new BinaryReader(s); | ||
45 | int x, y; | ||
46 | for (y = 0; y < retval.Height; y++) | ||
47 | { | ||
48 | for (x = 0; x < retval.Width; x++) | ||
49 | { | ||
50 | retval[x, y] = (double)bs.ReadByte() * ((double)bs.ReadByte() / 127.0); | ||
51 | bs.ReadBytes(11); // Advance the stream to next bytes. | ||
52 | } | ||
53 | } | ||
54 | |||
55 | bs.Close(); | ||
56 | s.Close(); | ||
57 | |||
58 | return retval; | ||
59 | } | ||
60 | |||
61 | public void SaveFile(string filename, ITerrainChannel map) | ||
62 | { | ||
63 | FileInfo file = new FileInfo(filename); | ||
64 | FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); | ||
65 | BinaryWriter binStream = new BinaryWriter(s); | ||
66 | |||
67 | // Generate a smegging big lookup table to speed the operation up (it needs it) | ||
68 | double[] lookupHeightTable = new double[65536]; | ||
69 | int i, j, x, y; | ||
70 | for (i = 0; i < 256; i++) | ||
71 | { | ||
72 | for (j = 0; j < 256; j++) | ||
73 | { | ||
74 | lookupHeightTable[i + (j * 256)] = ((double)i * ((double)j / 127.0)); | ||
75 | } | ||
76 | } | ||
77 | |||
78 | // Output the calculated raw | ||
79 | for (y = 0; y < map.Height; y++) | ||
80 | { | ||
81 | for (x = 0; x < map.Width; x++) | ||
82 | { | ||
83 | double t = map[x, y]; | ||
84 | double min = double.MaxValue; | ||
85 | int index = 0; | ||
86 | |||
87 | for (i = 0; i < 65536; i++) | ||
88 | { | ||
89 | if (Math.Abs(t - lookupHeightTable[i]) < min) | ||
90 | { | ||
91 | min = Math.Abs(t - lookupHeightTable[i]); | ||
92 | index = i; | ||
93 | } | ||
94 | } | ||
95 | |||
96 | byte red = (byte)(index & 0xFF); | ||
97 | byte green = (byte)((index >> 8) & 0xFF); | ||
98 | byte blue = 20; | ||
99 | byte alpha1 = 0; // Land Parcels | ||
100 | byte alpha2 = 0; // For Sale Land | ||
101 | byte alpha3 = 0; // Public Edit Object | ||
102 | byte alpha4 = 0; // Public Edit Land | ||
103 | byte alpha5 = 255; // Safe Land | ||
104 | byte alpha6 = 255; // Flying Allowed | ||
105 | byte alpha7 = 255; // Create Landmark | ||
106 | byte alpha8 = 255; // Outside Scripts | ||
107 | byte alpha9 = red; | ||
108 | byte alpha10 = green; | ||
109 | |||
110 | binStream.Write(red); | ||
111 | binStream.Write(green); | ||
112 | binStream.Write(blue); | ||
113 | binStream.Write(alpha1); | ||
114 | binStream.Write(alpha2); | ||
115 | binStream.Write(alpha3); | ||
116 | binStream.Write(alpha4); | ||
117 | binStream.Write(alpha5); | ||
118 | binStream.Write(alpha6); | ||
119 | binStream.Write(alpha7); | ||
120 | binStream.Write(alpha8); | ||
121 | binStream.Write(alpha9); | ||
122 | binStream.Write(alpha10); | ||
123 | } | ||
124 | } | ||
125 | |||
126 | binStream.Close(); | ||
127 | s.Close(); | ||
128 | } | ||
129 | |||
130 | #endregion | ||
131 | } | ||
132 | } | ||
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs index bf716c5..d69d62a 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/RAW32.cs | |||
@@ -1,8 +1,32 @@ | |||
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 | * | ||
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; | ||
4 | using System.IO; | 29 | using System.IO; |
5 | using OpenSim.Region.Environment.Modules.Terrain; | ||
6 | using OpenSim.Region.Environment.Interfaces; | 30 | using OpenSim.Region.Environment.Interfaces; |
7 | 31 | ||
8 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 32 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
@@ -33,9 +57,23 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
33 | return retval; | 57 | return retval; |
34 | } | 58 | } |
35 | 59 | ||
36 | public void SaveFile(string filename) | 60 | public void SaveFile(string filename, ITerrainChannel map) |
37 | { | 61 | { |
38 | throw new NotImplementedException(); | 62 | FileInfo file = new FileInfo(filename); |
63 | FileStream s = file.Open(FileMode.CreateNew, FileAccess.Write); | ||
64 | BinaryWriter bs = new BinaryWriter(s); | ||
65 | |||
66 | int x, y; | ||
67 | for (y = 0; y < h; y++) | ||
68 | { | ||
69 | for (x = 0; x < w; x++) | ||
70 | { | ||
71 | bs.Write((float)map[x, y]); | ||
72 | } | ||
73 | } | ||
74 | |||
75 | bs.Close(); | ||
76 | s.Close(); | ||
39 | } | 77 | } |
40 | 78 | ||
41 | #endregion | 79 | #endregion |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs index b12d99f..d93400f 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/FileLoaders/Terragen.cs | |||
@@ -1,8 +1,33 @@ | |||
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 | * | ||
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; | ||
4 | using System.IO; | 29 | using System.IO; |
5 | using OpenSim.Region.Environment.Modules.Terrain; | 30 | using System.Text; |
6 | using OpenSim.Region.Environment.Interfaces; | 31 | using OpenSim.Region.Environment.Interfaces; |
7 | 32 | ||
8 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | 33 | namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders |
@@ -79,8 +104,9 @@ namespace OpenSim.Region.Environment.Modules.Terrain.FileLoaders | |||
79 | return retval; | 104 | return retval; |
80 | } | 105 | } |
81 | 106 | ||
82 | public void SaveFile(string filename) | 107 | public void SaveFile(string filename, ITerrainChannel map) |
83 | { | 108 | { |
109 | char[] header = "TERRAGENTERRAIN".ToCharArray(); | ||
84 | throw new NotImplementedException(); | 110 | throw new NotImplementedException(); |
85 | } | 111 | } |
86 | 112 | ||