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

dont create terrain map asset for V1 viewers on large regions again, but do create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)

avinationmerge
UbitUmarov 2015-09-17 21:11:59 +01:00
parent 6bca0c9c9c
commit f4093a04e7
1 changed files with 193 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
protected Scene m_scene; protected Scene m_scene;
private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>(); private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
private int cachedTime = 0; private int cachedTime = 0;
private int blacklistTimeout = 10*60*1000; // 10 minutes private int blacklistTimeout = 10 * 60 * 1000; // 10 minutes
private byte[] myMapImageJPEG; private byte[] myMapImageJPEG;
protected volatile bool m_Enabled = false; protected volatile bool m_Enabled = false;
private Dictionary<string, int> m_blacklistedurls = new Dictionary<string, int>(); private Dictionary<string, int> m_blacklistedurls = new Dictionary<string, int>();
@ -92,7 +92,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
//private int CacheRegionsDistance = 256; //private int CacheRegionsDistance = 256;
#region INonSharedRegionModule Members #region INonSharedRegionModule Members
public virtual void Initialise (IConfigSource config) public virtual void Initialise(IConfigSource config)
{ {
string[] configSections = new string[] { "Map", "Startup" }; string[] configSections = new string[] { "Map", "Startup" };
@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
} }
} }
public virtual void RemoveRegion (Scene scene) public virtual void RemoveRegion(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
} }
} }
public virtual void RegionLoaded (Scene scene) public virtual void RegionLoaded(Scene scene)
{ {
if (!m_Enabled) if (!m_Enabled)
return; return;
@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (threadrunning) return; if (threadrunning) return;
threadrunning = true; threadrunning = true;
// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread"); // m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
WorkManager.StartThread( WorkManager.StartThread(
process, process,
@ -406,11 +406,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{ {
MapRequestState st = new MapRequestState(); MapRequestState st = new MapRequestState();
st.agentID = STOP_UUID; st.agentID = STOP_UUID;
st.EstateID=0; st.EstateID = 0;
st.flags=0; st.flags = 0;
st.godlike=false; st.godlike = false;
st.itemtype=0; st.itemtype = 0;
st.regionhandle=0; st.regionhandle = 0;
lock (requests) lock (requests)
{ {
@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// Service 7 (MAP_ITEM_LAND_FOR_SALE) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
adultRegion = m_scene.RegionInfo.RegionSettings.Maturity == 2; adultRegion = m_scene.RegionInfo.RegionSettings.Maturity == 2;
if(adultRegion) if (adultRegion)
{ {
if (itemtype == (int)GridItemType.LandForSale) if (itemtype == (int)GridItemType.LandForSale)
break; break;
@ -711,7 +711,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
private void RequestMapItemsAsync(UUID id, uint flags, private void RequestMapItemsAsync(UUID id, uint flags,
uint EstateID, bool godlike, uint itemtype, ulong regionhandle) uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
{ {
// m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype); // m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype);
string httpserver = ""; string httpserver = "";
bool blacklisted = false; bool blacklisted = false;
@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags); av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
} }
/* send things viewer didn't ask ? /* send things viewer didn't ask ?
// Service 7 (MAP_ITEM_LAND_FOR_SALE) // Service 7 (MAP_ITEM_LAND_FOR_SALE)
itemtype = 7; itemtype = 7;
@ -1001,7 +1001,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
} }
av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags); av.ControllingClient.SendMapItemReply(returnitems.ToArray(), itemtype, flags);
} }
*/ */
} }
} }
} }
@ -1090,7 +1090,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// only send a negative answer for a single region request // only send a negative answer for a single region request
// corresponding to a click on the map. Current viewers // corresponding to a click on the map. Current viewers
// keep displaying "loading.." without this // keep displaying "loading.." without this
if(regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY) if (regions.Count == 0 && (flag & 0x10000) != 0 && minX == maxX && minY == maxY)
{ {
MapBlockData block = new MapBlockData(); MapBlockData block = new MapBlockData();
block.X = (ushort)minX; block.X = (ushort)minX;
@ -1213,7 +1213,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (myMapImageJPEG.Length == 0) if (myMapImageJPEG.Length == 0)
{ {
MemoryStream imgstream = null; MemoryStream imgstream = null;
Bitmap mapTexture = new Bitmap(1,1); Bitmap mapTexture = new Bitmap(1, 1);
ManagedImage managedImage; ManagedImage managedImage;
Image image = (Image)mapTexture; Image image = (Image)mapTexture;
@ -1328,7 +1328,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
foreach (GridRegion r in regions) foreach (GridRegion r in regions)
{ {
MapBlockData mapBlock = new MapBlockData(); MapBlockData mapBlock = new MapBlockData();
MapBlockFromGridRegion(mapBlock, r , 0); MapBlockFromGridRegion(mapBlock, r, 0);
AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString());
if (texAsset != null) if (texAsset != null)
@ -1383,7 +1383,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
GenerateMaptile(); GenerateMaptile();
} }
/* /*
if (m_mapImageGenerator == null) if (m_mapImageGenerator == null)
{ {
Console.WriteLine("No map image generator available for {0}", m_scene.Name); Console.WriteLine("No map image generator available for {0}", m_scene.Name);
@ -1397,7 +1397,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
} }
} }
*/ */
public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
{ {
uint xstart = 0; uint xstart = 0;
@ -1426,7 +1426,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
else else
{ {
OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount()); OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount());
m_scene.ForEachRootScenePresence(delegate(ScenePresence sp) m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
{ {
OSDMap responsemapdata = new OSDMap(); OSDMap responsemapdata = new OSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X)); responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X));
@ -1476,8 +1476,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{ {
Vector3 min = parcel.AABBMin; Vector3 min = parcel.AABBMin;
Vector3 max = parcel.AABBMax; Vector3 max = parcel.AABBMax;
float x = (min.X+max.X)/2; float x = (min.X + max.X) / 2;
float y = (min.Y+max.Y)/2; float y = (min.Y + max.Y) / 2;
OSDMap responsemapdata = new OSDMap(); OSDMap responsemapdata = new OSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + x)); responsemapdata["X"] = OSD.FromInteger((int)(xstart + x));
@ -1531,35 +1531,48 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
{ {
// V1 (This Module)
// if(m_scene.RegionInfo.RegionSizeX <= Constants.RegionSize &&
// m_scene.RegionInfo.RegionSizeY <= Constants.RegionSize)
GenerateMaptile(mapbmp); GenerateMaptile(mapbmp);
// v2/3 (MapImageServiceModule) if (m_mapImageServiceModule != null)
if(m_mapImageServiceModule !=null)
m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
} }
} }
private void GenerateMaptile(Bitmap mapbmp) private void GenerateMaptile(Bitmap mapbmp)
{ {
byte[] data; bool needRegionSave = false;
// remove old assets
UUID lastID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
if (lastID != UUID.Zero)
{
m_scene.AssetService.Delete(lastID.ToString());
m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Zero;
needRegionSave = true;
}
lastID = m_scene.RegionInfo.RegionSettings.ParcelImageID;
if (lastID != UUID.Zero)
{
m_scene.AssetService.Delete(lastID.ToString());
m_scene.RegionInfo.RegionSettings.ParcelImageID = UUID.Zero;
needRegionSave = true;
}
// bypass terrain image for large regions since only V2 viewers work with them
if (m_scene.RegionInfo.RegionSizeX <= Constants.RegionSize &&
m_scene.RegionInfo.RegionSizeY <= Constants.RegionSize
&& mapbmp != null)
{
try try
{ {
byte[] data;
data = OpenJPEG.EncodeFromImage(mapbmp, true); data = OpenJPEG.EncodeFromImage(mapbmp, true);
}
catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke if (data != null && data.Length > 0)
{ {
m_log.Error("[WORLD MAP]: Failed generating terrain map: " + e);
return;
}
byte[] overlay = GenerateOverlay();
UUID terrainImageID = UUID.Random(); UUID terrainImageID = UUID.Random();
UUID parcelImageID = UUID.Zero;
AssetBase asset = new AssetBase( AssetBase asset = new AssetBase(
terrainImageID, terrainImageID,
@ -1576,9 +1589,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
m_scene.AssetService.Store(asset); m_scene.AssetService.Store(asset);
m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
needRegionSave = true;
}
}
catch (Exception e)
{
m_log.Error("[WORLD MAP]: Failed generating terrain map: " + e);
}
}
// V2/3 still seem to need this, or we are missing something somewhere
byte[] overlay = GenerateOverlay();
if (overlay != null) if (overlay != null)
{ {
parcelImageID = UUID.Random(); UUID parcelImageID = UUID.Random();
AssetBase parcels = new AssetBase( AssetBase parcels = new AssetBase(
parcelImageID, parcelImageID,
@ -1591,20 +1616,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
parcels.Flags = AssetFlags.Maptile; parcels.Flags = AssetFlags.Maptile;
m_scene.AssetService.Store(parcels); m_scene.AssetService.Store(parcels);
m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
needRegionSave = true;
} }
// Switch to the new one if (needRegionSave)
UUID lastTerrainImageID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
UUID lastParcelImageID = m_scene.RegionInfo.RegionSettings.ParcelImageID;
m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID;
m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID;
m_scene.RegionInfo.RegionSettings.Save(); m_scene.RegionInfo.RegionSettings.Save();
// Delete the old one
// m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID);
m_scene.AssetService.Delete(lastTerrainImageID.ToString());
if (lastParcelImageID != UUID.Zero)
m_scene.AssetService.Delete(lastParcelImageID.ToString());
} }
private void MakeRootAgent(ScenePresence avatar) private void MakeRootAgent(ScenePresence avatar)
@ -1658,42 +1676,35 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
private Byte[] GenerateOverlay() private Byte[] GenerateOverlay()
{ {
int landTileSize = LandManagementModule.LandUnit;
// These need to be ints for bitmap generation // These need to be ints for bitmap generation
int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX; int regionSizeX = (int)m_scene.RegionInfo.RegionSizeX;
int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
int landTileSize = LandManagementModule.LandUnit;
int regionLandTilesX = regionSizeX / landTileSize; int regionLandTilesX = regionSizeX / landTileSize;
int regionSizeY = (int)m_scene.RegionInfo.RegionSizeY;
int regionLandTilesY = regionSizeY / landTileSize; int regionLandTilesY = regionSizeY / landTileSize;
using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY))
{
bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY];
for (int x = 0; x < regionLandTilesX; x++)
{
for (int y = 0; y < regionLandTilesY; y++)
saleBitmap[x, y] = false;
}
bool landForSale = false; bool landForSale = false;
ILandObject land;
List<ILandObject> parcels = m_scene.LandChannel.AllParcels(); // scan terrain avoiding potencial merges of large bitmaps
//TODO create the sell bitmap at landchannel / landmaster ?
// and auction also, still not suported
Color background = Color.FromArgb(0, 0, 0, 0); bool[,] saleBitmap = new bool[regionLandTilesX, regionLandTilesY];
for (int x = 0, xx = 0; x < regionLandTilesX; x++ ,xx += landTileSize)
using (Graphics g = Graphics.FromImage(overlay))
{ {
using (SolidBrush transparent = new SolidBrush(background)) for (int y = 0, yy = 0; y < regionLandTilesY; y++, yy += landTileSize)
g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY);
foreach (ILandObject land in parcels)
{ {
// m_log.DebugFormat("[WORLD MAP]: Parcel {0} flags {1}", land.LandData.Name, land.LandData.Flags); land = m_scene.LandChannel.GetLandObject(xx, yy);
if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0) if (land != null && (land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0)
{ {
saleBitmap[x, y] = true;
landForSale = true; landForSale = true;
}
saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap()); else
saleBitmap[x, y] = false;
} }
} }
@ -1705,11 +1716,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName); m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName);
using (SolidBrush yellow = new SolidBrush(Color.FromArgb(255, 249, 223, 9))) using (Bitmap overlay = new Bitmap(regionSizeX, regionSizeY))
{ {
for (int x = 0; x < regionLandTilesX ; x++) Color background = Color.FromArgb(0, 0, 0, 0);
using (Graphics g = Graphics.FromImage(overlay))
{ {
for (int y = 0; y < regionLandTilesY ; y++) using (SolidBrush transparent = new SolidBrush(background))
g.FillRectangle(transparent, 0, 0, regionSizeX, regionSizeY);
// make it a half transparent
using (SolidBrush yellow = new SolidBrush(Color.FromArgb(100, 249, 223, 9)))
{
for (int x = 0; x < regionLandTilesX; x++)
{
for (int y = 0; y < regionLandTilesY; y++)
{ {
if (saleBitmap[x, y]) if (saleBitmap[x, y])
g.FillRectangle( g.FillRectangle(