Added support for bitmap and image loading to libterrain, use "terrain load img filename.ext", the following formats are supported under .NET (unknown under Mono): BMP, GIF, PNG, JPEG, WMF, TGA, TIFF.

1 files changed, 23 insertions, 1 deletions

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index 047187a..a018ce8 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
@@ -175,7 +175,7 @@ namespace OpenSim.Terrain
                                 break;

 

                             case "img":

-                                resultText = "Error - IMG mode is presently unsupported.";

+                                loadFromFileIMG(args[2]);

                                 return false;

 

                             default:

@@ -230,6 +230,28 @@ namespace OpenSim.Terrain
         }

 

         /// <summary>

+        /// Loads a file from an image compatible with System.Drawing

+        /// </summary>

+        /// <param name="filename">File to load</param>

+        public void loadFromFileIMG(string filename)

+        {

+            System.Drawing.Bitmap bmp = new Bitmap(filename);

+

+            if (bmp.Width != heightmap.w && bmp.Height != heightmap.h)

+                throw new Exception("Wrong image size! Images for this region must be " + heightmap.w.ToString() + " by " + heightmap.h.ToString() + " pixels in dimension");

+

+            int x, y;

+

+            for (x = 0; x < w; x++)

+            {

+                for (y = 0; y < h; y++)

+                {

+                    Color c = bmp.GetPixel(x, y);

+                }

+            }

+        }

+

+        /// <summary>

         /// Loads a file consisting of 256x256 doubles and imports it as an array into the map.

         /// </summary>

         /// <remarks>TODO: Move this to libTerrain itself</remarks>