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

varregion: modify MapImageModule structure so it will better merge 

with changes made in master.
varregion
Robert Adams 2014-01-26 07:38:28 -08:00
parent afb2e07111
commit 6831e58616
1 changed files with 291 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -283,6 +283,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
List<float> z_sortheights = new List<float>();
List<uint> z_localIDs = new List<uint>();
try
{
lock (objs)
{
foreach (EntityBase obj in objs)
@ -382,7 +384,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
Vector3 scale = new Vector3();
Vector3 tScale = new Vector3();
Vector3 axPos = new Vector3(pos.X,pos.Y,pos.Z);
Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z);
Quaternion llrot = part.GetWorldRotation();
Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
@ -410,7 +412,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
|| mapdrawendY > (hm.Height - 1))
continue;
#region obb face reconstruction part duex
#region obb face reconstruction part duex
Vector3[] vertexes = new Vector3[8];
// float[] distance = new float[6];
@ -514,7 +516,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
FaceD[2] = vertexes[7];
FaceC[3] = vertexes[7];
FaceD[5] = vertexes[7];
#endregion
#endregion
//int wy = 0;
@ -593,9 +595,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
//g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect);
}
}
} // lock(objs)
}
finally
{
foreach (DrawStruct ds in z_sort.Values)
ds.brush.Dispose();
}
g.Dispose();
} // lock entities objs
m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
return mapbmp;