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

* Tweak the BulletDotNETPlugin character controller so it feels more finished.

0.6.5-rc1
Teravus Ovares 2009-04-07 15:01:46 +00:00
parent eb190905b5
commit 11f8ea30f9
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
View File

@ -916,6 +916,11 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
// we're in mid air suspended // we're in mid air suspended
vec.X = ((m_target_velocity.X / movementdivisor) - vel.X) * (PID_D / 6); vec.X = ((m_target_velocity.X / movementdivisor) - vel.X) * (PID_D / 6);
vec.Y = ((m_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D / 6); vec.Y = ((m_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D / 6);
// We don't want linear velocity to cause our avatar to bounce, so we check target Z and actual velocity X, Y
// rebound preventing
if (m_target_velocity.Z < 0.025f && m_velocity.X < 0.25f && m_velocity.Y < 0.25f)
m_zeroFlag = true;
} }
if (m_iscolliding && !m_flying && m_target_velocity.Z > 0.0f) if (m_iscolliding && !m_flying && m_target_velocity.Z > 0.0f)
@ -957,7 +962,19 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
} }
if (m_flying) if (m_flying)
{ {
//vec.Z += ((-1 * m_parent_scene.gravityz) * m_mass); // Slight PID correction
vec.Z += (((-1 * m_parent_scene.gravityz) * m_mass) * 0.035f);
//auto fly height. Kitto Flora
//d.Vector3 pos = d.BodyGetPosition(Body);
float target_altitude = m_parent_scene.GetTerrainHeightAtXY(m_position.X, m_position.Y) + 5.0f;
if (m_position.Z < target_altitude)
{
vec.Z += (target_altitude - m_position.Z) * PID_P * 5.0f;
}
} }
if (Body != null && (((m_target_velocity.X > 0.2f || m_target_velocity.X < -0.2f) || (m_target_velocity.Y > 0.2f || m_target_velocity.Y < -0.2f)))) if (Body != null && (((m_target_velocity.X > 0.2f || m_target_velocity.X < -0.2f) || (m_target_velocity.Y > 0.2f || m_target_velocity.Y < -0.2f))))
{ {
@ -1036,7 +1053,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
m_velocity.Y = (vec.Y); m_velocity.Y = (vec.Y);
m_velocity.Z = (vec.Z); m_velocity.Z = (vec.Z);
//m_log.Debug(m_target_velocity);
if (m_velocity.Z < -6 && !m_hackSentFall) if (m_velocity.Z < -6 && !m_hackSentFall)
{ {
m_hackSentFall = true; m_hackSentFall = true;

2
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETScene.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
public float geomDefaultDensity = 10.000006836f; public float geomDefaultDensity = 10.000006836f;
private float avPIDD = 65f; private float avPIDD = 65f;
private float avPIDP = 28f; private float avPIDP = 21f;
private float avCapRadius = 0.37f; private float avCapRadius = 0.37f;
private float avStandupTensor = 2000000f; private float avStandupTensor = 2000000f;
private float avDensity = 80f; private float avDensity = 80f;