diff options
author | Robert Adams | 2013-01-23 09:11:01 -0800 |
---|---|---|
committer | Robert Adams | 2013-01-23 14:25:30 -0800 |
commit | 13182904da897be1dad0bb86d8099bd0956ffac4 (patch) | |
tree | 6a47f7545f2cb42cc6839d3a611dad510ed2cf78 | |
parent | BulletSim: center-of-gravity linkset changes. Not working yet. (diff) | |
download | opensim-SC_OLD-13182904da897be1dad0bb86d8099bd0956ffac4.zip opensim-SC_OLD-13182904da897be1dad0bb86d8099bd0956ffac4.tar.gz opensim-SC_OLD-13182904da897be1dad0bb86d8099bd0956ffac4.tar.bz2 opensim-SC_OLD-13182904da897be1dad0bb86d8099bd0956ffac4.tar.xz |
BulletSim: small change to center-of-mass computation left out last commit
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index ee2bfa0..731ab7b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -1621,10 +1621,15 @@ public sealed class BSPrim : BSPhysObject | |||
1621 | 1621 | ||
1622 | DetailLog("{0},BSPrim.UpdateProperties,entry,entprop={1}", LocalID, entprop); // DEBUG DEBUG | 1622 | DetailLog("{0},BSPrim.UpdateProperties,entry,entprop={1}", LocalID, entprop); // DEBUG DEBUG |
1623 | 1623 | ||
1624 | // Assign directly to the local variables so the normal set actions do not happen | ||
1625 | |||
1626 | // Undo any center-of-mass displacement that might have been done. | 1624 | // Undo any center-of-mass displacement that might have been done. |
1627 | entprop.Position -= PositionDisplacement; | 1625 | if (PositionDisplacement != OMV.Vector3.Zero) |
1626 | { | ||
1627 | // Correct for any rotation around the center-of-mass | ||
1628 | // TODO!!! | ||
1629 | entprop.Position -= PositionDisplacement; | ||
1630 | } | ||
1631 | |||
1632 | // Assign directly to the local variables so the normal set actions do not happen | ||
1628 | _position = entprop.Position; | 1633 | _position = entprop.Position; |
1629 | _orientation = entprop.Rotation; | 1634 | _orientation = entprop.Rotation; |
1630 | _velocity = entprop.Velocity; | 1635 | _velocity = entprop.Velocity; |