From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs') 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; using System.Runtime.InteropServices; using log4net; using OpenMetaverse; -using Ode.NET; using OpenSim.Framework; using OpenSim.Region.PhysicsModules.SharedBase; + namespace OpenSim.Region.PhysicsModule.ODE { public class ODEDynamics @@ -607,6 +607,13 @@ namespace OpenSim.Region.PhysicsModule.ODE m_body = pBody; } + internal void Stop() + { + m_lastLinearVelocityVector = Vector3.Zero; + m_lastAngularVelocity = Vector3.Zero; + m_lastPositionVector = d.BodyGetPosition(Body); + } + internal void Step(float pTimestep, OdeScene pParentScene) { if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE) @@ -907,7 +914,7 @@ namespace OpenSim.Region.PhysicsModule.ODE // Sum velocities m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection - + if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) { m_lastAngularVelocity.X = 0; -- cgit v1.1