1 files changed, 185 insertions, 169 deletions

diff --git a/addon-modules/OpenSim.Modules.Warp3DCachedImageModule/src/Warp3DImageModule.cs b/addon-modules/OpenSim.Modules.Warp3DCachedImageModule/src/Warp3DImageModule.cs
index 8e50a16..05d5ab2 100644
--- a/addon-modules/OpenSim.Modules.Warp3DCachedImageModule/src/Warp3DImageModule.cs
+++ b/addon-modules/OpenSim.Modules.Warp3DCachedImageModule/src/Warp3DImageModule.cs
@@ -42,8 +42,8 @@ using Mono.Addins;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.PhysicsModules.SharedBase;
-using OpenSim.Services.Interfaces;
+////using OpenSim.Region.PhysicsModules.SharedBase;
+////using OpenSim.Services.Interfaces;
 
 using OpenMetaverse;
 using OpenMetaverse.Assets;
@@ -52,18 +52,18 @@ using OpenMetaverse.Rendering;
 using OpenMetaverse.StructuredData;
 
 using WarpRenderer = Warp3D.Warp3D;
-using System.Drawing.Drawing2D;

-

-[assembly: Addin("Warp3DCachedImageModule", "1.1")]

+using System.Drawing.Drawing2D;
+
+[assembly: Addin("Warp3DCachedImageModule", "1.1")]
 [assembly: AddinDependency("OpenSim.Region.Framework", OpenSim.VersionInfo.VersionNumber)]
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
 {
     [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "Warp3DCachedImageModule")]
     public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule
     {
-        private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216);

-        //        private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 128);

-

+        private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216);
+        //        private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 128);
+
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
 #pragma warning disable 414
@@ -87,19 +87,19 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private float m_texturePrimSize = 48f;  // size of prim before we consider texturing it
         private bool m_renderMeshes = false;    // true if to render meshes rather than just bounding boxes
         private float m_renderMinHeight = -100f;
-        private float m_renderMaxHeight = 4096f;

-

-        private String m_cacheDirectory = "";

-        private bool m_enable_date = false;

-        private bool m_enable_regionName = false;

-        private bool m_enable_regionPosition = false;

-        private bool m_enable_refreshEveryMonth = false;

-        private bool m_enable_HostedBy = false;

-        private String m_enable_HostedByText = "";
-
-        private bool m_Enabled = false;

-

-        //        private Bitmap lastImage = null;

+        private float m_renderMaxHeight = 4096f;
+
+        private String m_cacheDirectory = "";
+////        private bool m_enable_date = false;
+////        private bool m_enable_regionName = false;
+        private bool m_enable_regionPosition = false;
+        private bool m_enable_refreshEveryMonth = false;
+////        private bool m_enable_HostedBy = false;
+////        private String m_enable_HostedByText = "";
+
+        private bool m_Enabled = false;
+
+        //        private Bitmap lastImage = null;
         private DateTime lastImageTime = DateTime.MinValue;
 
         #region Region Module interface
@@ -129,22 +129,22 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_texturePrimSize =
                 Util.GetConfigVarFromSections<float>(m_config, "TexturePrimSize", configSections, m_texturePrimSize);
             m_renderMeshes =
-                Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);

-            m_cacheDirectory = 

-                Util.GetConfigVarFromSections<string>(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(new DirectoryInfo(".").FullName, "MapImageCache"));

-

-

-            m_enable_date = Util.GetConfigVarFromSections<bool>(m_config, "enableDate", configSections, false);

-            m_enable_regionName = Util.GetConfigVarFromSections<bool>(m_config, "enableName", configSections, false);

-            m_enable_regionPosition = Util.GetConfigVarFromSections<bool>(m_config, "enablePosition", configSections, false);

-            m_enable_refreshEveryMonth = Util.GetConfigVarFromSections<bool>(m_config, "RefreshEveryMonth", configSections, true);

-            m_enable_HostedBy = Util.GetConfigVarFromSections<bool>(m_config, "enableHostedBy", configSections, false);

-            m_enable_HostedByText = Util.GetConfigVarFromSections<String>(m_config, "HosterText", configSections, String.Empty);
+                Util.GetConfigVarFromSections<bool>(m_config, "RenderMeshes", configSections, m_renderMeshes);
+            m_cacheDirectory = 
+                Util.GetConfigVarFromSections<string>(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(Util.cacheDir(), "MapImageCache"));
+
+
+////            m_enable_date = Util.GetConfigVarFromSections<bool>(m_config, "enableDate", configSections, false);
+////            m_enable_regionName = Util.GetConfigVarFromSections<bool>(m_config, "enableName", configSections, false);
+            m_enable_regionPosition = Util.GetConfigVarFromSections<bool>(m_config, "enablePosition", configSections, false);
+            m_enable_refreshEveryMonth = Util.GetConfigVarFromSections<bool>(m_config, "RefreshEveryMonth", configSections, true);
+////            m_enable_HostedBy = Util.GetConfigVarFromSections<bool>(m_config, "enableHostedBy", configSections, false);
+////            m_enable_HostedByText = Util.GetConfigVarFromSections<String>(m_config, "HosterText", configSections, String.Empty);
 
             m_renderMaxHeight = Util.GetConfigVarFromSections<float>(m_config, "RenderMaxHeight", configSections, m_renderMaxHeight);
-            m_renderMinHeight = Util.GetConfigVarFromSections<float>(m_config, "RenderMinHeight", configSections, m_renderMinHeight);

-

-            if (!Directory.Exists(m_cacheDirectory))

+            m_renderMinHeight = Util.GetConfigVarFromSections<float>(m_config, "RenderMinHeight", configSections, m_renderMinHeight);
+
+            if (!Directory.Exists(m_cacheDirectory))
                 Directory.CreateDirectory(m_cacheDirectory);
 
             if (m_renderMaxHeight < 100f)
@@ -167,9 +167,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
             List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
             if (renderers.Count > 0)
-                m_log.Info("[MAPTILE]: Loaded prim mesher " + renderers[0]);
+                m_log.Info("[WARP 3D CACHED IMAGE MODULE]: Loaded prim mesher " + renderers[0]);
             else
-                m_log.Info("[MAPTILE]: No prim mesher loaded, prim rendering will be disabled");
+                m_log.Info("[WARP 3D CACHED IMAGE MODULE]: No prim mesher loaded, prim rendering will be disabled");
 
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
 
         public string Name
         {
-            get { return "Warp3DImageModule"; }
+            get { return "Warp3DCachedImageModule"; }
         }
 
         public Type ReplaceableInterface
@@ -209,134 +209,150 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private int viewWitdh = 256;
         private int viewHeight = 256;
         private float fov;
-        private bool orto;

-

-        public static string fillInt(int _i, int _l)

-        {

-            String _return = _i.ToString();

-

-            while (_return.Length < _l)

-            {

-                _return = 0 + _return;

-            }

-

-            return _return;

-        }

-

-        public static int getCurrentUnixTime()

-        {

-            return (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;

-        }

-

-        public static String unixTimeToDateString(int unixTime)

-        {

-            DateTime unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);

-            long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);

-            DateTime _date = new DateTime(unixStart.Ticks + unixTimeStampInTicks, System.DateTimeKind.Utc);

-

-            return fillInt(_date.Day, 2) + "." + fillInt(_date.Month, 2) + "." + fillInt(_date.Year, 4) + " " + fillInt(_date.Hour, 2) + ":" + fillInt(_date.Minute, 2);

-        }

-

-        private void writeDateOnMap(ref Bitmap _map)

-        {

-            RectangleF rectf = new RectangleF(2, 1, 200, 25);

-

-            Graphics g = Graphics.FromImage(_map);

-            g.SmoothingMode = SmoothingMode.AntiAlias;

-            g.InterpolationMode = InterpolationMode.HighQualityBicubic;

-            g.PixelOffsetMode = PixelOffsetMode.HighQuality;

-            g.DrawString(unixTimeToDateString(getCurrentUnixTime()), new Font("Arial", 8), Brushes.White, rectf);

-            g.Flush();

-        }

-

-        private void writeNameOnMap(ref Bitmap _map)

-        {

-            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);

-

-            Graphics g = Graphics.FromImage(_map);

-            g.SmoothingMode = SmoothingMode.AntiAlias;

-            g.InterpolationMode = InterpolationMode.HighQualityBicubic;

-            g.PixelOffsetMode = PixelOffsetMode.HighQuality;

-            g.DrawString(m_scene.Name, new Font("Arial", 8), Brushes.White, rectf);

-            g.Flush();

-        }

-

-        private void writePositionOnMap(ref Bitmap _map)

-        {

-            RectangleF rectf = new RectangleF(m_scene.RegionInfo.RegionSizeY - 85, m_scene.RegionInfo.RegionSizeX - 15, 80, 25);

-

-            Graphics g = Graphics.FromImage(_map);

-            g.SmoothingMode = SmoothingMode.AntiAlias;

-            g.InterpolationMode = InterpolationMode.HighQualityBicubic;

-            g.PixelOffsetMode = PixelOffsetMode.HighQuality;

-            g.DrawString(m_scene.RegionInfo.RegionLocX + ", " + m_scene.RegionInfo.RegionLocY, new Font("Arial", 8), Brushes.White, rectf);

-            g.Flush();

-        }

-

-        private void writeHostedByOnMap(ref Bitmap _map)

-        {

-            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);

-

-            Graphics g = Graphics.FromImage(_map);

-            g.SmoothingMode = SmoothingMode.AntiAlias;

-            g.InterpolationMode = InterpolationMode.HighQualityBicubic;

-            g.PixelOffsetMode = PixelOffsetMode.HighQuality;

-            g.DrawString(m_enable_HostedByText, new Font("Arial", 8), Brushes.Gray, rectf);

-            g.Flush();

-        }

+        private bool orto;
+
+/*
+        public static string fillInt(int _i, int _l)
+        {
+            String _return = _i.ToString();
+
+            while (_return.Length < _l)
+            {
+                _return = 0 + _return;
+            }
+
+            return _return;
+        }
+
+        public static int getCurrentUnixTime()
+        {
+            return (Int32)(DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1))).TotalSeconds;
+        }
 
+        public static String unixTimeToDateString(int unixTime)
+        {
+            DateTime unixStart = new DateTime(1970, 1, 1, 0, 0, 0, 0, System.DateTimeKind.Utc);
+            long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
+            DateTime _date = new DateTime(unixStart.Ticks + unixTimeStampInTicks, System.DateTimeKind.Utc);
+
+            return fillInt(_date.Day, 2) + "." + fillInt(_date.Month, 2) + "." + fillInt(_date.Year, 4) + " " + fillInt(_date.Hour, 2) + ":" + fillInt(_date.Minute, 2);
+        }
+
+        private void writeDateOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, 1, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(unixTimeToDateString(getCurrentUnixTime()), new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+
+        private void writeNameOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(m_scene.Name, new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+*/
+
+        private void writePositionOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(m_scene.RegionInfo.RegionSizeY - 85, m_scene.RegionInfo.RegionSizeX - 15, 80, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(m_scene.RegionInfo.RegionLocX + ", " + m_scene.RegionInfo.RegionLocY, new Font("Arial", 8), Brushes.White, rectf);
+            g.Flush();
+        }
+
+/*
+        private void writeHostedByOnMap(ref Bitmap _map)
+        {
+            RectangleF rectf = new RectangleF(2, m_scene.RegionInfo.RegionSizeX - 15, 200, 25);
+
+            Graphics g = Graphics.FromImage(_map);
+            g.SmoothingMode = SmoothingMode.AntiAlias;
+            g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+            g.PixelOffsetMode = PixelOffsetMode.HighQuality;
+            g.DrawString(m_enable_HostedByText, new Font("Arial", 8), Brushes.Gray, rectf);
+            g.Flush();
+        }
+*/
+
+        public Bitmap CreateMapTileForce()
+        {
+            m_log.Info("[WARP 3D CACHED IMAGE MODULE]: Forcing a map tile regenerate.");
+            File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            return CreateMapTile();
+        }
 
         public Bitmap CreateMapTile()
-        {

-            if ((File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month != DateTime.Now.Month) && m_enable_refreshEveryMonth == true)

-                File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));

-

-            if (File.Exists(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")))

-            {

-                return new Bitmap(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));

-            }

-            else

-            {

-                List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());

-                if (renderers.Count > 0)

-                {

-                    m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);

-                }

-

-                cameraPos = new Vector3(

-                                (m_scene.RegionInfo.RegionSizeX) * 0.5f,

-                                (m_scene.RegionInfo.RegionSizeY) * 0.5f,

-                                m_cameraHeight);

-

-                cameraDir = -Vector3.UnitZ;

-                viewWitdh = (int)m_scene.RegionInfo.RegionSizeX;

-                viewHeight = (int)m_scene.RegionInfo.RegionSizeY;

-                orto = true;

-

-                //            fov = warp_Math.rad2deg(2f * (float)Math.Atan2(viewWitdh, 4096f));

-                //            orto = false;

-

-                Bitmap tile = GenImage();

-

-                if (m_enable_date)

-                    writeDateOnMap(ref tile);

-

-                if (m_enable_regionName)

-                    writeNameOnMap(ref tile);

-

-                if (m_enable_regionPosition)

-                    writePositionOnMap(ref tile);

-

-                if (m_enable_HostedBy)

-                    writeHostedByOnMap(ref tile);

-

-                tile.Save(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));

-

-                // image may be reloaded elsewhere, so no compression format

-                string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png";

-                tile.Save(filename, ImageFormat.Png);

-                m_primMesher = null;

-                return tile;

+        {
+            if ((File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month != DateTime.Now.Month) && (m_enable_refreshEveryMonth == true))
+            {
+                m_log.InfoFormat("[WARP 3D CACHED IMAGE MODULE]: Clearing old map tile out of cache {0} {1}.", 
+                    File.GetCreationTime(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")).Month, DateTime.Now.Month);
+                File.Delete(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            }
+
+            if (File.Exists(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp")))
+            {
+                return new Bitmap(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+            }
+            else
+            {
+                m_log.Info("[WARP 3D CACHED IMAGE MODULE]: Actually generating a map tile.");
+                List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
+                if (renderers.Count > 0)
+                {
+                    m_primMesher = RenderingLoader.LoadRenderer(renderers[0]);
+                }
+
+                cameraPos = new Vector3(
+                                (m_scene.RegionInfo.RegionSizeX) * 0.5f,
+                                (m_scene.RegionInfo.RegionSizeY) * 0.5f,
+                                m_cameraHeight);
+
+                cameraDir = -Vector3.UnitZ;
+                viewWitdh = (int)m_scene.RegionInfo.RegionSizeX;
+                viewHeight = (int)m_scene.RegionInfo.RegionSizeY;
+                orto = true;
+
+                //            fov = warp_Math.rad2deg(2f * (float)Math.Atan2(viewWitdh, 4096f));
+                //            orto = false;
+
+                Bitmap tile = GenImage();
+
+////                if (m_enable_date)
+////                    writeDateOnMap(ref tile);
+
+////                if (m_enable_regionName)
+////                    writeNameOnMap(ref tile);
+
+                if (m_enable_regionPosition)
+                    writePositionOnMap(ref tile);
+
+////                if (m_enable_HostedBy)
+////                    writeHostedByOnMap(ref tile);
+
+                tile.Save(System.IO.Path.Combine(m_cacheDirectory, m_scene.RegionInfo.RegionID + ".bmp"));
+
+                // image may be reloaded elsewhere, so no compression format
+                string filename = System.IO.Path.Combine(m_cacheDirectory, "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png");
+                m_log.Info("[WARP 3D CACHED IMAGE MODULE]: Generating map tile " + filename);
+                tile.Save(filename, ImageFormat.Png);
+                m_primMesher = null;
+                return tile;
             }
         }
 
@@ -420,7 +436,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             catch (Exception e)
             {
                 // JPEG2000 encoder failed
-                m_log.Error("[WARP 3D IMAGE MODULE]: Failed generating terrain map: ", e);
+                m_log.Error("[WARP 3D CACHED IMAGE MODULE]: Failed generating terrain map: ", e);
             }
 
             return null;
@@ -599,7 +615,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 tu = -2f * scaledPos.X;
                 tv = scaledPos.Y * v.Normal.Z - scaledPos.Z * v.Normal.Y;
             }
-            else

+            else
             {
                 tu = 2f * scaledPos.X;
                 tv = -scaledPos.Y * v.Normal.Z + scaledPos.Z * v.Normal.Y;
@@ -667,7 +683,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                     }
                     else
                     {
-                        m_log.WarnFormat("[Warp3D] failed to get mesh or sculpt asset {0} of prim {1} at {2}",
+                        m_log.WarnFormat("[WARP 3D CACHED IMAGE MODULE] failed to get mesh or sculpt asset {0} of prim {1} at {2}",
                             omvPrim.Sculpt.SculptTexture.ToString(), prim.Name, prim.GetWorldPosition().ToString());
                     }
                 }
@@ -923,11 +939,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
                 }
                 catch (Exception e)
                 {
-                    m_log.WarnFormat("[Warp3D]: Failed to decode texture {0} for prim {1} at {2}, exception {3}", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
+                    m_log.WarnFormat("[WARP 3D CACHED IMAGE MODULE]: Failed to decode texture {0} for prim {1} at {2}, exception {3}", id.ToString(), sop.Name, sop.GetWorldPosition().ToString(), e.Message);
                 }
             }
             else
-                m_log.WarnFormat("[Warp3D]: missing texture {0} data for prim {1} at {2}",
+                m_log.WarnFormat("[WARP 3D CACHED IMAGE MODULE]: missing texture {0} data for prim {1} at {2}",
                     id.ToString(), sop.Name, sop.GetWorldPosition().ToString());
 
             m_warpTextures[id.ToString()] = ret;
@@ -1041,7 +1057,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             catch (Exception ex)
             {
                 m_log.WarnFormat(
-                    "[WARP 3D IMAGE MODULE]: Error decoding JPEG2000 texture {0} ({1} bytes): {2}",
+                    "[WARP 3D CACHED IMAGE MODULE]: Error decoding JPEG2000 texture {0} ({1} bytes): {2}",
                     textureID, j2kData.Length, ex.Message);
 
                 width = 0;