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

* Maptile prim volume drawing change from manually drawing the rectangles using Bitmap.setpixel to a drawing2d graphics context. 

* Z-sort the prim volumes before drawing.
0.6.0-stable
Teravus Ovares 2008-08-18 03:25:23 +00:00
parent c31b0a54a4
commit f842ad4192
1 changed files with 63 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
OpenSim/Region/Environment/Modules/World/WorldMap/MapImageModule.cs
View File

@ -26,8 +26,11 @@
*/ */
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using System.Reflection; using System.Reflection;
using Axiom.Math; using Axiom.Math;
using Nini.Config; using Nini.Config;
@ -39,6 +42,12 @@ using libsecondlife;
namespace OpenSim.Region.Environment.Modules.World.WorldMap namespace OpenSim.Region.Environment.Modules.World.WorldMap
{ {
public struct RectangleDrawStruct
{
public Rectangle rect;
public SolidBrush brush;
}
public class MapImageModule : IMapImageGenerator, IRegionModule public class MapImageModule : IMapImageGenerator, IRegionModule
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
@ -352,6 +361,10 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
tc = System.Environment.TickCount; tc = System.Environment.TickCount;
m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile");
List<EntityBase> objs = whichScene.GetEntities(); List<EntityBase> objs = whichScene.GetEntities();
Dictionary<uint, RectangleDrawStruct> z_sort = new Dictionary<uint, RectangleDrawStruct>();
//SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>();
List<float> z_sortheights = new List<float>();
List<uint> z_localIDs = new List<uint>();
lock (objs) lock (objs)
{ {
@ -476,33 +489,65 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
bool breakYN = false; // If we run into an error drawing, break out of the bool breakYN = false; // If we run into an error drawing, break out of the
// loop so we don't lag to death on error handling // loop so we don't lag to death on error handling
for (int wx = mapdrawstartX; wx < mapdrawendX; wx++) RectangleDrawStruct ds = new RectangleDrawStruct();
{ ds.brush = new SolidBrush(mapdotspot);
for (wy = mapdrawstartY; wy < mapdrawendY; wy++) ds.rect = new Rectangle(mapdrawstartX, (255 - mapdrawstartY), mapdrawendX - mapdrawstartX, mapdrawendY - mapdrawstartY);
{ z_sort.Add(part.LocalId, ds);
z_localIDs.Add(part.LocalId);
z_sortheights.Add(pos.Z);
//for (int wx = mapdrawstartX; wx < mapdrawendX; wx++)
//{
//for (wy = mapdrawstartY; wy < mapdrawendY; wy++)
//{
//m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy); //m_log.InfoFormat("[MAPDEBUG]: {0},{1}({2})", wx, (255 - wy),wy);
try //try
{ //{
// Remember, flip the y! // Remember, flip the y!
mapbmp.SetPixel(wx, (255 - wy), mapdotspot); // mapbmp.SetPixel(wx, (255 - wy), mapdotspot);
} //}
catch (ArgumentException) //catch (ArgumentException)
{ //{
breakYN = true; // breakYN = true;
} //}
if (breakYN) //if (breakYN)
break; // break;
} //}
if (breakYN) //if (breakYN)
break; // break;
} //}
} // Object is within 256m Z of terrain } // Object is within 256m Z of terrain
} // object is at least a meter wide } // object is at least a meter wide
} // loop over group children } // loop over group children
} // entitybase is sceneobject group } // entitybase is sceneobject group
} // foreach loop over entities } // foreach loop over entities
float[] sortedZHeights = z_sortheights.ToArray();
uint[] sortedlocalIds = z_localIDs.ToArray();
// Sort prim by Z position
Array.Sort(sortedZHeights, sortedlocalIds);
Graphics g = Graphics.FromImage(mapbmp);
for (int s = 0; s < sortedZHeights.Length; s++)
{
if (z_sort.ContainsKey(sortedlocalIds[s]))
{
RectangleDrawStruct rectDrawStruct = z_sort[sortedlocalIds[s]];
g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect);
}
}
g.Dispose();
} // lock entities objs } // lock entities objs
m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms"); m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (System.Environment.TickCount - tc) + " ms");