Attempted workaround for Mono's insistence on compiling BasicTerrain incorrectly
parent
67af17fdd1
commit
96dfb33bca
|
@ -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.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), m_world.Terrain[(max_x * 4), (max_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;
|
parcelData.area = tempArea;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -814,6 +814,17 @@ namespace OpenSim.Region.Terrain
|
||||||
tainted++;
|
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>
|
/// <summary>
|
||||||
/// Multiplies the heightfield by val
|
/// Multiplies the heightfield by val
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -827,25 +838,6 @@ namespace OpenSim.Region.Terrain
|
||||||
return meep;
|
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>
|
/// <summary>
|
||||||
/// Exports the current heightmap to a PNG file
|
/// Exports the current heightmap to a PNG file
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue