aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs')
-rw-r--r--OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index 7ad5e3d..b86be0f 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -1603,7 +1603,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1603 } 1603 }
1604 else 1604 else
1605 { 1605 {
1606 Vector3 a = _velocity; // previus velocity 1606 Vector3 a = _velocity; // previous velocity
1607 SetSmooth(ref _velocity,ref vel,2); 1607 SetSmooth(ref _velocity,ref vel,2);
1608 a = (_velocity - a) * invtimeStep; 1608 a = (_velocity - a) * invtimeStep;
1609 SetSmooth(ref _acceleration,ref a,2); 1609 SetSmooth(ref _acceleration,ref a,2);
@@ -1921,6 +1921,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1921 1921
1922 _position = newPos; 1922 _position = newPos;
1923 m_freemove = false; 1923 m_freemove = false;
1924 _zeroFlag = false;
1924 m_pidControllerActive = true; 1925 m_pidControllerActive = true;
1925 } 1926 }
1926 1927
@@ -1976,8 +1977,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
1976 1977
1977 private void changeTargetVelocity(Vector3 newVel) 1978 private void changeTargetVelocity(Vector3 newVel)
1978 { 1979 {
1979 m_pidControllerActive = true; 1980 //m_pidControllerActive = true;
1980 m_freemove = false; 1981 //m_freemove = false;
1981 _target_velocity = newVel; 1982 _target_velocity = newVel;
1982 if (Body != IntPtr.Zero) 1983 if (Body != IntPtr.Zero)
1983 SafeNativeMethods.BodyEnable(Body); 1984 SafeNativeMethods.BodyEnable(Body);