diff options
| author | UbitUmarov | 2012-02-11 02:48:38 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-02-11 02:48:38 +0000 |
| commit | b617411b972281529684bd8151a59899c81bfcf6 (patch) | |
| tree | 940692bb229dcd12400318bf18662d69d82d964a /OpenSim/Region | |
| parent | revert project name to OpenSim and not Careminster (diff) | |
| download | opensim-SC-b617411b972281529684bd8151a59899c81bfcf6.zip opensim-SC-b617411b972281529684bd8151a59899c81bfcf6.tar.gz opensim-SC-b617411b972281529684bd8151a59899c81bfcf6.tar.bz2 opensim-SC-b617411b972281529684bd8151a59899c81bfcf6.tar.xz | |
scale avatar push force with avatar density
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs index c8f7c76..b0b91f6 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODECharacter.cs | |||
| @@ -768,7 +768,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 768 | if (pushforce) | 768 | if (pushforce) |
| 769 | { | 769 | { |
| 770 | m_pidControllerActive = false; | 770 | m_pidControllerActive = false; |
| 771 | m_taintForce = force / _parent_scene.ODE_STEPSIZE; | 771 | // scale with odetime step and density |
| 772 | m_taintForce = force * m_density / _parent_scene.ODE_STEPSIZE / 28f; | ||
| 772 | m_hasTaintForce = true; | 773 | m_hasTaintForce = true; |
| 773 | _parent_scene.AddPhysicsActorTaint(this); | 774 | _parent_scene.AddPhysicsActorTaint(this); |
| 774 | } | 775 | } |