diff options
author | Jeff Ames | 2008-12-30 01:08:07 +0000 |
---|---|---|
committer | Jeff Ames | 2008-12-30 01:08:07 +0000 |
commit | 2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b (patch) | |
tree | c39317267e7f1d634fc1a922ded51c6e48e329d1 /OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |
parent | Changing the default Comms module to be RESTComms, in case none is specified ... (diff) | |
download | opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.zip opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.gz opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.bz2 opensim-SC_OLD-2be0f7a6f0b66e25b0d7e0e6cfee93f0c41b562b.tar.xz |
Update svn properties, minor formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs index acd2569..a250a6a 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | |||
@@ -1366,28 +1366,28 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1366 | get { return m_NINJA_physics_joints_enabled; } | 1366 | get { return m_NINJA_physics_joints_enabled; } |
1367 | } | 1367 | } |
1368 | 1368 | ||
1369 | // internal utility function: must be called within a lock(OdeLock) | 1369 | // internal utility function: must be called within a lock (OdeLock) |
1370 | private void InternalAddActiveJoint(PhysicsJoint joint) | 1370 | private void InternalAddActiveJoint(PhysicsJoint joint) |
1371 | { | 1371 | { |
1372 | activeJoints.Add(joint); | 1372 | activeJoints.Add(joint); |
1373 | SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint); | 1373 | SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint); |
1374 | } | 1374 | } |
1375 | 1375 | ||
1376 | // internal utility function: must be called within a lock(OdeLock) | 1376 | // internal utility function: must be called within a lock (OdeLock) |
1377 | private void InternalAddPendingJoint(OdePhysicsJoint joint) | 1377 | private void InternalAddPendingJoint(OdePhysicsJoint joint) |
1378 | { | 1378 | { |
1379 | pendingJoints.Add(joint); | 1379 | pendingJoints.Add(joint); |
1380 | SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint); | 1380 | SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint); |
1381 | } | 1381 | } |
1382 | 1382 | ||
1383 | // internal utility function: must be called within a lock(OdeLock) | 1383 | // internal utility function: must be called within a lock (OdeLock) |
1384 | private void InternalRemovePendingJoint(PhysicsJoint joint) | 1384 | private void InternalRemovePendingJoint(PhysicsJoint joint) |
1385 | { | 1385 | { |
1386 | pendingJoints.Remove(joint); | 1386 | pendingJoints.Remove(joint); |
1387 | SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene); | 1387 | SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene); |
1388 | } | 1388 | } |
1389 | 1389 | ||
1390 | // internal utility function: must be called within a lock(OdeLock) | 1390 | // internal utility function: must be called within a lock (OdeLock) |
1391 | private void InternalRemoveActiveJoint(PhysicsJoint joint) | 1391 | private void InternalRemoveActiveJoint(PhysicsJoint joint) |
1392 | { | 1392 | { |
1393 | activeJoints.Remove(joint); | 1393 | activeJoints.Remove(joint); |
@@ -1640,7 +1640,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1640 | } | 1640 | } |
1641 | } | 1641 | } |
1642 | 1642 | ||
1643 | // normally called from within OnJointMoved, which is called from within a lock(OdeLock) | 1643 | // normally called from within OnJointMoved, which is called from within a lock (OdeLock) |
1644 | public override PhysicsVector GetJointAnchor(PhysicsJoint joint) | 1644 | public override PhysicsVector GetJointAnchor(PhysicsJoint joint) |
1645 | { | 1645 | { |
1646 | Debug.Assert(joint.IsInPhysicsEngine); | 1646 | Debug.Assert(joint.IsInPhysicsEngine); |
@@ -1666,7 +1666,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
1666 | return new PhysicsVector(pos.X, pos.Y, pos.Z); | 1666 | return new PhysicsVector(pos.X, pos.Y, pos.Z); |
1667 | } | 1667 | } |
1668 | 1668 | ||
1669 | // normally called from within OnJointMoved, which is called from within a lock(OdeLock) | 1669 | // normally called from within OnJointMoved, which is called from within a lock (OdeLock) |
1670 | // WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function | 1670 | // WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function |
1671 | // appears to be unreliable. Fortunately we can compute the joint axis ourselves by | 1671 | // appears to be unreliable. Fortunately we can compute the joint axis ourselves by |
1672 | // keeping track of the joint's original orientation relative to one of the involved bodies. | 1672 | // keeping track of the joint's original orientation relative to one of the involved bodies. |
@@ -2230,8 +2230,8 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
2230 | 2230 | ||
2231 | if (SupportsNINJAJoints) | 2231 | if (SupportsNINJAJoints) |
2232 | { | 2232 | { |
2233 | DeleteRequestedJoints(); // this must be outside of the lock(OdeLock) to avoid deadlocks | 2233 | DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks |
2234 | CreateRequestedJoints(); // this must be outside of the lock(OdeLock) to avoid deadlocks | 2234 | CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks |
2235 | } | 2235 | } |
2236 | 2236 | ||
2237 | lock (OdeLock) | 2237 | lock (OdeLock) |