Each Region will now generate a texture image of their terrain and this will be used by the map. Note: Currently each region generates a new image every time they start; even if the terrain is read from the database. And also they don't update it when the terrain changes.

3 files changed, 49 insertions, 0 deletions

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index e38c879..10bc0fd 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -62,6 +62,10 @@
       <HintPath>..\..\bin\libTerrain-BSD.dll</HintPath>

       <Private>False</Private>

     </Reference>

+    <Reference Include="openjpegnet.dll" >

+      <HintPath>..\..\bin\openjpegnet.dll</HintPath>

+      <Private>False</Private>

+    </Reference>

     <Reference Include="System" >

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 6526648..51cecb9 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -20,6 +20,7 @@
                     <include name="${project::get-base-directory()}/${build.dir}" />

                 </lib>

                 <include name="../../bin/libTerrain-BSD.dll" />

+                <include name="../../bin/openjpegnet.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll" />

                 <include name="System.Drawing.dll" />

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index ecbd078..e5831a0 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Text;

 using System.Drawing;

 using libTerrain;

+using OpenJPEGNet;

 

 namespace OpenSim.Terrain

 {

@@ -507,5 +508,48 @@ namespace OpenSim.Terrain
                 Console.WriteLine("Failed generating terrain map: " + e.ToString());

             }

         }

+

+        /// <summary>

+        /// Exports the current heightmap in Jpeg2000 format to a byte[]

+        /// </summary>

+        /// <param name="gradientmap">A 1x*height* image which contains the colour gradient to export with. Must be at least 1x2 pixels, 1x256 or more is ideal.</param>

+        public byte[] exportJpegImage(string gradientmap)

+        {

+            byte[] imageData = null;

+            try

+            {

+                Bitmap gradientmapLd = new Bitmap(gradientmap);

+

+                int pallete = gradientmapLd.Height;

+

+                Bitmap bmp = new Bitmap(heightmap.w, heightmap.h);

+                Color[] colours = new Color[pallete];

+

+                for (int i = 0; i < pallete; i++)

+                {

+                    colours[i] = gradientmapLd.GetPixel(0, i);

+                }

+

+                Channel copy = heightmap.copy();

+                for (int x = 0; x < copy.w; x++)

+                {

+                    for (int y = 0; y < copy.h; y++)

+                    {

+                        // 512 is the largest possible height before colours clamp

+                        int colorindex = (int)(Math.Max(Math.Min(1.0, copy.get(copy.w -x, copy.h - y) / 512.0), 0.0) * pallete);

+                        bmp.SetPixel(x, y, colours[colorindex]);

+                    }

+                }

+

+                //bmp.Save(filename, System.Drawing.Imaging.ImageFormat.Png);

+                imageData = OpenJPEGNet.OpenJPEG.EncodeFromImage(bmp, "map");

+                

+            }

+            catch (Exception e)

+            {

+                Console.WriteLine("Failed generating terrain map: " + e.ToString());

+            }

+            return imageData;

+        }

     }

 }
\ No newline at end of file