OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stop a object when making it not physical

avinationmerge
UbitUmarov 2015-10-18 00:35:52 +01:00
parent 24435cfe9a
commit a31e5e799e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
View File

@ -83,8 +83,15 @@ namespace OpenSim.Region.PhysicsModule.ODE
set set
{ {
m_isphysical = value; m_isphysical = value;
if (!m_isphysical) // Zero the remembered last velocity if (!m_isphysical)
{
_zeroFlag = true; // Zero the remembered last velocity
m_lastVelocity = Vector3.Zero; m_lastVelocity = Vector3.Zero;
_acceleration = Vector3.Zero;
_velocity = Vector3.Zero;
m_taintVelocity = Vector3.Zero;
m_rotationalVelocity = Vector3.Zero;
}
} }
} }
@ -2739,7 +2746,7 @@ Console.WriteLine(" JointCreateFixed");
Vector3 pv = Vector3.Zero; Vector3 pv = Vector3.Zero;
bool lastZeroFlag = _zeroFlag; bool lastZeroFlag = _zeroFlag;
float m_minvelocity = 0; float m_minvelocity = 0;
if (Body != (IntPtr)0) // FIXME -> or if it is a joint if (Body != IntPtr.Zero) // FIXME -> or if it is a joint
{ {
d.Vector3 vec = d.BodyGetPosition(Body); d.Vector3 vec = d.BodyGetPosition(Body);
d.Quaternion ori = d.BodyGetQuaternion(Body); d.Quaternion ori = d.BodyGetQuaternion(Body);