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

Oooops don't hover underground but do hover

avinationmerge
UbitUmarov 2012-04-27 23:18:54 +01:00
parent f5cb403e7e
commit e48fa38ff5
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Region/Physics/UbitOdePlugin/ODEDynamics.cs
View File

@ -773,39 +773,40 @@ namespace OpenSim.Region.Physics.OdePlugin
d.Vector3 pos = d.BodyGetPosition(Body); d.Vector3 pos = d.BodyGetPosition(Body);
float t = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y); float t = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y);
float perr;
if (t < m_VhoverHeight) // don't go underground // default to global but don't go underground
if (t < m_VhoverHeight)
perr = m_VhoverHeight - pos.Z;
else
perr = t - pos.Z; ;
if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == 0)
{ {
// default to global if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0)
float perr = m_VhoverHeight - pos.Z; ;
if ((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == 0)
{ {
if ((m_flags & VehicleFlag.HOVER_WATER_ONLY) != 0) perr += _pParentScene.GetWaterLevel();
{ }
perr += _pParentScene.GetWaterLevel(); else if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0)
} {
else if ((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) != 0) perr += t;
{ }
else
{
float w = _pParentScene.GetWaterLevel();
if (t > w)
perr += t; perr += t;
}
else else
{ perr += w;
float w = _pParentScene.GetWaterLevel();
if (t > w)
perr += t;
else
perr += w;
}
} }
if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == 0 || perr > 0)
{
force.Z += (perr / m_VhoverTimescale / m_VhoverTimescale - curVel.Z * m_VhoverEfficiency) / m_timestep;
force.Z += _pParentScene.gravityz * (1f - m_VehicleBuoyancy);
}
else // no buoyancy
force.Z += _pParentScene.gravityz;
} }
if ((m_flags & VehicleFlag.HOVER_UP_ONLY) == 0 || perr > 0)
{
force.Z += (perr / m_VhoverTimescale / m_VhoverTimescale - curVel.Z * m_VhoverEfficiency) / m_timestep;
force.Z += _pParentScene.gravityz * (1f - m_VehicleBuoyancy);
}
else // no buoyancy
force.Z += _pParentScene.gravityz;
} }
else else
{ {