diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs index 8f8e2bd..7e95d7f 100644 --- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs +++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | |||
@@ -44,10 +44,10 @@ using System.Reflection; | |||
44 | using System.Runtime.InteropServices; | 44 | using System.Runtime.InteropServices; |
45 | using log4net; | 45 | using log4net; |
46 | using OpenMetaverse; | 46 | using OpenMetaverse; |
47 | using Ode.NET; | ||
48 | using OpenSim.Framework; | 47 | using OpenSim.Framework; |
49 | using OpenSim.Region.PhysicsModules.SharedBase; | 48 | using OpenSim.Region.PhysicsModules.SharedBase; |
50 | 49 | ||
50 | |||
51 | namespace OpenSim.Region.PhysicsModule.ODE | 51 | namespace OpenSim.Region.PhysicsModule.ODE |
52 | { | 52 | { |
53 | public class ODEDynamics | 53 | public class ODEDynamics |
@@ -607,6 +607,13 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
607 | m_body = pBody; | 607 | m_body = pBody; |
608 | } | 608 | } |
609 | 609 | ||
610 | internal void Stop() | ||
611 | { | ||
612 | m_lastLinearVelocityVector = Vector3.Zero; | ||
613 | m_lastAngularVelocity = Vector3.Zero; | ||
614 | m_lastPositionVector = d.BodyGetPosition(Body); | ||
615 | } | ||
616 | |||
610 | internal void Step(float pTimestep, OdeScene pParentScene) | 617 | internal void Step(float pTimestep, OdeScene pParentScene) |
611 | { | 618 | { |
612 | if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE) | 619 | if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE) |
@@ -907,7 +914,7 @@ namespace OpenSim.Region.PhysicsModule.ODE | |||
907 | 914 | ||
908 | // Sum velocities | 915 | // Sum velocities |
909 | m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection | 916 | m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection |
910 | 917 | ||
911 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) | 918 | if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) |
912 | { | 919 | { |
913 | m_lastAngularVelocity.X = 0; | 920 | m_lastAngularVelocity.X = 0; |