diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | 50 |
2 files changed, 57 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs index 4ab7782..74af2c1 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainChannel.cs | |||
@@ -56,6 +56,14 @@ namespace OpenSim.Region.Environment.Modules.Terrain | |||
56 | return copy; | 56 | return copy; |
57 | } | 57 | } |
58 | 58 | ||
59 | public ITerrainChannel MakeCopy() | ||
60 | { | ||
61 | TerrainChannel copy = new TerrainChannel(false); | ||
62 | copy.map = (double[,])this.map.Clone(); | ||
63 | |||
64 | return copy; | ||
65 | } | ||
66 | |||
59 | public float[] GetFloatsSerialised() | 67 | public float[] GetFloatsSerialised() |
60 | { | 68 | { |
61 | float[] heights = new float[Width * Height]; | 69 | float[] heights = new float[Width * Height]; |
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs index cdcc648..742ea5b 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | |||
@@ -27,15 +27,17 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | ||
30 | using libsecondlife; | 31 | using libsecondlife; |
31 | using Nini.Config; | 32 | using Nini.Config; |
32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
33 | using OpenSim.Region.Environment.Interfaces; | 34 | using OpenSim.Region.Environment.Interfaces; |
34 | using OpenSim.Region.Environment.Scenes; | 35 | using OpenSim.Region.Environment.Scenes; |
35 | 36 | ||
37 | |||
36 | namespace OpenSim.Region.Environment.Modules.Terrain | 38 | namespace OpenSim.Region.Environment.Modules.Terrain |
37 | { | 39 | { |
38 | public class TerrainModule : IRegionModule | 40 | public class TerrainModule : IRegionModule , ITerrainTemp |
39 | { | 41 | { |
40 | public enum StandardTerrainEffects : byte | 42 | public enum StandardTerrainEffects : byte |
41 | { | 43 | { |
@@ -139,6 +141,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain | |||
139 | public void Initialise(Scene scene, IConfigSource config) | 141 | public void Initialise(Scene scene, IConfigSource config) |
140 | { | 142 | { |
141 | m_scene = scene; | 143 | m_scene = scene; |
144 | m_scene.RegisterModuleInterface<ITerrainTemp>(this); | ||
142 | m_gConfig = config; | 145 | m_gConfig = config; |
143 | 146 | ||
144 | // Install terrain module in the simulator | 147 | // Install terrain module in the simulator |
@@ -312,6 +315,51 @@ namespace OpenSim.Region.Environment.Modules.Terrain | |||
312 | } | 315 | } |
313 | } | 316 | } |
314 | 317 | ||
318 | public byte[] WriteJpegImage(string gradientmap) | ||
319 | { | ||
320 | byte[] imageData = null; | ||
321 | try | ||
322 | { | ||
323 | Bitmap bmp = TerrainToBitmap(gradientmap); | ||
324 | |||
325 | imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, true); | ||
326 | |||
327 | } | ||
328 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke | ||
329 | { | ||
330 | Console.WriteLine("Failed generating terrain map: " + e.ToString()); | ||
331 | } | ||
332 | |||
333 | return imageData; | ||
334 | } | ||
335 | |||
336 | private Bitmap TerrainToBitmap(string gradientmap) | ||
337 | { | ||
338 | Bitmap gradientmapLd = new Bitmap(gradientmap); | ||
339 | |||
340 | int pallete = gradientmapLd.Height; | ||
341 | |||
342 | Bitmap bmp = new Bitmap(m_channel.Width, m_channel.Height); | ||
343 | Color[] colours = new Color[pallete]; | ||
344 | |||
345 | for (int i = 0; i < pallete; i++) | ||
346 | { | ||
347 | colours[i] = gradientmapLd.GetPixel(0, i); | ||
348 | } | ||
349 | |||
350 | TerrainChannel copy =(TerrainChannel) m_channel.MakeCopy(); | ||
351 | for (int y = 0; y < copy.Height; y++) | ||
352 | { | ||
353 | for (int x = 0; x < copy.Width; x++) | ||
354 | { | ||
355 | // 512 is the largest possible height before colours clamp | ||
356 | int colorindex = (int)(Math.Max(Math.Min(1.0, copy[x, y] / 512.0), 0.0) * (pallete - 1)); | ||
357 | bmp.SetPixel(x, copy.Height - y - 1, colours[colorindex]); | ||
358 | } | ||
359 | } | ||
360 | return bmp; | ||
361 | } | ||
362 | |||
315 | public void PostInitialise() | 363 | public void PostInitialise() |
316 | { | 364 | { |
317 | InstallDefaultEffects(); | 365 | InstallDefaultEffects(); |