OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more fixes on map

avinationmerge
UbitUmarov 2015-08-23 01:42:51 +01:00
parent a916ef570e
commit 24a093035b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
View File

@ -144,9 +144,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
lock (m_scenes) lock (m_scenes)
m_scenes[scene.RegionInfo.RegionID] = scene; m_scenes[scene.RegionInfo.RegionID] = scene;
// v2 Map generation on startup is now handled by scene to allow bmp to be shared with
// v1 service and not generate map tiles twice as was previous behavior
//scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
scene.RegisterModuleInterface<IMapTileModule>(this); scene.RegisterModuleInterface<IMapTileModule>(this);
scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
} }
///<summary> ///<summary>

10
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@ -125,10 +125,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
public Bitmap CreateMapTile() public Bitmap CreateMapTile()
{ {
/* this must be on all map, not just its image
if ((DateTime.Now - lastImageTime).TotalSeconds < 3600) if ((DateTime.Now - lastImageTime).TotalSeconds < 3600)
{ {
return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); return (Bitmap)lastImage.Clone();
} }
*/
List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory()); List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory());
if (renderers.Count > 0) if (renderers.Count > 0)
@ -147,10 +149,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
Bitmap tile = CreateMapTile(viewport, false); Bitmap tile = CreateMapTile(viewport, false);
m_primMesher = null; m_primMesher = null;
return tile;
/*
lastImage = tile; lastImage = tile;
lastImageTime = DateTime.Now; lastImageTime = DateTime.Now;
return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); return (Bitmap)lastImage.Clone();
*/
} }
public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures) public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures)

2
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -1408,7 +1408,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
{ {
GenerateMaptile(mapbmp); GenerateMaptile(mapbmp);
// m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
} }
} }