diff options
author | Melanie | 2012-12-18 09:48:12 +0000 |
---|---|---|
committer | Melanie | 2012-12-18 09:48:12 +0000 |
commit | 79bdf464d3f123f8e195fa57c497e546b7d9dfcc (patch) | |
tree | bf6123b15d1ced7ec72ce871e4801d6645bb23f4 /OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix locking for good (diff) | |
download | opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.zip opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.gz opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.bz2 opensim-SC-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.xz |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index dc247a9..faa9488 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
84 | 84 | ||
85 | private Vector3 _position; | 85 | private Vector3 _position; |
86 | private Vector3 _velocity; | 86 | private Vector3 _velocity; |
87 | private Vector3 _torque; | 87 | private Vector3 m_torque; |
88 | private Vector3 m_lastVelocity; | 88 | private Vector3 m_lastVelocity; |
89 | private Vector3 m_lastposition; | 89 | private Vector3 m_lastposition; |
90 | private Vector3 m_rotationalVelocity; | 90 | private Vector3 m_rotationalVelocity; |
@@ -597,7 +597,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
597 | if (!IsPhysical || Body == IntPtr.Zero) | 597 | if (!IsPhysical || Body == IntPtr.Zero) |
598 | return Vector3.Zero; | 598 | return Vector3.Zero; |
599 | 599 | ||
600 | return _torque; | 600 | return m_torque; |
601 | } | 601 | } |
602 | 602 | ||
603 | set | 603 | set |
@@ -2425,10 +2425,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2425 | { | 2425 | { |
2426 | if (!childPrim) | 2426 | if (!childPrim) |
2427 | { | 2427 | { |
2428 | m_force = Vector3.Zero; | 2428 | // m_force = Vector3.Zero; |
2429 | m_forceacc = Vector3.Zero; | 2429 | m_forceacc = Vector3.Zero; |
2430 | m_angularForceacc = Vector3.Zero; | 2430 | m_angularForceacc = Vector3.Zero; |
2431 | _torque = Vector3.Zero; | 2431 | // m_torque = Vector3.Zero; |
2432 | _velocity = Vector3.Zero; | 2432 | _velocity = Vector3.Zero; |
2433 | _acceleration = Vector3.Zero; | 2433 | _acceleration = Vector3.Zero; |
2434 | m_rotationalVelocity = Vector3.Zero; | 2434 | m_rotationalVelocity = Vector3.Zero; |
@@ -2521,7 +2521,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2521 | prm.m_collisionCategories = m_collisionCategories; | 2521 | prm.m_collisionCategories = m_collisionCategories; |
2522 | prm.m_collisionFlags = m_collisionFlags; | 2522 | prm.m_collisionFlags = m_collisionFlags; |
2523 | 2523 | ||
2524 | if (prm.prim_geom != null) | 2524 | if (prm.prim_geom != IntPtr.Zero) |
2525 | { | 2525 | { |
2526 | 2526 | ||
2527 | if (prm.m_NoColide) | 2527 | if (prm.m_NoColide) |
@@ -2542,7 +2542,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2542 | // ((OdePrim)_parent).ChildSelectedChange(true); | 2542 | // ((OdePrim)_parent).ChildSelectedChange(true); |
2543 | 2543 | ||
2544 | 2544 | ||
2545 | if (prim_geom != null) | 2545 | if (prim_geom != IntPtr.Zero) |
2546 | { | 2546 | { |
2547 | if (m_NoColide) | 2547 | if (m_NoColide) |
2548 | { | 2548 | { |
@@ -2968,7 +2968,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2968 | d.BodyEnable(Body); | 2968 | d.BodyEnable(Body); |
2969 | 2969 | ||
2970 | } | 2970 | } |
2971 | _torque = newtorque; | 2971 | m_torque = newtorque; |
2972 | } | 2972 | } |
2973 | } | 2973 | } |
2974 | 2974 | ||
@@ -3364,7 +3364,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
3364 | 3364 | ||
3365 | Vector3 trq; | 3365 | Vector3 trq; |
3366 | 3366 | ||
3367 | trq = _torque; | 3367 | trq = m_torque; |
3368 | trq += m_angularForceacc; | 3368 | trq += m_angularForceacc; |
3369 | m_angularForceacc = Vector3.Zero; | 3369 | m_angularForceacc = Vector3.Zero; |
3370 | if (trq.X != 0 || trq.Y != 0 || trq.Z != 0) | 3370 | if (trq.X != 0 || trq.Y != 0 || trq.Z != 0) |