1 files changed, 31 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
index 803a33a..00b506e 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
@@ -49,7 +49,7 @@ using WarpRenderer = global::Warp3D.Warp3D;
 
 namespace OpenSim.Region.CoreModules.World.Warp3DMap
 {
-    public class Warp3DImageModule : IMapImageGenerator, IRegionModule
+    public class Warp3DImageModule : IMapImageGenerator, INonSharedRegionModule
     {
         private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3");
         private static readonly Color4 WATER_COLOR = new Color4(29, 71, 95, 216);
@@ -62,18 +62,28 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         private IConfigSource m_config;
         private Dictionary<UUID, Color4> m_colors = new Dictionary<UUID, Color4>();
         private bool m_useAntiAliasing = true; // TODO: Make this a config option
+        private bool m_Enabled = false;
 
         #region IRegionModule Members
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
         {
-            m_scene = scene;
             m_config = source;
 
             IConfig startupConfig = m_config.Configs["Startup"];
             if (startupConfig.GetString("MapImageModule", "MapImageModule") != "Warp3DImageModule")
                 return;
 
+            m_Enabled = true;
+        }
+
+        public void AddRegion(Scene scene)
+        {
+            if (!m_Enabled)
+                return;
+
+            m_scene = scene;
+
             List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
             if (renderers.Count > 0)
             {
@@ -88,7 +98,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
         }
 
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public void RemoveRegion(Scene scene)
         {
         }
 
@@ -101,9 +115,9 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             get { return "Warp3DImageModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return false; }
+            get { return null; }
         }
 
         #endregion
@@ -114,16 +128,16 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         {
             Vector3 camPos = new Vector3(127.5f, 127.5f, 221.7025033688163f);
             Viewport viewport = new Viewport(camPos, -Vector3.UnitZ, 1024f, 0.1f, (int)Constants.RegionSize, (int)Constants.RegionSize, (float)Constants.RegionSize, (float)Constants.RegionSize);
-            return CreateMapTile(viewport);
+            return CreateMapTile(viewport, false);
         }
 
-        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height)
+        public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)
         {
             Viewport viewport = new Viewport(camPos, camDir, fov, (float)Constants.RegionSize, 0.1f, width, height);
-            return CreateMapTile(viewport);
+            return CreateMapTile(viewport, useTextures);
         }
 
-        public Bitmap CreateMapTile(Viewport viewport)
+        public Bitmap CreateMapTile(Viewport viewport, bool useTextures)
         {
             bool drawPrimVolume = true;
             bool textureTerrain = true;
@@ -184,7 +198,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             CreateWater(renderer);
             CreateTerrain(renderer, textureTerrain);
             if (drawPrimVolume)
-                CreateAllPrims(renderer);
+                CreateAllPrims(renderer, useTextures);
 
             renderer.Render();
             Bitmap bitmap = renderer.Scene.getImage();
@@ -311,7 +325,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             renderer.SetObjectMaterial("Terrain", "TerrainColor");
         }
 
-        private void CreateAllPrims(WarpRenderer renderer)
+        private void CreateAllPrims(WarpRenderer renderer, bool useTextures)
         {
             if (m_primMesher == null)
                 return;
@@ -319,14 +333,15 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             m_scene.ForEachSOG(
                 delegate(SceneObjectGroup group)
                 {
-                    CreatePrim(renderer, group.RootPart);
+                    CreatePrim(renderer, group.RootPart, useTextures);
                     foreach (SceneObjectPart child in group.Parts)
-                        CreatePrim(renderer, child);
+                        CreatePrim(renderer, child, useTextures);
                 }
             );
         }
 
-        private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim)
+        private void CreatePrim(WarpRenderer renderer, SceneObjectPart prim,
+                bool useTextures)
         {
             const float MIN_SIZE = 2f;
 
@@ -357,6 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             string primID = prim.UUID.ToString();
 
             // Create the prim faces
+            // TODO: Implement the useTextures flag behavior
             for (int i = 0; i < renderMesh.Faces.Count; i++)
             {
                 Face face = renderMesh.Faces[i];