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

varregion: fix GetLandObject error return and initialization of square 

land object bitmaps. This fixes creation of child presences and the
editing of parcels.
Also lots of commented out debugging messages.
varregion
Robert Adams 2013-11-10 19:52:31 -08:00
parent 7061784cc6
commit c12e68e34d
3 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/TerrainData.cs
View File

@ -112,7 +112,7 @@ namespace OpenSim.Framework
public class HeightmapTerrainData : TerrainData public class HeightmapTerrainData : TerrainData
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static string LogHeader = "[TERRAIN DATA]"; private static string LogHeader = "[HEIGHTMAP TERRAIN DATA]";
// TerrainData.this[x, y] // TerrainData.this[x, y]
public override float this[int x, int y] public override float this[int x, int y]
@ -124,7 +124,6 @@ namespace OpenSim.Framework
{ {
m_heightmap[x, y] = newVal; m_heightmap[x, y] = newVal;
m_taint[x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize] = true; m_taint[x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize] = true;
// m_log.DebugFormat("{0} set[{1},{2}] to {3} ({4})", LogHeader, x, y, value, newVal);
} }
} }
} }
@ -258,6 +257,7 @@ namespace OpenSim.Framework
} }
} }
// m_log.DebugFormat("{0} new by doubles. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize]; m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
ClearTaint(); ClearTaint();
@ -272,6 +272,7 @@ namespace OpenSim.Framework
m_compressionFactor = 100.0f; m_compressionFactor = 100.0f;
m_heightmap = new short[SizeX, SizeY]; m_heightmap = new short[SizeX, SizeY];
m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize]; m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
// m_log.DebugFormat("{0} new by dimensions. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
ClearTaint(); ClearTaint();
} }
@ -282,6 +283,7 @@ namespace OpenSim.Framework
for (int xx = 0; xx < SizeX; xx++) for (int xx = 0; xx < SizeX; xx++)
for (int yy = 0; yy < SizeY; yy++) for (int yy = 0; yy < SizeY; yy++)
m_heightmap[xx, yy] = cmap[ind++]; m_heightmap[xx, yy] = cmap[ind++];
// m_log.DebugFormat("{0} new by compressed map. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
} }
// Create a heighmap from a database blob // Create a heighmap from a database blob

26
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -635,14 +635,14 @@ namespace OpenSim.Region.CoreModules.World.Land
new_land.LandData.LocalID = newLandLocalID; new_land.LandData.LocalID = newLandLocalID;
bool[,] landBitmap = new_land.GetLandBitmap(); bool[,] landBitmap = new_land.GetLandBitmap();
m_log.DebugFormat("{0} AddLandObject. new_land.bitmapSize=({1},{2}). bitmap[600/4,600/4]={3}, newLocalID={4}", // m_log.DebugFormat("{0} AddLandObject. new_land.bitmapSize=({1},{2}). newLocalID={3}",
LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), landBitmap[600/4, 600/4], newLandLocalID); // LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), newLandLocalID);
if (landBitmap.GetLength(0) != m_landIDList.GetLength(0) || landBitmap.GetLength(1) != m_landIDList.GetLength(1)) if (landBitmap.GetLength(0) != m_landIDList.GetLength(0) || landBitmap.GetLength(1) != m_landIDList.GetLength(1))
{ {
// Going to variable sized regions can cause mismatches // Going to variable sized regions can cause mismatches
m_log.ErrorFormat("{0} AddLandObject. Added land bitmap different size than region ID map. bitmapSize=({1},{2}), landIDSize=({3},{4})", m_log.ErrorFormat("{0} AddLandObject. Added land bitmap different size than region ID map. bitmapSize=({1},{2}), landIDSize=({3},{4})",
LogHeader, landBitmap.GetLength(0), m_landIDList.GetLength(1), landBitmap.GetLength(0), m_landIDList.GetLength(1) ); LogHeader, landBitmap.GetLength(0), landBitmap.GetLength(1), m_landIDList.GetLength(0), m_landIDList.GetLength(1) );
} }
else else
{ {
@ -769,7 +769,7 @@ namespace OpenSim.Region.CoreModules.World.Land
/// <returns>Land object at the point supplied</returns> /// <returns>Land object at the point supplied</returns>
public ILandObject GetLandObject(float x_float, float y_float) public ILandObject GetLandObject(float x_float, float y_float)
{ {
return GetLandObject((int)x_float, (int)y_float); return GetLandObject((int)x_float, (int)y_float, true /* returnNullIfLandObjectNotFound */);
/* /*
int x; int x;
int y; int y;
@ -823,8 +823,15 @@ namespace OpenSim.Region.CoreModules.World.Land
*/ */
} }
// Given a region position, return the parcel land object for that location // Public entry.
// Throws exception if land object is not found
public ILandObject GetLandObject(int x, int y) public ILandObject GetLandObject(int x, int y)
{
return GetLandObject(x, y, false /* returnNullIfLandObjectNotFound */);
}
// Given a region position, return the parcel land object for that location
private ILandObject GetLandObject(int x, int y, bool returnNullIfLandObjectNotFound)
{ {
ILandObject ret = null; ILandObject ret = null;
@ -832,9 +839,12 @@ namespace OpenSim.Region.CoreModules.World.Land
{ {
// These exceptions here will cause a lot of complaints from the users specifically because // These exceptions here will cause a lot of complaints from the users specifically because
// they happen every time at border crossings // they happen every time at border crossings
throw new Exception( if (returnNullIfLandObjectNotFound)
String.Format("{0} GetLandObject for non-existant position. Region={1}, pos=<{2},{3}", return null;
LogHeader, m_scene.RegionInfo.RegionName, x, y) else
throw new Exception(
String.Format("{0} GetLandObject for non-existant position. Region={1}, pos=<{2},{3}",
LogHeader, m_scene.RegionInfo.RegionName, x, y)
); );
} }

17
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -102,6 +102,8 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
m_log.ErrorFormat("{0} StartPoint. No start point found. bitmapSize=<{1},{2}>",
LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
return new Vector3(-1, -1, -1); return new Vector3(-1, -1, -1);
} }
} }
@ -121,6 +123,8 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
m_log.ErrorFormat("{0} EndPoint. No end point found. bitmapSize=<{1},{2}>",
LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
return new Vector3(-1, -1, -1); return new Vector3(-1, -1, -1);
} }
} }
@ -757,6 +761,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public void SetLandBitmap(bool[,] bitmap) public void SetLandBitmap(bool[,] bitmap)
{ {
LandBitmap = bitmap; LandBitmap = bitmap;
// m_log.DebugFormat("{0} SetLandBitmap. BitmapSize=<{1},{2}>", LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
ForceUpdateLandInfo(); ForceUpdateLandInfo();
} }
@ -776,10 +781,14 @@ namespace OpenSim.Region.CoreModules.World.Land
public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y) public bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y)
{ {
bool[,] tempBitmap = new bool[(end_x-start_x)/landUnit,(end_y-start_y)/landUnit]; // Empty bitmap for the whole region
bool[,] tempBitmap = new bool[m_scene.RegionInfo.RegionSizeX / landUnit, m_scene.RegionInfo.RegionSizeY / landUnit];
tempBitmap.Initialize(); tempBitmap.Initialize();
// Fill the bitmap square area specified by state and end
tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true); tempBitmap = ModifyLandBitmapSquare(tempBitmap, start_x, start_y, end_x, end_y, true);
// m_log.DebugFormat("{0} GetSquareLandBitmap. tempBitmapSize=<{1},{2}>",
// LogHeader, tempBitmap.GetLength(0), tempBitmap.GetLength(1));
return tempBitmap; return tempBitmap;
} }
@ -808,6 +817,8 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
} }
// m_log.DebugFormat("{0} ModifyLandBitmapSquare. startXY=<{1},{2}>, endXY=<{3},{4}>, val={5}, landBitmapSize=<{6},{7}>",
// LogHeader, start_x, start_y, end_x, end_y, set_value, land_bitmap.GetLength(0), land_bitmap.GetLength(1));
return land_bitmap; return land_bitmap;
} }
@ -868,6 +879,8 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
} }
// m_log.DebugFormat("{0} ConvertLandBitmapToBytes. BitmapSize=<{1},{2}>",
// LogHeader, LandBitmap.GetLength(0), LandBitmap.GetLength(1));
return tempConvertArr; return tempConvertArr;
} }
@ -886,7 +899,7 @@ namespace OpenSim.Region.CoreModules.World.Land
// and only set the lower area of the larger region. // and only set the lower area of the larger region.
xLen = (int)(Constants.RegionSize / landUnit); xLen = (int)(Constants.RegionSize / landUnit);
} }
m_log.DebugFormat("{0} ConvertBytesToLandBitmap: bitmapLen={1}, xLen={2}", LogHeader, bitmapLen, xLen); // m_log.DebugFormat("{0} ConvertBytesToLandBitmap: bitmapLen={1}, xLen={2}", LogHeader, bitmapLen, xLen);
int x = 0, y = 0; int x = 0, y = 0;
for (int i = 0; i < bitmapLen; i++) for (int i = 0; i < bitmapLen; i++)