diff options
author | UbitUmarov | 2012-04-23 20:16:53 +0100 |
---|---|---|
committer | UbitUmarov | 2012-04-23 20:16:53 +0100 |
commit | 5a8fdc8a0b79c14382872571b113b5c5559083c4 (patch) | |
tree | deeda42505621facef6c158bce472b81d5b1ab36 /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
parent | ubitODE - several changes... (diff) | |
download | opensim-SC-5a8fdc8a0b79c14382872571b113b5c5559083c4.zip opensim-SC-5a8fdc8a0b79c14382872571b113b5c5559083c4.tar.gz opensim-SC-5a8fdc8a0b79c14382872571b113b5c5559083c4.tar.bz2 opensim-SC-5a8fdc8a0b79c14382872571b113b5c5559083c4.tar.xz |
ubitODE - do own timing control (as chODE does) until heartbeat does it right
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 7c0bbef..dc6c18d 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -695,7 +695,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
695 | m_PIDTau = 0; | 695 | m_PIDTau = 0; |
696 | else | 696 | else |
697 | { | 697 | { |
698 | float mint = (0.05f > _parent_scene.ODE_STEPSIZE ? 0.05f : _parent_scene.ODE_STEPSIZE); | 698 | float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep); |
699 | if (value < mint) | 699 | if (value < mint) |
700 | m_PIDTau = mint; | 700 | m_PIDTau = mint; |
701 | else | 701 | else |
@@ -723,7 +723,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
723 | m_PIDHoverTau = 0; | 723 | m_PIDHoverTau = 0; |
724 | else | 724 | else |
725 | { | 725 | { |
726 | float mint = (0.05f > _parent_scene.ODE_STEPSIZE ? 0.05f : _parent_scene.ODE_STEPSIZE); | 726 | float mint = (0.05f > m_timeStep ? 0.05f : m_timeStep); |
727 | if (value < mint) | 727 | if (value < mint) |
728 | m_PIDHoverTau = mint; | 728 | m_PIDHoverTau = mint; |
729 | else | 729 | else |
@@ -801,7 +801,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
801 | { | 801 | { |
802 | if (force.IsFinite()) | 802 | if (force.IsFinite()) |
803 | { | 803 | { |
804 | AddChange(changes.AddForce, force / _parent_scene.ODE_STEPSIZE); | 804 | AddChange(changes.AddForce, force * m_invTimeStep); |
805 | } | 805 | } |
806 | else | 806 | else |
807 | { | 807 | { |
@@ -814,7 +814,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
814 | { | 814 | { |
815 | if (force.IsFinite()) | 815 | if (force.IsFinite()) |
816 | { | 816 | { |
817 | AddChange(changes.AddAngForce, force / _parent_scene.ODE_STEPSIZE); | 817 | AddChange(changes.AddAngForce, force * m_invTimeStep); |
818 | } | 818 | } |
819 | else | 819 | else |
820 | { | 820 | { |