aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
diff options
context:
space:
mode:
authorRobert Adams2013-04-30 11:42:11 -0700
committerRobert Adams2013-04-30 11:42:11 -0700
commit7cdb07b386ffe88749fcc6cabadd9851f254699d (patch)
tree92b4a1851c00b1a3352e4e853adda013a98aa181 /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
parentBulletSim: Add non-static BSShape.GetReference for getting another reference (diff)
downloadopensim-SC_OLD-7cdb07b386ffe88749fcc6cabadd9851f254699d.zip
opensim-SC_OLD-7cdb07b386ffe88749fcc6cabadd9851f254699d.tar.gz
opensim-SC_OLD-7cdb07b386ffe88749fcc6cabadd9851f254699d.tar.bz2
opensim-SC_OLD-7cdb07b386ffe88749fcc6cabadd9851f254699d.tar.xz
BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 28d4bd7..7eba851 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -259,7 +259,8 @@ public abstract class BSPhysObject : PhysicsActor
259 259
260 // The user can optionally set the center of mass. The user's setting will override any 260 // The user can optionally set the center of mass. The user's setting will override any
261 // computed center-of-mass (like in linksets). 261 // computed center-of-mass (like in linksets).
262 public OMV.Vector3? UserSetCenterOfMass { get; set; } 262 // Note this is a displacement from the root's coordinates. Zero means use the root prim as center-of-mass.
263 public OMV.Vector3? UserSetCenterOfMassDisplacement { get; set; }
263 264
264 public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free. 265 public OMV.Vector3 LockedAxis { get; set; } // zero means locked. one means free.
265 public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f); // All axis are free 266 public readonly OMV.Vector3 LockedAxisFree = new OMV.Vector3(1f, 1f, 1f); // All axis are free