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

flying in POS should be a bit smoother

afrisby
Jeff Ames 2007-11-18 18:20:02 +00:00
parent 7672237bcd
commit c40cfb01aa
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Physics/POSPlugin/POSPlugin.cs
View File

@ -173,14 +173,14 @@ namespace OpenSim.Region.Physics.POSPlugin
character._target_velocity.Z += gravity * timeStep; character._target_velocity.Z += gravity * timeStep;
} }
bool forcedZ = false;
character.Position.X = character.Position.X + (character._target_velocity.X * timeStep); character.Position.X = character.Position.X + (character._target_velocity.X * timeStep);
character.Position.Y = character.Position.Y + (character._target_velocity.Y * timeStep); character.Position.Y = character.Position.Y + (character._target_velocity.Y * timeStep);
float terrainheight = _heightMap[(int)character.Position.Y * 256 + (int)character.Position.X]; float terrainheight = _heightMap[(int)character.Position.Y * 256 + (int)character.Position.X];
if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2) if (character.Position.Z + (character._target_velocity.Z * timeStep) < terrainheight + 2)
{ {
character.Position.Z = terrainheight + 1.0f; character.Position.Z = terrainheight + 1.0f;
character._target_velocity.Z = 0; forcedZ = true;
character._velocity.Z = 0;
} }
else else
{ {
@ -205,12 +205,12 @@ namespace OpenSim.Region.Physics.POSPlugin
} }
else else
{ {
character._target_velocity.Z = 0; forcedZ = true;
} }
} }
else else
{ {
character._target_velocity.Z = 0; forcedZ = true;
} }
} }
@ -234,6 +234,17 @@ namespace OpenSim.Region.Physics.POSPlugin
character._velocity.X = (character.Position.X - oldposX) / timeStep; character._velocity.X = (character.Position.X - oldposX) / timeStep;
character._velocity.Y = (character.Position.Y - oldposY) / timeStep; character._velocity.Y = (character.Position.Y - oldposY) / timeStep;
if (forcedZ)
{
character._velocity.Z = 0;
character._target_velocity.Z = 0;
character.RequestPhysicsterseUpdate();
}
else
{
character._velocity.Z = (character.Position.Z - oldposZ) / timeStep;
}
} }
} }