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

Attempted workaround for Mono's insistence on compiling BasicTerrain incorrectly

Sugilite
Adam Frisby 2007-07-02 23:42:38 +00:00
parent 67af17fdd1
commit 96dfb33bca
2 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/ParcelManager.cs
View File

@ -682,8 +682,8 @@ namespace OpenSim.Region.Environment
}
}
}
parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), m_world.Terrain[(min_x * 4), (min_y * 4)]);
parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), m_world.Terrain[(max_x * 4), (max_y * 4)]);
parcelData.AABBMin = new LLVector3((float)(min_x * 4), (float)(min_y * 4), (float)m_world.Terrain.get((min_x * 4), (min_y * 4)));
parcelData.AABBMax = new LLVector3((float)(max_x * 4), (float)(max_y * 4), (float)m_world.Terrain.get((max_x * 4), (max_y * 4)));
parcelData.area = tempArea;
}

30
OpenSim/Region/Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -814,6 +814,17 @@ namespace OpenSim.Region.Terrain
tainted++;
}
/// <summary>
/// Wrapper to heightmap.get()
/// </summary>
/// <param name="x">X coord</param>
/// <param name="y">Y coord</param>
/// <returns>Height at specified coordinates</returns>
public double get(int x, int y)
{
return heightmap.get(x, y);
}
/// <summary>
/// Multiplies the heightfield by val
/// </summary>
@ -827,25 +838,6 @@ namespace OpenSim.Region.Terrain
return meep;
}
/// <summary>
/// Returns the height at the coordinates x,y
/// </summary>
/// <param name="x">X Coordinate</param>
/// <param name="y">Y Coordinate</param>
/// <returns></returns>
public float this[int x, int y]
{
get
{
return (float)heightmap.get(x, y);
}
set
{
tainted++;
heightmap.set(x, y, (double)value);
}
}
/// <summary>
/// Exports the current heightmap to a PNG file
/// </summary>