ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Replace Scene.GetLandHeight() with a straight query to Scene.Heightmap (which is used in other contexts)

Browse Source
This commit is contained in:
Justin Clarke Casey
2009-03-05 21:10:39 +00:00
parent 3d70dbd01d
commit 11e1948b57
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs
View File

@@ -88,7 +88,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
}
// TODO: Get proper AVG Height
float localAVHeight = 1.56f;
float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y);
float posZLimit = (float)avatar.Scene.Heightmap[(int)position.X, (int)position.Y];
float newPosZ = posZLimit + localAVHeight;
if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
{

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3019,11 +3019,6 @@ namespace OpenSim.Region.Framework.Scenes
m_eventManager.TriggerOnPluginConsole(args);
}
public double GetLandHeight(int x, int y)
{
return Heightmap[x, y];
}
public UUID GetLandOwner(float x, float y)
{
ILandObject land = LandChannel.GetLandObject(x, y);

2
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
View File

@@ -710,7 +710,7 @@ namespace OpenSim.Region.Framework.Scenes
// TODO: Get proper AVG Height
float localAVHeight = 1.56f;
float posZLimit = (float)avatar.Scene.GetLandHeight((int)position.X, (int)position.Y);
float posZLimit = (float)avatar.Scene.Heightmap[(int)position.X, (int)position.Y];
float newPosZ = posZLimit + localAVHeight;
if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
{

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@@ -848,7 +848,7 @@ namespace OpenSim.Region.Framework.Scenes
localAVHeight = m_avHeight;
}
float posZLimit = (float)m_scene.GetLandHeight((int)pos.X, (int)pos.Y);
float posZLimit = (float)m_scene.Heightmap[(int)pos.X, (int)pos.Y];
float newPosZ = posZLimit + localAVHeight / 2;
if (posZLimit >= (pos.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
{